diff --git a/src/components/Activities/AttendcesLogs.jsx b/src/components/Activities/AttendcesLogs.jsx index 267bec1d..e58565e8 100644 --- a/src/components/Activities/AttendcesLogs.jsx +++ b/src/components/Activities/AttendcesLogs.jsx @@ -226,7 +226,7 @@ const AttendanceLog = ({ handleModalData, searchTerm, organizationId }) => { return ( <>
@@ -234,7 +234,7 @@ const AttendanceLog = ({ handleModalData, searchTerm, organizationId }) => { onRangeChange={setDateRange} defaultStartDate={yesterday} /> -
+
{ +const Regularization = ({ + handleRequest, + searchTerm, + projectId, + organizationId, + IncludeInActive, +}) => { const queryClient = useQueryClient(); // var selectedProject = useSelector((store) => store.localVariables.projectId); const selectedProject = useSelectedProject(); const [regularizesList, setregularizedList] = useState([]); - const { regularizes, loading, error, refetch } = - useRegularizationRequests(selectedProject, organizationId, IncludeInActive); + const { regularizes, loading, error, refetch } = useRegularizationRequests( + selectedProject, + organizationId, + IncludeInActive + ); useEffect(() => { setregularizedList(regularizes); @@ -54,48 +68,15 @@ const Regularization = ({ handleRequest, searchTerm,projectId, organizationId, I } const lowercasedSearchTerm = searchTerm.toLowerCase(); return sortedList.filter((item) => { - const fullName = `${item.firstName} ${item.lastName}`.toLowerCase(); + const fullName = `${item?.firstName} ${item?.lastName}`.toLowerCase(); return fullName.includes(lowercasedSearchTerm); }); }, [regularizesList, searchTerm]); - // const filteredSearchData = useMemo(() => { - // let sortedList = [...regularizesList].sort(sortByName); - - // // Search filter - // if (searchTerm) { - // const lowercasedSearchTerm = searchTerm.toLowerCase(); - // sortedList = sortedList.filter((item) => { - // const fullName = `${item.firstName} ${item.lastName}`.toLowerCase(); - // return fullName.includes(lowercasedSearchTerm); - // }); - // } - - // // Organization filter - // if (filters?.selectedOrganization) { - // sortedList = sortedList.filter( - // (item) => item.organization?.name === filters.selectedOrganization - // ); - // } - - // // Services filter - // if (filters?.selectedServices?.length > 0) { - // sortedList = sortedList.filter((item) => - // filters.selectedServices.includes(item.service?.name) - // ); - // } - - // return sortedList; - // }, [regularizesList, searchTerm, filters]); - - - const { currentPage, totalPages, currentItems, paginate } = - usePagination(filteredSearchData, 20); - - // Reset pagination when the search term or data changes - useEffect(() => { - - }, [filteredSearchData]); + const { currentPage, totalPages, currentItems, paginate } = usePagination( + filteredSearchData, + 20 + ); useEffect(() => { eventBus.on("regularization", handler); @@ -117,9 +98,15 @@ const Regularization = ({ handleRequest, searchTerm,projectId, organizationId, I }, [employeeHandler]); return ( -
+
{loading ? ( -
+

Loading...

) : currentItems?.length > 0 ? ( @@ -143,10 +130,7 @@ const Regularization = ({ handleRequest, searchTerm,projectId, organizationId, I
- + ); diff --git a/src/components/common/DateRangePicker.jsx b/src/components/common/DateRangePicker.jsx index 8e53b5e6..3a93853d 100644 --- a/src/components/common/DateRangePicker.jsx +++ b/src/components/common/DateRangePicker.jsx @@ -3,8 +3,8 @@ import { useController, useFormContext, useWatch } from "react-hook-form"; import { useSelector } from "react-redux"; const DateRangePicker = ({ - md, - sm, + md=12, + sm=6, onRangeChange, DateDifference = 7, endDateMode = "yesterday", @@ -63,21 +63,22 @@ const DateRangePicker = ({ }; return ( -
- +
+ + + +
+ - -
); };