admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Changes in Regularization tab.

Browse Source
This commit is contained in:
Kartik Sharma 2025-10-14 14:42:33 +05:30 committed by pramod.mahajan
parent 05c01d1d34
commit 20b508bebc
2 changed files with 123 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Activities/AttendcesLogs.jsx
View File

@ -174,7 +174,7 @@ const AttendanceLog = ({ handleModalData, searchTerm, organizationId }) => {
<div
className="dataTables_length text-start py-2 d-flex flex-wrap justify-content-between"
id="DataTables_Table_0_length"
>
>
<div className="d-flex flex-wrap align-items-center my-0 gap-2">
<DateRangePicker
onRangeChange={setDateRange}
@ -193,7 +193,7 @@ const AttendanceLog = ({ handleModalData, searchTerm, organizationId }) => {
<label className="form-check-label ms-2 mb-0">Pending Attendance</label>
</div>
</div>
</div>
</div>
<div
className="table-responsive text-nowrap"

13
src/components/Activities/Regularization.jsx
View File

@ -33,8 +33,8 @@ const Regularization = ({
);
useEffect(() => {
if(!regularizes) return
if(regularizes?.length) {
if (!regularizes) return
if (regularizes?.length) {
setregularizedList(regularizes);
}
@ -102,6 +102,7 @@ const Regularization = ({
}, [employeeHandler]);
return (
<div>
<div
className="table-responsive text-nowrap pb-4"
style={{ minHeight: "200px" }}
@ -160,7 +161,7 @@ const Regularization = ({
</td>
<td colSpan={2}>
{att.requestedBy ? ( <div className="d-flex justify-content-start align-items-center">
{att.requestedBy ? (<div className="d-flex justify-content-start align-items-center">
<Avatar firstName={att?.requestedBy?.firstName} lastName={att?.requestedBy?.lastName} />
<div className="d-flex flex-column">
<a href="#" className="text-heading text-truncate">
@ -169,10 +170,10 @@ const Regularization = ({
</span>
</a>
</div>
</div>):(<small>--</small>)}
</div>) : (<small>--</small>)}
</td>
<td>
{att?.requestedAt ? formatUTCToLocalTime(att.requestedAt,true) : "--"}
{att?.requestedAt ? formatUTCToLocalTime(att.requestedAt, true) : "--"}
</td>
<td className="text-center ">
<RegularizationActions
@ -197,6 +198,7 @@ const Regularization = ({
</span>
</div>
)}
</div>
{totalPages > 0 && (
<Pagination
currentPage={currentPage}
@ -204,6 +206,7 @@ const Regularization = ({
onPageChange={paginate}
/>
)}
</div>
);
};