-
Select Team
-
);
};
export default AssignTask;
\ No newline at end of file
diff --git a/src/pages/Activities/AttendancePage.jsx b/src/pages/Activities/AttendancePage.jsx
index c434290a..3483cc5e 100644
--- a/src/pages/Activities/AttendancePage.jsx
+++ b/src/pages/Activities/AttendancePage.jsx
@@ -1,10 +1,8 @@
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";
@@ -23,63 +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 [showPending, setShowPending] = useState(false); // Renamed for consistency
- const [searchQuery, setSearchQuery] = useState("");
- const loginUser = getCachedProfileData();
- const selectedProject = useSelector((store) => store.localVariables.projectId);
- const dispatch = useDispatch();
+ // const loginUser = getCachedProfileData(); // Declared but not used
const selectedProject = useSelector((store) => store.localVariables.projectId);
const dispatch = useDispatch();
+
const {
attendance,
loading: attLoading,
- recall: attrecall,
- } = useAttendance(selectedProject); // Corrected typo: useAttendace to useAttendance
+ // 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) => {
@@ -90,25 +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);
- 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");
@@ -118,25 +118,20 @@ const AttendancePage = () => {
if (modalBackdrop) {
modalBackdrop.remove();
}
- const modalBackdrop = document.querySelector(".modal-backdrop");
- if (modalBackdrop) {
- 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,
@@ -151,45 +146,33 @@ const AttendancePage = () => {
.catch((error) => {
showToast(error.message, "error");
});
- };
+ }, [dispatch, attendances, selectedProject]);
- const handleToggle = (event) => {
+ const handleToggle = useCallback((event) => {
setShowPending(event.target.checked);
- 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
- 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;
- // Filter and search logic for the 'Today's' tab (Attendance component)
const filteredAndSearchedTodayAttendance = useCallback(() => {
let currentData = attendances;
- if (showPending) {
- currentData = currentData?.filter(
if (showPending) {
currentData = currentData?.filter(
(att) => att?.checkInTime !== null && att?.checkOutTime === null
@@ -199,33 +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
- .join(" ")
- .toLowerCase();
-
- return (
- att.employeeName?.toLowerCase().includes(lowerCaseSearchQuery) ||
- att.employeeId?.toLowerCase().includes(lowerCaseSearchQuery) ||
- fullName.includes(lowerCaseSearchQuery)
- );
- });
- }
- return currentData;
- }, [attendances, showPending, searchQuery]);
-
-
- // Event bus listeners
- );
- }
-
- 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();
@@ -250,6 +208,7 @@ const AttendancePage = () => {
eventBus.on("employee", employeeHandler);
return () => eventBus.off("employee", employeeHandler);
}, [employeeHandler]);
+
return (
<>
{isCreateModalOpen && modelConfig && (
@@ -317,60 +276,10 @@ const AttendancePage = () => {
setSearchQuery(e.target.value)}
- // style={{ width: "200px", height: "30px" }} // Optional: further reduce width/height
- />
-
-
-
-
-
-
-
-
- -
-
-
- -
-
-
-
- {/* Search Box remains here */}
-
- setSearchQuery(e.target.value)}
- // style={{ width: "200px", height: "30px" }} // Optional: further reduce width/height
/>
@@ -392,13 +301,12 @@ const AttendancePage = () => {
{!attLoading && filteredAndSearchedTodayAttendance()?.length === 0 && (
{" "}
- {showPending
{showPending
? "No Pending Available"
: "No Employee assigned yet."}{" "}
)}
-
+
)}
{activeTab === "logs" && (
@@ -407,9 +315,7 @@ const AttendancePage = () => {
projectId={selectedProject}
setshowOnlyCheckout={setShowPending}
showOnlyCheckout={showPending}
- searchQuery={searchQuery} // Pass search query to AttendanceLog
- showOnlyCheckout={showPending}
- searchQuery={searchQuery} // Pass search query to AttendanceLog
+ searchQuery={searchQuery}
/>
)}
@@ -417,11 +323,7 @@ const AttendancePage = () => {