-
);
};
export default AssignTask;
\ No newline at end of file
diff --git a/src/components/Project/Infrastructure/WorkItem.jsx b/src/components/Project/Infrastructure/WorkItem.jsx
index 64d68457..241f5e33 100644
--- a/src/components/Project/Infrastructure/WorkItem.jsx
+++ b/src/components/Project/Infrastructure/WorkItem.jsx
@@ -32,7 +32,7 @@ const WorkItem = ({
forWorkArea,
deleteHandleTask,
}) => {
- // const projectId = useSelector((store)=>store.localVariables.projectId)
+ const projectId = useSelector((store)=>store.localVariables.projectId)
const isTaskPlanning = /^\/activities\/task$/.test(location.pathname);
const [itemName, setItemName] = useState("");
diff --git a/src/hooks/useAttendance.js b/src/hooks/useAttendance.js
index c18ba1c2..05937aa6 100644
--- a/src/hooks/useAttendance.js
+++ b/src/hooks/useAttendance.js
@@ -1,109 +1,293 @@
import { useEffect, useState } from "react";
import { cacheData, getCachedData } from "../slices/apiDataManager";
import AttendanceRepository from "../repositories/AttendanceRepository";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import showToast from "../services/toastService";
+import { useDispatch, useSelector } from "react-redux";
+import { store } from "../store/store";
+import { setDefaultDateRange } from "../slices/localVariablesSlice";
-export const useAttendace =(projectId)=>{
+// export const useAttendace =(projectId)=>{
- const [attendance, setAttendance] = useState([]);
- const[loading,setLoading] = useState(true)
- const [error, setError] = useState(null);
+// const [attendance, setAttendance] = useState([]);
+// const[loading,setLoading] = useState(true)
+// const [error, setError] = useState(null);
- const fetchData = () => {
- const Attendance_cache = getCachedData("Attendance");
- if(!Attendance_cache || Attendance_cache.projectId !== projectId){
+// const fetchData = () => {
+// const Attendance_cache = getCachedData("Attendance");
+// if(!Attendance_cache || Attendance_cache.projectId !== projectId){
- setLoading(true);
- AttendanceRepository.getAttendance(projectId)
- .then((response) => {
- setAttendance(response.data);
- cacheData( "Attendance", {data: response.data, projectId} )
- setLoading(false)
- })
- .catch((error) => {
- setLoading(false)
- setError("Failed to fetch data.");
- })
- } else {
- setAttendance(Attendance_cache.data);
- setLoading(false)
- }
- };
+// setLoading(true);
+// AttendanceRepository.getAttendance(projectId)
+// .then((response) => {
+// setAttendance(response.data);
+// cacheData( "Attendance", {data: response.data, projectId} )
+// setLoading(false)
+// })
+// .catch((error) => {
+// setLoading(false)
+// setError("Failed to fetch data.");
+// })
+// } else {
+// setAttendance(Attendance_cache.data);
+// setLoading(false)
+// }
+// };
- useEffect(()=>{
- if ( projectId && projectId != 1 )
- {
- fetchData(projectId);
- }
- },[projectId])
+// useEffect(()=>{
+// if ( projectId && projectId != 1 )
+// {
+// fetchData(projectId);
+// }
+// },[projectId])
- return {attendance,loading,error,recall:fetchData}
-}
+// return {attendance,loading,error,recall:fetchData}
+// }
-export const useEmployeeAttendacesLog = (id) => {
- const [logs, setLogs] = useState([]);
- const [loading, setLoading] = useState(false);
- const [error, setError] = useState(null);
+// export const useEmployeeAttendacesLog = (id) => {
+// const [logs, setLogs] = useState([]);
+// const [loading, setLoading] = useState(false);
+// const [error, setError] = useState(null);
- const fetchData = () => {
- const AttendanceLog_cache = getCachedData("AttendanceLogs");
- if(!AttendanceLog_cache || AttendanceLog_cache.id !== id ){
- setLoading(true)
- AttendanceRepository.getAttendanceLogs(id).then((response)=>{
- setLogs(response.data)
- cacheData("AttendanceLogs", { data: response.data, id })
- setLoading(false)
- }).catch((error)=>{
- setError("Failed to fetch data.");
- setLoading(false);
- })
- }else{
+// const fetchData = () => {
+// const AttendanceLog_cache = getCachedData("AttendanceLogs");
+// if(!AttendanceLog_cache || AttendanceLog_cache.id !== id ){
+// setLoading(true)
+// AttendanceRepository.getAttendanceLogs(id).then((response)=>{
+// setLogs(response.data)
+// cacheData("AttendanceLogs", { data: response.data, id })
+// setLoading(false)
+// }).catch((error)=>{
+// setError("Failed to fetch data.");
+// setLoading(false);
+// })
+// }else{
- setLogs(AttendanceLog_cache.data);
- }
+// setLogs(AttendanceLog_cache.data);
+// }
+// };
+
+// useEffect(() => {
+// if (id) {
+// fetchData();
+// }
+
+// }, [id]);
+
+// return { logs, loading, error };
+// };
+
+// export const useRegularizationRequests = ( projectId ) =>
+// {
+// const [regularizes, setregularizes] = useState([]);
+// const [loading, setLoading] = useState(false);
+// const [error, setError] = useState(null);
+
+
+// const fetchData = () => {
+// const regularizedList_cache = getCachedData("regularizedList");
+// if(!regularizedList_cache || regularizedList_cache.projectId !== projectId ){
+// setLoading(true)
+// AttendanceRepository.getRegularizeList(projectId).then((response)=>{
+// setregularizes( response.data )
+// cacheData("regularizedList", { data: response.data, projectId })
+// setLoading(false)
+// }).catch((error)=>{
+// setError("Failed to fetch data.");
+// setLoading(false);
+// })
+// }else{
+
+// setregularizes(regularizedList_cache.data);
+// }
+// };
+
+// useEffect(() => {
+// if (projectId) {
+// fetchData();
+// }
+
+// }, [ projectId ] );
+// return {regularizes,loading,error,refetch:fetchData}
+// }
+
+
+// ----------------------------Query-----------------------------
+
+
+export const useAttendance = (projectId) => {
+ const dispatch = useDispatch()
+ const {
+ data: attendance = [],
+ isLoading: loading,
+ error,
+ refetch: recall,
+ isFetching
+ } = useQuery({
+ queryKey: ["attendance", projectId],
+ queryFn: async () => {
+ const response = await AttendanceRepository.getAttendance(projectId);
+ return response.data;
+ },
+ enabled: !!projectId,
+ onError: (error) => {
+ showToast(error.message || "Error while fetching Attendance", "error");
+ },
+ });
+
+ return {
+ attendance,
+ loading,
+ error,
+ recall,
+ isFetching
};
-
- useEffect(() => {
- if (id) {
- fetchData();
- }
-
- }, [id]);
-
- return { logs, loading, error };
};
-export const useRegularizationRequests = ( projectId ) =>
-{
- const [regularizes, setregularizes] = useState([]);
- const [loading, setLoading] = useState(false);
- const [error, setError] = useState(null);
-
-
- const fetchData = () => {
- const regularizedList_cache = getCachedData("regularizedList");
- if(!regularizedList_cache || regularizedList_cache.projectId !== projectId ){
- setLoading(true)
- AttendanceRepository.getRegularizeList(projectId).then((response)=>{
- setregularizes( response.data )
- cacheData("regularizedList", { data: response.data, projectId })
- setLoading(false)
- }).catch((error)=>{
- setError("Failed to fetch data.");
- setLoading(false);
- })
- }else{
-
- setregularizes(regularizedList_cache.data);
- }
- };
+export const useAttendancesLogs = (projectId, fromDate, toDate) => {
+ const dispatch = useDispatch();
+ const enabled = !!projectId && !!fromDate && !!toDate;
+ const query = useQuery({
+ queryKey: ['attendanceLogs', projectId, fromDate, toDate],
+ queryFn: async () => {
+ const res = await AttendanceRepository.getAttendanceFilteredByDate(
+ projectId,
+ fromDate,
+ toDate
+ );
+ return res.data;
+ },
+ enabled,
+ });
+
useEffect(() => {
- if (projectId) {
- fetchData();
+ if (query.data && fromDate && toDate) {
+ dispatch(
+ setDefaultDateRange({
+ startDate: fromDate,
+ endDate: toDate,
+ })
+ );
}
+ }, [dispatch, query.data, fromDate, toDate]);
+ return query;
+};
- }, [ projectId ] );
- return {regularizes,loading,error,refetch:fetchData}
-}
\ No newline at end of file
+
+
+export const useEmployeeAttendacesLog = (id) => {
+ const {
+ data: logs = [],
+ isLoading: loading,
+ error,
+ refetch: recall,
+ } = useQuery({
+ queryKey: ["employeeAttendanceLogs", id],
+ queryFn: async () => {
+ const response = await AttendanceRepository.getAttendanceLogs(id);
+ return response.data;
+ },
+ enabled: !!id,
+ onError: (error) => {
+ showToast(error.message || "Error while fetching Attendance Logs", "error");
+ },
+ });
+
+ return {
+ logs,
+ loading,
+ error,
+ recall,
+ };
+};
+
+export const useAttendanceByEmployee = (employeeId, fromDate, toDate) => {
+ const enabled = !!employeeId && !!fromDate && !!toDate;
+
+ return useQuery({
+ queryKey: ["employeeAttendance", employeeId, fromDate, toDate],
+ queryFn: async () => {
+ const res = await AttendanceRepository.getAttendanceByEmployee(employeeId, fromDate, toDate);
+ return res.data;
+ },
+ enabled,
+ });
+};
+
+export const useRegularizationRequests = (projectId) => {
+ const {
+ data: regularizes = [],
+ isLoading: loading,
+ error,
+ refetch,
+ } = useQuery({
+ queryKey: ["regularizedList", projectId],
+ queryFn: async () => {
+ const response = await AttendanceRepository.getRegularizeList(projectId);
+ return response.data;
+ },
+ enabled: !!projectId,
+ onError: (error) => {
+ showToast(error.message || "Error while fetching Regularization Requests", "error");
+ },
+ });
+
+ return {
+ regularizes,
+ loading,
+ error,
+ refetch,
+ };
+};
+
+
+// -------------------Mutation--------------------------------------
+
+export const useMarkAttendance = () => {
+ const queryClient = useQueryClient();
+ const selectedProject = useSelector((store)=>store.localVariables.projectId)
+ const selectedDateRange = useSelector((store)=>store.localVariables.defaultDateRange)
+
+ return useMutation({
+ mutationFn: async ({payload,forWhichTab}) => {
+ const res = await AttendanceRepository.markAttendance(payload);
+ return res.data;
+ },
+
+ onSuccess: (data,variables) => {
+ if(variables.forWhichTab == 1){
+ queryClient.setQueryData(["attendance",selectedProject], (oldData) => {
+ if (!oldData) return oldData;
+ return oldData.map((emp) =>
+ emp.employeeId === data.employeeId ? { ...emp, ...data } : emp
+ );
+ });
+ }else if(variables.forWhichTab == 2){
+ // queryClient.invalidateQueries({
+ // queryKey: ["attendanceLogs"],
+ // });
+ queryClient.setQueryData(["attendanceLogs",selectedProject,selectedDateRange.startDate,selectedDateRange.endDate], (oldData) => {
+ if (!oldData) return oldData;
+ return oldData.map((record) =>
+ record.id === data.id ? { ...record, ...data } : record
+ );
+ });
+ queryClient.invalidateQueries({queryKey:["regularizedList"]})
+ }else(
+ queryClient.setQueryData(["regularizedList",selectedProject], (oldData) => {
+ if (!oldData) return oldData;
+ return oldData.filter((record) => record.id !== data.id)
+ }),
+ queryClient.invalidateQueries({queryKey:["attendanceLogs"]})
+ )
+
+ if(variables.forWhichTab !== 3) showToast("Attendance marked successfully", "success");
+ },
+ onError: (error) => {
+ showToast(error.message || "Failed to mark attendance", "error");
+ },
+ });
+};
diff --git a/src/hooks/useImageGallery.js b/src/hooks/useImageGallery.js
index 7e8e5334..b1511d93 100644
--- a/src/hooks/useImageGallery.js
+++ b/src/hooks/useImageGallery.js
@@ -2,84 +2,115 @@ import { useState, useCallback } from "react";
// import { ImageGalleryAPI } from "../repositories/ImageGalleyRepository";
import { ImageGalleryAPI } from "../repositories/ImageGalleryAPI";
+// const PAGE_SIZE = 10;
+
+// const useImageGallery = (selectedProjectId) => {
+// const [images, setImages] = useState([]);
+// const [allImagesData, setAllImagesData] = useState([]);
+// const [pageNumber, setPageNumber] = useState(1);
+// const [hasMore, setHasMore] = useState(true);
+// const [loading, setLoading] = useState(false);
+// const [loadingMore, setLoadingMore] = useState(false);
+
+// const fetchImages = useCallback(async (page = 1, filters = {}, reset = false) => {
+// if (!selectedProjectId) return;
+
+// try {
+// if (page === 1) {
+// setLoading(true);
+// } else {
+// setLoadingMore(true);
+// }
+
+// const res = await ImageGalleryAPI.ImagesGet(
+// selectedProjectId,
+// filters,
+// page,
+// PAGE_SIZE
+// );
+
+// const newBatches = res.data || [];
+// const receivedCount = newBatches.length;
+
+// setImages((prev) => {
+// if (page === 1 || reset) return newBatches;
+// const uniqueNew = newBatches.filter(
+// (batch) => !prev.some((b) => b.batchId === batch.batchId)
+// );
+// return [...prev, ...uniqueNew];
+// });
+
+// setAllImagesData((prev) => {
+// if (page === 1 || reset) return newBatches;
+// const uniqueAll = newBatches.filter(
+// (batch) => !prev.some((b) => b.batchId === batch.batchId)
+// );
+// return [...prev, ...uniqueAll];
+// });
+
+// setHasMore(receivedCount === PAGE_SIZE);
+// } catch (error) {
+// console.error("Error fetching images:", error);
+// if (page === 1) {
+// setImages([]);
+// setAllImagesData([]);
+// }
+// setHasMore(false);
+// } finally {
+// setLoading(false);
+// setLoadingMore(false);
+// }
+// }, [selectedProjectId]);
+
+// const resetGallery = useCallback(() => {
+// setImages([]);
+// setAllImagesData([]);
+// setPageNumber(1);
+// setHasMore(true);
+// }, []);
+
+// return {
+// images,
+// allImagesData,
+// pageNumber,
+// setPageNumber,
+// hasMore,
+// loading,
+// loadingMore,
+// fetchImages,
+// resetGallery,
+// };
+// };
+
+// export default useImageGallery;
+import { useInfiniteQuery } from "@tanstack/react-query";
+
+
const PAGE_SIZE = 10;
-const useImageGallery = (selectedProjectId) => {
- const [images, setImages] = useState([]);
- const [allImagesData, setAllImagesData] = useState([]);
- const [pageNumber, setPageNumber] = useState(1);
- const [hasMore, setHasMore] = useState(true);
- const [loading, setLoading] = useState(false);
- const [loadingMore, setLoadingMore] = useState(false);
-
- const fetchImages = useCallback(async (page = 1, filters = {}, reset = false) => {
- if (!selectedProjectId) return;
-
- try {
- if (page === 1) {
- setLoading(true);
- } else {
- setLoadingMore(true);
- }
+const useImageGallery = (selectedProjectId, filters) => {
+ const hasFilters = filters && Object.values(filters).some(
+ value => Array.isArray(value) ? value.length > 0 : value !== null && value !== ""
+ );
+ return useInfiniteQuery({
+ queryKey: ["imageGallery", selectedProjectId, hasFilters ? filters : null],
+ enabled: !!selectedProjectId,
+ getNextPageParam: (lastPage, allPages) => {
+ if (!lastPage?.data?.length) return undefined;
+ return allPages.length + 1;
+ },
+ queryFn: async ({ pageParam = 1 }) => {
const res = await ImageGalleryAPI.ImagesGet(
selectedProjectId,
- filters,
- page,
+ hasFilters ? filters : undefined,
+ pageParam,
PAGE_SIZE
);
-
- const newBatches = res.data || [];
- const receivedCount = newBatches.length;
-
- setImages((prev) => {
- if (page === 1 || reset) return newBatches;
- const uniqueNew = newBatches.filter(
- (batch) => !prev.some((b) => b.batchId === batch.batchId)
- );
- return [...prev, ...uniqueNew];
- });
-
- setAllImagesData((prev) => {
- if (page === 1 || reset) return newBatches;
- const uniqueAll = newBatches.filter(
- (batch) => !prev.some((b) => b.batchId === batch.batchId)
- );
- return [...prev, ...uniqueAll];
- });
-
- setHasMore(receivedCount === PAGE_SIZE);
- } catch (error) {
- console.error("Error fetching images:", error);
- if (page === 1) {
- setImages([]);
- setAllImagesData([]);
- }
- setHasMore(false);
- } finally {
- setLoading(false);
- setLoadingMore(false);
- }
- }, [selectedProjectId]);
-
- const resetGallery = useCallback(() => {
- setImages([]);
- setAllImagesData([]);
- setPageNumber(1);
- setHasMore(true);
- }, []);
-
- return {
- images,
- allImagesData,
- pageNumber,
- setPageNumber,
- hasMore,
- loading,
- loadingMore,
- fetchImages,
- resetGallery,
- };
+ return res;
+ },
+ });
};
-export default useImageGallery;
\ No newline at end of file
+export default useImageGallery;
+
diff --git a/src/index.css b/src/index.css
index 8758bf11..e0f8ce52 100644
--- a/src/index.css
+++ b/src/index.css
@@ -101,25 +101,7 @@ button:focus-visible {
flex: 1;
}
-/* Custom Scrollbar for Webkit browsers (Chrome, Safari, Edge) */
-::-webkit-scrollbar {
- width: 6px; /* Width of the scrollbar */
- height: 6px; /* Height of the scrollbar (for horizontal scrollbar) */
-}
-::-webkit-scrollbar-track {
- background-color: #f1f1f1; /* Background of the scrollbar track */
- border-radius: 2px; /* Rounded corners for the track */
-}
-
-::-webkit-scrollbar-thumb {
- background-color: #888; /* Color of the scrollbar thumb */
- border-radius: 10px; /* Rounded corners for the thumb */
-}
-
-::-webkit-scrollbar-thumb:hover {
- background-color: #555; /* Color of the thumb on hover */
-}
@keyframes spin {
100% {
diff --git a/src/pages/Activities/AttendancePage.jsx b/src/pages/Activities/AttendancePage.jsx
index 054bbd2c..3483cc5e 100644
--- a/src/pages/Activities/AttendancePage.jsx
+++ b/src/pages/Activities/AttendancePage.jsx
@@ -1,17 +1,15 @@
import React, { useState, useEffect, useCallback } from "react";
import {
cacheData,
- clearCacheKey,
- getCachedData,
getCachedProfileData,
-} from "../../slices/apiDataManager";
+} from "../../slices/apiDataManager"; // clearCacheKey and getCachedData are not used
import Breadcrumb from "../../components/common/Breadcrumb";
import AttendanceLog from "../../components/Activities/AttendcesLogs";
import Attendance from "../../components/Activities/Attendance";
import AttendanceModel from "../../components/Activities/AttendanceModel";
import showToast from "../../services/toastService";
import Regularization from "../../components/Activities/Regularization";
-import { useAttendace } from "../../hooks/useAttendance";
+import { useAttendance } from "../../hooks/useAttendance";
import { useDispatch, useSelector } from "react-redux";
import { setProjectId } from "../../slices/localVariablesSlice";
import { markCurrentAttendance } from "../../slices/apiSlice/attendanceAllSlice";
@@ -23,58 +21,61 @@ import { useProjectName } from "../../hooks/useProjects";
const AttendancePage = () => {
const [activeTab, setActiveTab] = useState("all");
- const [showPending, setShowPending] = useState(false); // Renamed for consistency
+ const [showPending, setShowPending] = useState(false);
const [searchQuery, setSearchQuery] = useState("");
- const loginUser = getCachedProfileData();
+ // const loginUser = getCachedProfileData(); // Declared but not used
const selectedProject = useSelector((store) => store.localVariables.projectId);
const dispatch = useDispatch();
+
const {
attendance,
loading: attLoading,
- recall: attrecall,
- } = useAttendace(selectedProject);
+ // recall: attrecall, // Declared but not used in the current logic
+ } = useAttendance(selectedProject);
const [attendances, setAttendances] = useState();
- const [empRoles, setEmpRoles] = useState(null);
+ const [empRoles, setEmpRoles] = useState(null); // This state is declared but never populated or used
const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);
- const [modelConfig, setModelConfig] = useState();
+ const [modelConfig, setModelConfig] = useState(null); // Initialize with null for clarity
const DoRegularized = useHasUserPermission(REGULARIZE_ATTENDANCE);
- const { projectNames, loading: projectLoading, fetchData } = useProjectName();
+ // const { projectNames, loading: projectLoading, fetchData } = useProjectName(); // loading and fetchData are not used directly here
-
- const [formData, setFormData] = useState({
- markTime: "",
- description: "",
- date: new Date().toLocaleDateString(),
- });
+ // FormData is declared but not used in the provided snippet's logic
+ // const [formData, setFormData] = useState({
+ // markTime: "",
+ // description: "",
+ // date: new Date().toLocaleDateString(),
+ // });
const handler = useCallback(
(msg) => {
if (selectedProject === msg.projectId) {
- // Ensure attendances is not null before mapping
const updatedAttendance = attendances
? attendances.map((item) =>
- item.employeeId === msg.response.employeeId
- ? { ...item, ...msg.response }
- : item
- )
- : [msg.response]; // If attendances is null, initialize with new response
+ item.employeeId === msg.response.employeeId
+ ? { ...item, ...msg.response }
+ : item
+ )
+ : [msg.response];
cacheData("Attendance", {
data: updatedAttendance,
- projectId: selectedProject,
+ projectId: selectedProject, // Corrected key from selectedProject to projectId for consistency
});
setAttendances(updatedAttendance);
}
},
- [selectedProject, attendances] // Removed attrecall as it's not a direct dependency for this state update
+ [selectedProject, attendances]
);
const employeeHandler = useCallback(
(msg) => {
+ // This logic fetches all attendance when an employee event occurs,
+ // which might be inefficient if only a single employee's data needs updating.
+ // Consider a more granular update if performance is an issue.
if (attendances?.some((item) => item.employeeId === msg.employeeId)) {
AttendanceRepository.getAttendance(selectedProject)
.then((response) => {
- cacheData("Attendance", { data: response.data, selectedProject });
+ cacheData("Attendance", { data: response.data, projectId: selectedProject }); // Corrected key
setAttendances(response.data);
})
.catch((error) => {
@@ -85,24 +86,29 @@ const AttendancePage = () => {
[selectedProject, attendances]
);
- const getRole = (roleId) => {
- if (!empRoles) return "Unassigned";
+ // The `getRole` function has a duplicate line: `const role = empRoles.find((b) => b.id === roleId);`
+ // Also, `empRoles` is declared but never set. If this function is meant to be used,
+ // `empRoles` needs to be fetched and set in the state.
+ const getRole = useCallback((roleId) => {
+ if (!empRoles) return "Unassigned"; // empRoles is always null with current code
if (!roleId) return "Unassigned";
const role = empRoles.find((b) => b.id === roleId);
return role ? role.role : "Unassigned";
- };
+ }, [empRoles]);
- const openModel = () => {
+ const openModel = useCallback(() => {
setIsCreateModalOpen(true);
- };
+ }, []);
- const handleModalData = (employee) => {
+ const handleModalData = useCallback((employee) => {
setModelConfig(employee);
- };
+ }, []);
- const closeModal = () => {
+ const closeModal = useCallback(() => {
setModelConfig(null);
setIsCreateModalOpen(false);
+ // Directly manipulating DOM is generally discouraged in React.
+ // Consider using React state to control modal visibility.
const modalElement = document.getElementById("check-Out-modal");
if (modalElement) {
modalElement.classList.remove("show");
@@ -113,20 +119,19 @@ const AttendancePage = () => {
modalBackdrop.remove();
}
}
- };
+ }, []);
- const handleSubmit = (formData) => {
+ const handleSubmit = useCallback((formData) => {
dispatch(markCurrentAttendance(formData))
.then((action) => {
- // Check if payload and employeeId exist before mapping
if (action.payload && action.payload.employeeId) {
const updatedAttendance = attendances
? attendances.map((item) =>
- item.employeeId === action.payload.employeeId
- ? { ...item, ...action.payload }
- : item
- )
- : [action.payload]; // If attendances is null, initialize with new payload
+ item.employeeId === action.payload.employeeId
+ ? { ...item, ...action.payload }
+ : item
+ )
+ : [action.payload];
cacheData("Attendance", {
data: updatedAttendance,
@@ -141,29 +146,30 @@ const AttendancePage = () => {
.catch((error) => {
showToast(error.message, "error");
});
- };
+ }, [dispatch, attendances, selectedProject]);
- const handleToggle = (event) => {
+ const handleToggle = useCallback((event) => {
setShowPending(event.target.checked);
- };
+ }, []);
+
+ // Use useProjectName hook to get projectNames and set selected project
+ const { projectNames } = useProjectName();
useEffect(() => {
if (selectedProject === null && projectNames.length > 0) {
dispatch(setProjectId(projectNames[0]?.id));
}
}, [selectedProject, projectNames, dispatch]);
- // Open modal when modelConfig is set
useEffect(() => {
if (modelConfig !== null) {
openModel();
}
- }, [modelConfig]); // Removed isCreateModalOpen from here as it's set by openModel()
-
+ }, [modelConfig, openModel]); // Added openModel to dependency array
+
useEffect(() => {
setAttendances(attendance);
}, [attendance]);
- // Filter and search logic for the 'Today's' tab (Attendance component)
const filteredAndSearchedTodayAttendance = useCallback(() => {
let currentData = attendances;
@@ -176,9 +182,8 @@ const AttendancePage = () => {
if (searchQuery) {
const lowerCaseSearchQuery = searchQuery.toLowerCase();
currentData = currentData?.filter((att) => {
- // Combine first, middle, and last names for a comprehensive search
const fullName = [att.firstName, att.middleName, att.lastName]
- .filter(Boolean) // Remove null or undefined parts
+ .filter(Boolean)
.join(" ")
.toLowerCase();
@@ -203,6 +208,7 @@ const AttendancePage = () => {
eventBus.on("employee", employeeHandler);
return () => eventBus.off("employee", employeeHandler);
}, [employeeHandler]);
+
return (
<>
{isCreateModalOpen && modelConfig && (
@@ -270,16 +276,15 @@ const AttendancePage = () => {
setSearchQuery(e.target.value)}
- // style={{ width: "200px", height: "30px" }} // Optional: further reduce width/height
/>
-
+
{activeTab === "all" && (
<>
{!attLoading && (
@@ -303,7 +308,6 @@ const AttendancePage = () => {
)}
)}
-
{activeTab === "logs" && (
{
projectId={selectedProject}
setshowOnlyCheckout={setShowPending}
showOnlyCheckout={showPending}
- searchQuery={searchQuery} // Pass search query to AttendanceLog
+ searchQuery={searchQuery}
/>
)}
-
{activeTab === "regularization" && DoRegularized && (
)}
diff --git a/src/pages/Gallary/ImageGallary.jsx b/src/pages/Gallary/ImageGallary.jsx
index dcb7604e..16335df2 100644
--- a/src/pages/Gallary/ImageGallary.jsx
+++ b/src/pages/Gallary/ImageGallary.jsx
@@ -16,32 +16,20 @@ import { setProjectId } from "../../slices/localVariablesSlice";
const SCROLL_THRESHOLD = 5;
const ImageGallery = () => {
- const selectedProjectId = useSelector((store) => store.localVariables.projectId);
+ const selectedProjectId = useSelector(
+ (store) => store.localVariables.projectId
+ );
+ const dispatch = useDispatch();
+ const { projectNames } = useProjectName();
- const dispatch = useDispatch()
- const { projectNames, loading: projectLoading, fetchData } = useProjectName();
+ // Auto-select a project on mount
useEffect(() => {
- if(selectedProjectId == null){
- dispatch(setProjectId(projectNames[0]?.id));
- }
- },[])
-
- const {
- images,
- allImagesData,
- pageNumber,
- setPageNumber,
- hasMore,
- loading,
- loadingMore,
- fetchImages,
- resetGallery,
- } = useImageGallery(selectedProjectId);
-
- const { openModal } = useModal();
-
- const yesterday = moment().subtract(1, 'days').format('YYYY-MM-DD');
+ if (!selectedProjectId && projectNames?.length) {
+ dispatch(setProjectId(projectNames[0].id));
+ }
+ }, [selectedProjectId, projectNames, dispatch]);
+ // Filter states
const [selectedFilters, setSelectedFilters] = useState({
building: [],
floor: [],
@@ -52,7 +40,6 @@ const ImageGallery = () => {
startDate: "",
endDate: "",
});
-
const [appliedFilters, setAppliedFilters] = useState({
buildingIds: null,
floorIds: null,
@@ -63,7 +50,6 @@ const ImageGallery = () => {
startDate: null,
endDate: null,
});
-
const [collapsedFilters, setCollapsedFilters] = useState({
dateRange: false,
building: false,
@@ -73,7 +59,6 @@ const ImageGallery = () => {
workCategory: false,
workArea: false,
});
-
const [isFilterPanelOpen, setIsFilterPanelOpen] = useState(false);
const [hoveredImage, setHoveredImage] = useState(null);
@@ -81,133 +66,113 @@ const ImageGallery = () => {
const loaderRef = useRef(null);
const filterPanelRef = useRef(null);
const filterButtonRef = useRef(null);
+ const { openModal } = useModal();
+
+ const {
+ data,
+ fetchNextPage,
+ hasNextPage,
+ isLoading,
+ isFetchingNextPage,
+ refetch,
+ } = useImageGallery(selectedProjectId, appliedFilters);
+
+ const images = data?.pages.flatMap((page) => page.data) || [];
useEffect(() => {
- const handleClickOutside = (event) => {
+ const handleClick = (e) => {
if (
filterPanelRef.current &&
- !filterPanelRef.current.contains(event.target) &&
+ !filterPanelRef.current.contains(e.target) &&
filterButtonRef.current &&
- !filterButtonRef.current.contains(event.target)
+ !filterButtonRef.current.contains(e.target)
) {
setIsFilterPanelOpen(false);
}
};
+ document.addEventListener("mousedown", handleClick);
+ return () => document.removeEventListener("mousedown", handleClick);
+ }, []);
- if (isFilterPanelOpen) {
- document.addEventListener("mousedown", handleClickOutside);
- } else {
- document.removeEventListener("mousedown", handleClickOutside);
- }
+ useEffect(() => {
+ if (selectedProjectId) refetch();
+ }, [selectedProjectId, appliedFilters, refetch]);
- return () => {
- document.removeEventListener("mousedown", handleClickOutside);
+ useEffect(() => {
+ const handler = (data) => {
+ if (data.projectId === selectedProjectId) refetch();
};
- }, [isFilterPanelOpen]);
+ eventBus.on("image_gallery", handler);
+ return () => eventBus.off("image_gallery", handler);
+ }, [selectedProjectId, refetch]);
- useEffect(() => {
- if (!selectedProjectId) {
- resetGallery();
- return;
- }
+useEffect(() => {
+ if (!loaderRef.current) return;
- resetGallery();
- fetchImages(1, appliedFilters, true);
- }, [selectedProjectId, appliedFilters]);
-
- useEffect(() => {
- const handleExternalEvent = (data) => {
- if (selectedProjectId === data.projectId) {
- resetGallery();
- fetchImages(1, appliedFilters, true);
+ const observer = new IntersectionObserver(
+ ([entry]) => {
+ if (entry.isIntersecting && hasNextPage && !isFetchingNextPage && !isLoading) {
+ fetchNextPage();
}
- };
+ },
+ { rootMargin: "200px", threshold: 0.1 }
+ );
- eventBus.on("image_gallery", handleExternalEvent);
+ observer.observe(loaderRef.current);
- return () => {
- eventBus.off("image_gallery", handleExternalEvent);
- };
- }, [appliedFilters, fetchImages, selectedProjectId]);
+ return () => {
+ if (loaderRef.current) {
+ observer.unobserve(loaderRef.current);
+ }
+ };
+}, [hasNextPage, isFetchingNextPage, isLoading, fetchNextPage]);
- useEffect(() => {
- if (!loaderRef.current) return;
- const observer = new IntersectionObserver(
- (entries) => {
- if (entries[0].isIntersecting && hasMore && !loadingMore && !loading) {
- setPageNumber((prevPageNumber) => prevPageNumber + 1);
+ // Utility: derive filter options
+ const getUniqueValues = useCallback(
+ (idKey, nameKey) => {
+ const m = new Map();
+ images.forEach((batch) => {
+ const id = idKey === "floorIds" ? batch.floorIds : batch[idKey];
+ if (id && batch[nameKey] && !m.has(id)) {
+ m.set(id, batch[nameKey]);
}
- },
- {
- root: null,
- rootMargin: "200px",
- threshold: 0.1,
- }
- );
+ });
+ return [...m.entries()].sort((a, b) => a[1].localeCompare(b[1]));
+ },
+ [images]
+ );
- observer.observe(loaderRef.current);
-
- return () => {
- if (loaderRef.current) {
- observer.unobserve(loaderRef.current);
- }
- };
- }, [hasMore, loadingMore, loading]);
-
- useEffect(() => {
- if (pageNumber > 1) {
- fetchImages(pageNumber, appliedFilters);
- }
- }, [pageNumber]);
-
- const getUniqueValuesWithIds = useCallback((idKey, nameKey) => {
- const map = new Map();
- allImagesData.forEach(batch => {
- let id = idKey === "floorIds" ? batch.floorIds : batch[idKey];
- const name = batch[nameKey];
- if (id && name && !map.has(id)) {
- map.set(id, name);
- }
- });
- return Array.from(map.entries()).sort((a, b) => a[1].localeCompare(b[1]));
- }, [allImagesData]);
-
- const getUniqueUploadedByUsers = useCallback(() => {
- const uniqueUsersMap = new Map();
- allImagesData.forEach(batch => {
- batch.documents.forEach(doc => {
- if (doc.uploadedBy && doc.uploadedBy.id) {
- const fullName = `${doc.uploadedBy.firstName || ""} ${doc.uploadedBy.lastName || ""}`.trim();
- if (fullName) {
- uniqueUsersMap.set(doc.uploadedBy.id, fullName);
- }
+ const getUploadedBy = useCallback(() => {
+ const m = new Map();
+ images.forEach((batch) => {
+ batch.documents.forEach((doc) => {
+ const name = `${doc.uploadedBy?.firstName || ""} ${
+ doc.uploadedBy?.lastName || ""
+ }`.trim();
+ if (doc.uploadedBy?.id && name && !m.has(doc.uploadedBy.id)) {
+ m.set(doc.uploadedBy.id, name);
}
});
});
- return Array.from(uniqueUsersMap.entries()).sort((a, b) => a[1].localeCompare(b[1]));
- }, [allImagesData]);
+ return [...m.entries()].sort((a, b) => a[1].localeCompare(b[1]));
+ }, [images]);
- const buildings = getUniqueValuesWithIds("buildingId", "buildingName");
- const floors = getUniqueValuesWithIds("floorIds", "floorName");
- const activities = getUniqueValuesWithIds("activityId", "activityName");
- const workAreas = getUniqueValuesWithIds("workAreaId", "workAreaName");
- const uploadedByUsers = getUniqueUploadedByUsers();
- const workCategories = getUniqueValuesWithIds("workCategoryId", "workCategoryName");
+ const buildings = getUniqueValues("buildingId", "buildingName");
+ const floors = getUniqueValues("floorIds", "floorName");
+ const activities = getUniqueValues("activityId", "activityName");
+ const workAreas = getUniqueValues("workAreaId", "workAreaName");
+ const workCategories = getUniqueValues("workCategoryId", "workCategoryName");
+ const uploadedByUsers = getUploadedBy();
- const toggleFilter = useCallback((type, itemId, itemName) => {
+ const toggleFilter = useCallback((type, id, name) => {
setSelectedFilters((prev) => {
- const current = prev[type];
- const isSelected = current.some((item) => item[0] === itemId);
-
- const newArray = isSelected
- ? current.filter((item) => item[0] !== itemId)
- : [...current, [itemId, itemName]];
-
- return {
- ...prev,
- [type]: newArray,
- };
+ const arr = prev[type];
+ const exists = arr.some(([x]) => x === id);
+ const updated = exists
+ ? arr.filter(([x]) => x !== id)
+ : [...arr, [id, name]];
+ return { ...prev, [type]: updated };
});
}, []);
@@ -220,48 +185,33 @@ const ImageGallery = () => {
}, []);
const toggleCollapse = useCallback((type) => {
- setCollapsedFilters((prev) => ({
- ...prev,
- [type]: !prev[type],
- }));
+ setCollapsedFilters((prev) => ({ ...prev, [type]: !prev[type] }));
}, []);
const handleApplyFilters = useCallback(() => {
const payload = {
- buildingIds: selectedFilters.building.length ? selectedFilters.building.map((item) => item[0]) : null,
- floorIds: selectedFilters.floor.length ? selectedFilters.floor.map((item) => item[0]) : null,
- workAreaIds: selectedFilters.workArea.length ? selectedFilters.workArea.map((item) => item[0]) : null,
- workCategoryIds: selectedFilters.workCategory.length ? selectedFilters.workCategory.map((item) => item[0]) : null,
- activityIds: selectedFilters.activity.length ? selectedFilters.activity.map((item) => item[0]) : null,
- uploadedByIds: selectedFilters.uploadedBy.length ? selectedFilters.uploadedBy.map((item) => item[0]) : null,
+ buildingIds: selectedFilters.building.map(([x]) => x) || null,
+ floorIds: selectedFilters.floor.map(([x]) => x) || null,
+ activityIds: selectedFilters.activity.map(([x]) => x) || null,
+ uploadedByIds: selectedFilters.uploadedBy.map(([x]) => x) || null,
+ workCategoryIds: selectedFilters.workCategory.map(([x]) => x) || null,
+ workAreaIds: selectedFilters.workArea.map(([x]) => x) || null,
startDate: selectedFilters.startDate || null,
endDate: selectedFilters.endDate || null,
};
-
- const areFiltersChanged = Object.keys(payload).some(key => {
- const oldVal = appliedFilters[key];
- const newVal = payload[key];
- if (Array.isArray(oldVal) && Array.isArray(newVal)) {
- if (oldVal.length !== newVal.length) return true;
- const oldSet = new Set(oldVal);
- const newSet = new Set(newVal);
- for (const item of newSet) {
- if (!oldSet.has(item)) return true;
- }
- return false;
- }
- if ((oldVal === null && newVal === "") || (oldVal === "" && newVal === null)) return false;
- return oldVal !== newVal;
+ const changed = Object.keys(payload).some((key) => {
+ const oldVal = appliedFilters[key],
+ newVal = payload[key];
+ return Array.isArray(oldVal)
+ ? oldVal.length !== newVal.length ||
+ oldVal.some((x) => !newVal.includes(x))
+ : oldVal !== newVal;
});
-
- if (areFiltersChanged) {
- setAppliedFilters(payload);
- resetGallery();
- }
+ if (changed) setAppliedFilters(payload);
}, [selectedFilters, appliedFilters]);
- const handleClearAllFilters = useCallback(() => {
- const initialStateSelected = {
+ const handleClear = useCallback(() => {
+ setSelectedFilters({
building: [],
floor: [],
activity: [],
@@ -270,10 +220,8 @@ const ImageGallery = () => {
workArea: [],
startDate: "",
endDate: "",
- };
- setSelectedFilters(initialStateSelected);
-
- const initialStateApplied = {
+ });
+ setAppliedFilters({
buildingIds: null,
floorIds: null,
activityIds: null,
@@ -282,69 +230,70 @@ const ImageGallery = () => {
workAreaIds: null,
startDate: null,
endDate: null,
- };
- setAppliedFilters(initialStateApplied);
- resetGallery();
+ });
}, []);
- const scrollLeft = useCallback((key) => {
- imageGroupRefs.current[key]?.scrollBy({ left: -200, behavior: "smooth" });
- }, []);
+ const scrollLeft = useCallback(
+ (key) =>
+ imageGroupRefs.current[key]?.scrollBy({ left: -200, behavior: "smooth" }),
+ []
+ );
+ const scrollRight = useCallback(
+ (key) =>
+ imageGroupRefs.current[key]?.scrollBy({ left: 200, behavior: "smooth" }),
+ []
+ );
- const scrollRight = useCallback((key) => {
- imageGroupRefs.current[key]?.scrollBy({ left: 200, behavior: "smooth" });
- }, []);
-
- const renderFilterCategory = (label, items, type) => (
-
-
toggleCollapse(type)}>
+ const renderCategory = (label, items, type) => (
+
+
toggleCollapse(type)}
+ >
{label}
- {type === "dateRange" && (selectedFilters.startDate || selectedFilters.endDate) && (
+ {((type === "dateRange" &&
+ (selectedFilters.startDate || selectedFilters.endDate)) ||
+ (type !== "dateRange" && selectedFilters[type]?.length > 0)) && (
)}
- {type !== "dateRange" && selectedFilters[type]?.length > 0 && (
-
- )}
- {collapsedFilters[type] ? '+' : '-'}
+
+ {collapsedFilters[type] ? "+" : "-"}
+
{!collapsedFilters[type] && (
{type === "dateRange" ? (
-
-
-
+
) : (
- items.map(([itemId, itemName]) => (
-