Compare commits

...

3 Commits

Author SHA1 Message Date
Pramod Mahajan
77b94e89bd handled zero length of array error. 2025-05-09 16:48:06 +05:30
Pramod Mahajan
8dddb38278 mismatch approved and reject icons. replaced them 2025-05-09 16:47:16 +05:30
Pramod Mahajan
2182e764bf added "request " entry in filterwise 2025-05-09 16:46:31 +05:30
3 changed files with 11 additions and 7 deletions

View File

@ -36,12 +36,12 @@ const AttendLogs = ({ Id }) => {
case 3: case 3:
return ( return (
<i <i
className="bx bx-x-circle text-danger" className="bx bx-check-circle text-success"
data-bs-toggle="tooltip" data-bs-toggle="tooltip"
data-bs-offset="0,8" data-bs-offset="0,8"
data-bs-placement="top" data-bs-placement="top"
data-bs-custom-class="tooltip" data-bs-custom-class="tooltip"
title="Request Rejected" title="Regularized"
></i> ></i>
); );
break; break;
@ -61,12 +61,12 @@ const AttendLogs = ({ Id }) => {
case 5: case 5:
return ( return (
<i <i
className="bx bx-check-circle text-success" className="bx bx-x-circle text-danger"
data-bs-toggle="tooltip" data-bs-toggle="tooltip"
data-bs-offset="0,8" data-bs-offset="0,8"
data-bs-placement="top" data-bs-placement="top"
data-bs-custom-class="tooltip" data-bs-custom-class="tooltip"
title="Regularized" title="Request Rejected"
></i> ></i>
); );
break; break;

View File

@ -51,9 +51,12 @@ const AttendanceLog = ({ handleModalData, projectId }) => {
.filter((d) => d.activity === 1 && isBeforeToday(d.checkInTime)) .filter((d) => d.activity === 1 && isBeforeToday(d.checkInTime))
.sort(sortByName); .sort(sortByName);
const group4 = data const group4 = data
.filter((d) => d.activity === 4 && isBeforeToday(d.checkOutTime)) .filter( ( d ) => d.activity === 4 && isBeforeToday( d.checkOutTime ) )
const group5 = data
.filter((d) => d.activity === 2 && isBeforeToday(d.checkOutTime))
.sort(sortByName); .sort(sortByName);
const group5 = data.filter((d) => d.activity === 5).sort(sortByName); const group6 = data.filter((d) => d.activity === 5).sort(sortByName);
const sortedFinalList = [ const sortedFinalList = [
...group1, ...group1,
@ -61,6 +64,7 @@ const AttendanceLog = ({ handleModalData, projectId }) => {
...group3, ...group3,
...group4, ...group4,
...group5, ...group5,
...group6,
]; ];
const currentDate = new Date().toLocaleDateString("en-CA"); const currentDate = new Date().toLocaleDateString("en-CA");

View File

@ -22,8 +22,8 @@ const Regularization = ({ handleRequest }) => {
const nameB = b.firstName.toLowerCase() + b.lastName.toLowerCase(); const nameB = b.firstName.toLowerCase() + b.lastName.toLowerCase();
return nameA.localeCompare(nameB); return nameA.localeCompare(nameB);
}; };
const filteredData = [...regularizesList]?.sort(sortByName);
const filteredData = regularizesList.sort(sortByName);
const { currentPage, totalPages, currentItems, paginate } = usePagination( const { currentPage, totalPages, currentItems, paginate } = usePagination(
filteredData, filteredData,