Changes in Regularization tab.

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

View File

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

View File

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