diff --git a/src/components/Activities/AttendcesLogs.jsx b/src/components/Activities/AttendcesLogs.jsx index fd6e0779..a62b4e7c 100644 --- a/src/components/Activities/AttendcesLogs.jsx +++ b/src/components/Activities/AttendcesLogs.jsx @@ -65,7 +65,8 @@ const AttendanceLog = ({ handleModalData, projectId }) => { }) ); } - }, [dateRange, projectId, isRefreshing]); + }, [ dateRange, projectId, isRefreshing ] ); + return ( <> @@ -82,12 +83,13 @@ const AttendanceLog = ({ handleModalData, projectId }) => { loading ? "spin":"" }`} title="Refresh" - onClick={()=>setIsRefreshing(!isRefreshing)} + onClick={() => setIsRefreshing( !isRefreshing )} + />
- {data && data.length > 0 ? ( + {(data && data.length > 0 ) && ( @@ -107,14 +109,7 @@ const AttendanceLog = ({ handleModalData, projectId }) => { {loading && } - {error && } - {data && data.length === 0 && ( - - - - )} - - {currentItems?.map((attendance, index) => ( + {currentItems?.map( ( attendance, index ) => ( - + - ))} + ) )}
Loading...{error}
No Data Found
@@ -133,12 +128,12 @@ const AttendanceLog = ({ handleModalData, projectId }) => {
{" "} - {moment(attendance.checkInTime).format("DD-MMM-YYYY")} + {moment( attendance.checkInTime ).format( "DD-MMM-YYYY" )} {convertShortTime(attendance.checkInTime)}{convertShortTime( attendance.checkInTime )} {attendance.checkOutTime - ? convertShortTime(attendance.checkOutTime) + ? convertShortTime( attendance.checkOutTime ) : "--"} @@ -150,12 +145,14 @@ const AttendanceLog = ({ handleModalData, projectId }) => { />
- ) : ( + ) } + {(!loading && data.length === 0) && No employee logs - )} + } + {error && {error}}
{!loading && ( - )} + )} ); };