admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

filter_offcanvas : Added Offcanvas Filter Support for All Pages #310

Merged
pramod.mahajan merged 3 commits from filter_offcanvas into Feature_Expense 2025-07-30 06:48:58 +00:00
Conversation 0 Commits 3 Files Changed 9 +2 -61
1 changed files with 2 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9e311ef73c - Show all commits

63
src/pages/Activities/AttendancePage.jsx
View File

@ -8,24 +8,19 @@ import {
import Breadcrumb from "../../components/common/Breadcrumb"; import Breadcrumb from "../../components/common/Breadcrumb";
import AttendanceLog from "../../components/Activities/AttendcesLogs"; import AttendanceLog from "../../components/Activities/AttendcesLogs";
import Attendance from "../../components/Activities/Attendance"; import Attendance from "../../components/Activities/Attendance";
// import AttendanceModel from "../../components/Activities/AttendanceModel";
import showToast from "../../services/toastService"; import showToast from "../../services/toastService";
// import { useProjects } from "../../hooks/useProjects";
import Regularization from "../../components/Activities/Regularization"; import Regularization from "../../components/Activities/Regularization";
import { useAttendance } from "../../hooks/useAttendance"; import { useAttendance } from "../../hooks/useAttendance";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { setProjectId } from "../../slices/localVariablesSlice"; import { setProjectId } from "../../slices/localVariablesSlice";
// import { markCurrentAttendance } from "../../slices/apiSlice/attendanceAllSlice";
import { hasUserPermission } from "../../utils/authUtils"; import { hasUserPermission } from "../../utils/authUtils";
import { useHasUserPermission } from "../../hooks/useHasUserPermission"; import { useHasUserPermission } from "../../hooks/useHasUserPermission";
import { REGULARIZE_ATTENDANCE } from "../../utils/constants"; import { REGULARIZE_ATTENDANCE } from "../../utils/constants";
import eventBus from "../../services/eventBus"; import eventBus from "../../services/eventBus";
// import AttendanceRepository from "../../repositories/AttendanceRepository";
import { useProjectName } from "../../hooks/useProjects"; import { useProjectName } from "../../hooks/useProjects";
import GlobalModel from "../../components/common/GlobalModel"; import GlobalModel from "../../components/common/GlobalModel";
import CheckCheckOutmodel from "../../components/Activities/CheckCheckOutForm"; import CheckCheckOutmodel from "../../components/Activities/CheckCheckOutForm";
import AttendLogs from "../../components/Activities/AttendLogs"; import AttendLogs from "../../components/Activities/AttendLogs";
// import Confirmation from "../../components/Activities/Confirmation";
import { useQueryClient } from "@tanstack/react-query"; import { useQueryClient } from "@tanstack/react-query";
const AttendancePage = () => { const AttendancePage = () => {
@ -35,11 +30,7 @@ const AttendancePage = () => {
const loginUser = getCachedProfileData(); const loginUser = getCachedProfileData();
var selectedProject = useSelector((store) => store.localVariables.projectId); var selectedProject = useSelector((store) => store.localVariables.projectId);
const dispatch = useDispatch(); const dispatch = useDispatch();
// const {
// attendance,
// loading: attLoading,
// recall: attrecall,
// } = useAttendance(selectedProject);
const [attendances, setAttendances] = useState(); const [attendances, setAttendances] = useState();
const [empRoles, setEmpRoles] = useState(null); const [empRoles, setEmpRoles] = useState(null);
const [isCreateModalOpen, setIsCreateModalOpen] = useState(false); const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);
@ -53,33 +44,6 @@ const AttendancePage = () => {
date: new Date().toLocaleDateString(), date: new Date().toLocaleDateString(),
}); });
// const handler = useCallback(
// (msg) => {
// if (selectedProject == msg.projectId) {
// const updatedAttendance = attendances.map((item) =>
// item.employeeId === msg.response.employeeId
// ? { ...item, ...msg.response }
// : item
// );
// queryClient.setQueryData(["attendance", selectedProject], (oldData) => {
// if (!oldData) return oldData;
// return oldData.map((emp) =>
// emp.employeeId === data.employeeId ? { ...emp, ...data } : emp
// );
// });
// }
// },
// [selectedProject, attrecall]
// );
// const employeeHandler = useCallback(
// (msg) => {
// if (attendances.some((item) => item.employeeId == msg.employeeId)) {
// attrecall();
// }
// },
// [selectedProject, attendances]
// );
useEffect(() => { useEffect(() => {
if (selectedProject == null) { if (selectedProject == null) {
dispatch(setProjectId(projectNames[0]?.id)); dispatch(setProjectId(projectNames[0]?.id));
@ -117,32 +81,9 @@ const AttendancePage = () => {
} }
}, [modelConfig, isCreateModalOpen]); }, [modelConfig, isCreateModalOpen]);
// useEffect(() => {
// eventBus.on("attendance", handler);
// return () => eventBus.off("attendance", handler);
// }, [handler]);
// useEffect(() => {
// eventBus.on("employee", employeeHandler);
// return () => eventBus.off("employee", employeeHandler);
// }, [employeeHandler]);
return ( return (
<> <>
{/* {isCreateModalOpen && modelConfig && (
<div
className="modal fade show"
style={{ display: "block" }}
id="check-Out-modalg"
tabIndex="-1"
aria-hidden="true"
>
<AttendanceModel
modelConfig={modelConfig}
closeModal={closeModal}
handleSubmitForm={handleSubmit}
/>
</div>
)} */}
{isCreateModalOpen && modelConfig && ( {isCreateModalOpen && modelConfig && (
<GlobalModel <GlobalModel
isOpen={isCreateModalOpen} isOpen={isCreateModalOpen}