diff --git a/src/components/Activities/AttendcesLogs.jsx b/src/components/Activities/AttendcesLogs.jsx index dea24b4e..b8ec542c 100644 --- a/src/components/Activities/AttendcesLogs.jsx +++ b/src/components/Activities/AttendcesLogs.jsx @@ -171,29 +171,29 @@ const AttendanceLog = ({ handleModalData, searchTerm, organizationId }) => { return ( <> -
-
- -
- setShowPending(e.target.checked)} - /> - -
-
-
+
+
+ +
+ setShowPending(e.target.checked)} + /> + +
+
+
{ - if(!regularizes) return - if(regularizes?.length) { - setregularizedList(regularizes); + if (!regularizes) return + if (regularizes?.length) { + setregularizedList(regularizes); } }, [regularizes]); @@ -102,101 +102,103 @@ const Regularization = ({ }, [employeeHandler]); return ( -
- {loading ? ( -
-

Loading...

-
- ) : currentItems?.length > 0 ? ( - - - - - - - - - - - - - - - {currentItems?.map((att, index) => ( - - - - - - - - - - - - +
+
+ {loading ? ( +
+

Loading...

+
+ ) : currentItems?.length > 0 ? ( +
NameDateOrganization - Check-In - - Check-Out - - Requested By - - Requested At - Action
- - {moment(att.checkOutTime).format("DD-MMM-YYYY")}{att.organizationName || "--"}{convertShortTime(att.checkInTime)} - {att.requestedAt ? convertShortTime(att.checkOutTime) : "--"} - - {att.requestedBy ? ( ):(--)} - - {att?.requestedAt ? formatUTCToLocalTime(att.requestedAt,true) : "--"} - - -
+ + + + + + + + + + - ))} - -
NameDateOrganization + Check-In + + Check-Out + + Requested By + + Requested At + Action
- ) : ( -
- - {searchTerm - ? "No results found for your search." - : "No Requests Found !"} - -
- )} + + + {currentItems?.map((att, index) => ( + + +
+ +
+ + + {att.firstName} {att.lastName} + + +
+
+ + {moment(att.checkOutTime).format("DD-MMM-YYYY")} + + {att.organizationName || "--"} + + {convertShortTime(att.checkInTime)} + + {att.requestedAt ? convertShortTime(att.checkOutTime) : "--"} + + + + {att.requestedBy ? (
+ +
+ + + {att?.requestedBy?.firstName} {att?.requestedBy?.lastName} + + +
+
) : (--)} + + + {att?.requestedAt ? formatUTCToLocalTime(att.requestedAt, true) : "--"} + + + + + + ))} + + + ) : ( +
+ + {searchTerm + ? "No results found for your search." + : "No Requests Found !"} + +
+ )} +
{totalPages > 0 && ( )} +
); };