Compare commits
3 Commits
51e61aac79
...
77b94e89bd
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
77b94e89bd | ||
|
|
8dddb38278 | ||
|
|
2182e764bf |
@ -36,12 +36,12 @@ const AttendLogs = ({ Id }) => {
|
||||
case 3:
|
||||
return (
|
||||
<i
|
||||
className="bx bx-x-circle text-danger"
|
||||
className="bx bx-check-circle text-success"
|
||||
data-bs-toggle="tooltip"
|
||||
data-bs-offset="0,8"
|
||||
data-bs-placement="top"
|
||||
data-bs-custom-class="tooltip"
|
||||
title="Request Rejected"
|
||||
title="Regularized"
|
||||
></i>
|
||||
);
|
||||
break;
|
||||
@ -61,12 +61,12 @@ const AttendLogs = ({ Id }) => {
|
||||
case 5:
|
||||
return (
|
||||
<i
|
||||
className="bx bx-check-circle text-success"
|
||||
className="bx bx-x-circle text-danger"
|
||||
data-bs-toggle="tooltip"
|
||||
data-bs-offset="0,8"
|
||||
data-bs-placement="top"
|
||||
data-bs-custom-class="tooltip"
|
||||
title="Regularized"
|
||||
title="Request Rejected"
|
||||
></i>
|
||||
);
|
||||
break;
|
||||
|
||||
@ -52,8 +52,11 @@ const AttendanceLog = ({ handleModalData, projectId }) => {
|
||||
.sort(sortByName);
|
||||
const group4 = data
|
||||
.filter( ( d ) => d.activity === 4 && isBeforeToday( d.checkOutTime ) )
|
||||
|
||||
const group5 = data
|
||||
.filter((d) => d.activity === 2 && isBeforeToday(d.checkOutTime))
|
||||
.sort(sortByName);
|
||||
const group5 = data.filter((d) => d.activity === 5).sort(sortByName);
|
||||
const group6 = data.filter((d) => d.activity === 5).sort(sortByName);
|
||||
|
||||
const sortedFinalList = [
|
||||
...group1,
|
||||
@ -61,6 +64,7 @@ const AttendanceLog = ({ handleModalData, projectId }) => {
|
||||
...group3,
|
||||
...group4,
|
||||
...group5,
|
||||
...group6,
|
||||
];
|
||||
|
||||
const currentDate = new Date().toLocaleDateString("en-CA");
|
||||
|
||||
@ -22,8 +22,8 @@ const Regularization = ({ handleRequest }) => {
|
||||
const nameB = b.firstName.toLowerCase() + b.lastName.toLowerCase();
|
||||
return nameA.localeCompare(nameB);
|
||||
};
|
||||
const filteredData = [...regularizesList]?.sort(sortByName);
|
||||
|
||||
const filteredData = regularizesList.sort(sortByName);
|
||||
|
||||
const { currentPage, totalPages, currentItems, paginate } = usePagination(
|
||||
filteredData,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user