diff --git a/src/components/Activities/Attendance.jsx b/src/components/Activities/Attendance.jsx index ff5d37d8..0f726521 100644 --- a/src/components/Activities/Attendance.jsx +++ b/src/components/Activities/Attendance.jsx @@ -11,6 +11,7 @@ import { useSelector } from "react-redux"; import { useQueryClient } from "@tanstack/react-query"; import eventBus from "../../services/eventBus"; import { useSelectedProject } from "../../slices/apiDataManager"; +import Pagination from "../common/Pagination"; const Attendance = ({ getRole, handleModalData, searchTerm, projectId, organizationId, includeInactive, date }) => { const queryClient = useQueryClient(); @@ -108,6 +109,8 @@ const Attendance = ({ getRole, handleModalData, searchTerm, projectId, organizat return () => eventBus.off("employee", employeeHandler); }, [employeeHandler]); + + return ( <>
ITEMS_PER_PAGE && ( - + + )} ) : ( diff --git a/src/components/Activities/AttendcesLogs.jsx b/src/components/Activities/AttendcesLogs.jsx index 00e9936d..fd4ba69b 100644 --- a/src/components/Activities/AttendcesLogs.jsx +++ b/src/components/Activities/AttendcesLogs.jsx @@ -11,6 +11,7 @@ import AttendanceRepository from "../../repositories/AttendanceRepository"; import { useAttendancesLogs } from "../../hooks/useAttendance"; import { queryClient } from "../../layouts/AuthLayout"; import { ITEMS_PER_PAGE } from "../../utils/constants"; +import Pagination from "../common/Pagination"; const usePagination = (data, itemsPerPage) => { const [currentPage, setCurrentPage] = useState(1); @@ -372,45 +373,11 @@ const AttendanceLog = ({ handleModalData, searchTerm ,organizationId}) => {
)} {filteredSearchData.length > ITEMS_PER_PAGE && ( - + )} ); diff --git a/src/components/Activities/Regularization.jsx b/src/components/Activities/Regularization.jsx index 97e6879b..34c8d1da 100644 --- a/src/components/Activities/Regularization.jsx +++ b/src/components/Activities/Regularization.jsx @@ -9,6 +9,7 @@ import usePagination from "../../hooks/usePagination"; import eventBus from "../../services/eventBus"; import { cacheData, clearCacheKey, useSelectedProject } from "../../slices/apiDataManager"; import { useQueryClient } from "@tanstack/react-query"; +import Pagination from "../common/Pagination"; const Regularization = ({ handleRequest, searchTerm,projectId, organizationId, IncludeInActive }) => { const queryClient = useQueryClient(); @@ -189,43 +190,11 @@ const Regularization = ({ handleRequest, searchTerm,projectId, organizationId, I )} {!loading && totalPages > 1 && ( - + )} );