diff --git a/src/components/Activities/Attendance.jsx b/src/components/Activities/Attendance.jsx index 2dde2938..f7432f4d 100644 --- a/src/components/Activities/Attendance.jsx +++ b/src/components/Activities/Attendance.jsx @@ -10,7 +10,7 @@ import { useAttendance } from "../../hooks/useAttendance"; import { useSelector } from "react-redux"; import { useQueryClient } from "@tanstack/react-query"; import eventBus from "../../services/eventBus"; -import { useSelectedproject } from "../../slices/apiDataManager"; +import { useSelectedProject } from "../../slices/apiDataManager"; const Attendance = ({ getRole, handleModalData, searchTerm }) => { const queryClient = useQueryClient(); @@ -21,7 +21,7 @@ const Attendance = ({ getRole, handleModalData, searchTerm }) => { // const selectedProject = useSelector( // (store) => store.localVariables.projectId // ); - const selectedProject = useSelectedproject(); + const selectedProject = useSelectedProject(); const { attendance, loading: attLoading, diff --git a/src/components/Activities/AttendcesLogs.jsx b/src/components/Activities/AttendcesLogs.jsx index 548175d9..97350681 100644 --- a/src/components/Activities/AttendcesLogs.jsx +++ b/src/components/Activities/AttendcesLogs.jsx @@ -6,7 +6,7 @@ import RenderAttendanceStatus from "./RenderAttendanceStatus"; import { useSelector, useDispatch } from "react-redux"; import { fetchAttendanceData } from "../../slices/apiSlice/attedanceLogsSlice"; import DateRangePicker from "../common/DateRangePicker"; -import { clearCacheKey, getCachedData, useSelectedproject } from "../../slices/apiDataManager"; +import { clearCacheKey, getCachedData, useSelectedProject } from "../../slices/apiDataManager"; import eventBus from "../../services/eventBus"; import AttendanceRepository from "../../repositories/AttendanceRepository"; import { useAttendancesLogs } from "../../hooks/useAttendance"; @@ -37,7 +37,7 @@ const AttendanceLog = ({ handleModalData, searchTerm }) => { // const selectedProject = useSelector( // (store) => store.localVariables.projectId // ); - const selectedProject = useSelectedproject(); + const selectedProject = useSelectedProject(); const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" }); const dispatch = useDispatch(); const [loading, setLoading] = useState(false); diff --git a/src/components/Activities/CheckCheckOutForm.jsx b/src/components/Activities/CheckCheckOutForm.jsx index 1bcb7007..a77e9a31 100644 --- a/src/components/Activities/CheckCheckOutForm.jsx +++ b/src/components/Activities/CheckCheckOutForm.jsx @@ -9,7 +9,7 @@ import { markAttendance } from "../../slices/apiSlice/attedanceLogsSlice"; import showToast from "../../services/toastService"; import { checkIfCurrentDate } from "../../utils/dateUtils"; import { useMarkAttendance } from "../../hooks/useAttendance"; -import { useSelectedproject } from "../../slices/apiDataManager"; +import { useSelectedProject } from "../../slices/apiDataManager"; const createSchema = (modeldata) => { return z @@ -43,9 +43,8 @@ const createSchema = (modeldata) => { }); }; -const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm }) => { - // const projectId = useSelector((store) => store.localVariables.projectId); - const projectId = useSelectedproject(); +const CheckInCheckOut = ({ modeldata, closeModal, handleSubmitForm }) => { + const projectId = useSelectedProject(); const { mutate: MarkAttendance } = useMarkAttendance(); const [isLoading, setIsLoading] = useState(false); const coords = usePositionTracker(); @@ -173,7 +172,7 @@ const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm }) => { ); }; -export default CheckCheckOutmodel; +export default CheckInCheckOut; const schemaReg = z.object({ description: z.string().min(1, { message: "please give reason!" }), diff --git a/src/components/Activities/InfraPlanning.jsx b/src/components/Activities/InfraPlanning.jsx index 819994a4..664c0613 100644 --- a/src/components/Activities/InfraPlanning.jsx +++ b/src/components/Activities/InfraPlanning.jsx @@ -15,7 +15,7 @@ import {useDispatch, useSelector} from "react-redux"; import {useProfile} from "../../hooks/useProfile"; import {refreshData, setProjectId} from "../../slices/localVariablesSlice"; import InfraTable from "../Project/Infrastructure/InfraTable"; -import { useSelectedproject } from "../../slices/apiDataManager"; +import { useSelectedProject } from "../../slices/apiDataManager"; import Loader from "../common/Loader"; @@ -24,7 +24,7 @@ const InfraPlanning = () => const {profile: LoggedUser, refetch : fetchData} = useProfile() const dispatch = useDispatch() // const selectedProject = useSelector((store)=>store.localVariables.projectId) - const selectedProject = useSelectedproject(); + const selectedProject = useSelectedProject(); const {projectInfra, isLoading, error} = useProjectInfra( selectedProject ) @@ -35,15 +35,15 @@ const InfraPlanning = () => const reloadedData = useSelector( ( store ) => store.localVariables.reload ) - useEffect( () => - { - if (reloadedData) - { - refetch() - dispatch( refreshData( false ) ) - } + // useEffect( () => + // { + // if (reloadedData) + // { + // refetch() + // dispatch( refreshData( false ) ) + // } - },[reloadedData]) + // },[reloadedData]) return (
diff --git a/src/components/Activities/Regularization.jsx b/src/components/Activities/Regularization.jsx index 3e04caef..cdcd3972 100644 --- a/src/components/Activities/Regularization.jsx +++ b/src/components/Activities/Regularization.jsx @@ -7,13 +7,13 @@ import { useRegularizationRequests } from "../../hooks/useAttendance"; import moment from "moment"; import usePagination from "../../hooks/usePagination"; import eventBus from "../../services/eventBus"; -import { cacheData, clearCacheKey, useSelectedproject } from "../../slices/apiDataManager"; +import { cacheData, clearCacheKey, useSelectedProject } from "../../slices/apiDataManager"; import { useQueryClient } from "@tanstack/react-query"; const Regularization = ({ handleRequest, searchTerm }) => { const queryClient = useQueryClient(); // var selectedProject = useSelector((store) => store.localVariables.projectId); - const selectedProject = useSelectedproject(); + const selectedProject = useSelectedProject(); const [regularizesList, setregularizedList] = useState([]); const { regularizes, loading, error, refetch } = useRegularizationRequests(selectedProject); diff --git a/src/components/Activities/RegularizationActions.jsx b/src/components/Activities/RegularizationActions.jsx index 318b8382..1fcb3485 100644 --- a/src/components/Activities/RegularizationActions.jsx +++ b/src/components/Activities/RegularizationActions.jsx @@ -4,7 +4,7 @@ import useAttendanceStatus, { ACTIONS } from '../../hooks/useAttendanceStatus'; import { useDispatch, useSelector } from 'react-redux'; import { usePositionTracker } from '../../hooks/usePositionTracker'; import {markCurrentAttendance} from '../../slices/apiSlice/attendanceAllSlice'; -import {cacheData, getCachedData, useSelectedproject} from '../../slices/apiDataManager'; +import {cacheData, getCachedData, useSelectedProject} from '../../slices/apiDataManager'; import showToast from '../../services/toastService'; import { useMarkAttendance } from '../../hooks/useAttendance'; import { useQueryClient } from '@tanstack/react-query'; @@ -18,7 +18,7 @@ const {mutate:MarkAttendance,isPending} = useMarkAttendance() const queryClient = useQueryClient() // const projectId = useSelector((store)=>store.localVariables.projectId) -const projectId = useSelectedproject(); +const projectId = useSelectedProject(); const {latitude,longitude} = usePositionTracker(); const dispatch = useDispatch() diff --git a/src/components/Layout/Header.jsx b/src/components/Layout/Header.jsx index 3edaeb0c..94ec39ac 100644 --- a/src/components/Layout/Header.jsx +++ b/src/components/Layout/Header.jsx @@ -3,7 +3,7 @@ import { cacheData, clearAllCache, getCachedData, - useSelectedproject, + useSelectedProject, } from "../../slices/apiDataManager"; import AuthRepository from "../../repositories/AuthRepository"; import { useDispatch, useSelector } from "react-redux"; @@ -101,7 +101,7 @@ const Header = () => { const { projectNames, loading: projectLoading, fetchData } = useProjectName(); - const selectedProject = useSelectedproject(); + const selectedProject = useSelectedProject(); const projectsForDropdown = isDashboardPath ? projectNames diff --git a/src/components/Project/AboutProject.jsx b/src/components/Project/AboutProject.jsx index 204fe759..248a9141 100644 --- a/src/components/Project/AboutProject.jsx +++ b/src/components/Project/AboutProject.jsx @@ -8,7 +8,7 @@ import { MANAGE_PROJECT } from "../../utils/constants"; import GlobalModel from "../common/GlobalModel"; import ManageProjectInfo from "./ManageProjectInfo"; import { useQueryClient } from "@tanstack/react-query"; -import { useSelectedproject } from "../../slices/apiDataManager"; +import { useSelectedProject } from "../../slices/apiDataManager"; const AboutProject = () => { const [IsOpenModal, setIsOpenModal] = useState(false); @@ -21,7 +21,7 @@ const AboutProject = () => { // *** MODIFIED LINE: Get projectId from Redux store using useSelector *** // const projectId = useSelector((store) => store.localVariables.projectId); - const projectId = useSelectedproject(); + const projectId = useSelectedProject(); const manageProject = useHasUserPermission(MANAGE_PROJECT); const { projects_Details, isLoading, error, refetch } = useProjectDetails(projectId); // Pass projectId from useSelector diff --git a/src/components/Project/ProjectInfra.jsx b/src/components/Project/ProjectInfra.jsx index 047e41c5..edb8c34b 100644 --- a/src/components/Project/ProjectInfra.jsx +++ b/src/components/Project/ProjectInfra.jsx @@ -15,7 +15,7 @@ import { cacheData, clearCacheKey, getCachedData, - useSelectedproject, + useSelectedProject, } from "../../slices/apiDataManager"; import { useProjectDetails, useProjectInfra } from "../../hooks/useProjects"; import { useDispatch, useSelector } from "react-redux"; @@ -27,7 +27,7 @@ import GlobalModel from "../common/GlobalModel"; const ProjectInfra = ( {data, onDataChange, eachSiteEngineer} ) => { // const projectId = useSelector((store)=>store.localVariables.projectId) - const projectId = useSelectedproject(); + const projectId = useSelectedProject(); const reloadedData = useSelector((store) => store.localVariables.reload); const [ expandedBuildings, setExpandedBuildings ] = useState( [] ); const {projectInfra,isLoading,error} = useProjectInfra(projectId) diff --git a/src/components/Project/Teams.jsx b/src/components/Project/Teams.jsx index cb725e30..0d4a1eb6 100644 --- a/src/components/Project/Teams.jsx +++ b/src/components/Project/Teams.jsx @@ -18,12 +18,12 @@ import { useEmployeesByProjectAllocated, useManageProjectAllocation, } from "../../hooks/useProjects"; -import { useSelectedproject } from "../../slices/apiDataManager"; +import { useSelectedProject } from "../../slices/apiDataManager"; const Teams = () => { // const {projectId} = useParams() // const projectId = useSelector((store)=>store.localVariables.projectId) - const projectId = useSelectedproject(); + const projectId = useSelectedProject(); const dispatch = useDispatch(); const { data, loading } = useMaster(); diff --git a/src/hooks/useAttendance.js b/src/hooks/useAttendance.js index 022db4c2..708cde50 100644 --- a/src/hooks/useAttendance.js +++ b/src/hooks/useAttendance.js @@ -1,5 +1,5 @@ import { useEffect, useState } from "react"; -import { cacheData, getCachedData, useSelectedproject } from "../slices/apiDataManager"; +import { cacheData, getCachedData, useSelectedProject } from "../slices/apiDataManager"; import AttendanceRepository from "../repositories/AttendanceRepository"; import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; import showToast from "../services/toastService"; @@ -143,8 +143,7 @@ export const useRegularizationRequests = (projectId) => { export const useMarkAttendance = () => { const queryClient = useQueryClient(); - // const selectedProject = useSelector((store)=>store.localVariables.projectId) - const selectedProject = useSelectedproject(); + const selectedProject = useSelectedProject(); const selectedDateRange = useSelector((store)=>store.localVariables.defaultDateRange) return useMutation({ diff --git a/src/pages/Activities/AttendancePage.jsx b/src/pages/Activities/AttendancePage.jsx index d2b87e22..c2c65623 100644 --- a/src/pages/Activities/AttendancePage.jsx +++ b/src/pages/Activities/AttendancePage.jsx @@ -4,7 +4,7 @@ import { clearCacheKey, getCachedData, getCachedProfileData, - useSelectedproject, + useSelectedProject, } from "../../slices/apiDataManager"; import Breadcrumb from "../../components/common/Breadcrumb"; import AttendanceLog from "../../components/Activities/AttendcesLogs"; @@ -26,11 +26,11 @@ import { useQueryClient } from "@tanstack/react-query"; const AttendancePage = () => { const [activeTab, setActiveTab] = useState("all"); const [ShowPending, setShowPending] = useState(false); - const [searchTerm, setSearchTerm] = useState(""); // 🔹 New state for search + const [searchTerm, setSearchTerm] = useState(""); const queryClient = useQueryClient(); const loginUser = getCachedProfileData(); - // const selectedProject = useSelector((store) => store.localVariables.projectId); - const selectedProject = useSelectedproject(); + + const selectedProject = useSelectedProject(); const dispatch = useDispatch(); const [attendances, setAttendances] = useState(); diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx index 1837f6fa..038bd693 100644 --- a/src/pages/Activities/DailyTask.jsx +++ b/src/pages/Activities/DailyTask.jsx @@ -13,13 +13,13 @@ import SubTask from "../../components/Activities/SubTask"; import { formatNumber, formatUTCToLocalTime } from "../../utils/dateUtils"; import { useHasUserPermission } from "../../hooks/useHasUserPermission"; import { APPROVE_TASK, ASSIGN_REPORT_TASK } from "../../utils/constants"; -import { useSelectedproject } from "../../slices/apiDataManager"; +import { useSelectedProject } from "../../slices/apiDataManager"; import moment from "moment"; import Loader from "../../components/common/Loader"; const DailyTask = () => { const dispatch = useDispatch(); - const selectedProject = useSelectedproject(); + const selectedProject = useSelectedProject(); const { projectNames } = useProjectName(); const ApprovedTaskRights = useHasUserPermission(APPROVE_TASK); const ReportTaskRights = useHasUserPermission(ASSIGN_REPORT_TASK); @@ -41,6 +41,7 @@ const DailyTask = () => { // Ensure project is set useEffect(() => { if (!selectedProject && projectNames.length > 0) { + debugger dispatch(setProjectId(projectNames[0].id)); } }, [selectedProject, projectNames, dispatch]); diff --git a/src/pages/Activities/TaskPlannng.jsx b/src/pages/Activities/TaskPlannng.jsx index ed51490c..0f05b242 100644 --- a/src/pages/Activities/TaskPlannng.jsx +++ b/src/pages/Activities/TaskPlannng.jsx @@ -4,10 +4,10 @@ import InfraPlanning from "../../components/Activities/InfraPlanning"; import { useProjectName } from "../../hooks/useProjects"; import { useDispatch, useSelector } from "react-redux"; import { setProjectId } from "../../slices/localVariablesSlice"; -import { useSelectedproject } from "../../slices/apiDataManager"; +import { useSelectedProject } from "../../slices/apiDataManager"; const TaskPlannng = () => { - const selectedProject = useSelectedproject(); + const selectedProject = useSelectedProject(); const dispatch = useDispatch(); const { projectNames, loading: projectLoading } = useProjectName(); @@ -15,6 +15,7 @@ const TaskPlannng = () => { useEffect(() => { if (!initialized.current && projectNames.length > 0 && !selectedProject?.id) { + debugger dispatch(setProjectId(projectNames[0].id)); initialized.current = true; } diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx index 935add9b..5cd7ab2d 100644 --- a/src/pages/employee/EmployeeList.jsx +++ b/src/pages/employee/EmployeeList.jsx @@ -18,7 +18,7 @@ import { VIEW_ALL_EMPLOYEES, VIEW_TEAM_MEMBERS, } from "../../utils/constants"; -import { clearCacheKey, useSelectedproject } from "../../slices/apiDataManager"; +import { clearCacheKey, useSelectedProject } from "../../slices/apiDataManager"; import { useHasUserPermission } from "../../hooks/useHasUserPermission"; import SuspendEmp from "../../components/Employee/SuspendEmp"; // Keep if you use SuspendEmp import { @@ -41,7 +41,7 @@ const EmployeeList = () => { // const selectedProjectId = useSelector( // (store) => store.localVariables.projectId // ); - const selectedProjectId = useSelectedproject(); + const selectedProjectId = useSelectedProject(); const { projectNames, loading: projectLoading, fetchData } = useProjectName(); const dispatch = useDispatch(); diff --git a/src/pages/project/ProjectDetails.jsx b/src/pages/project/ProjectDetails.jsx index 75f7705b..1df27bb9 100644 --- a/src/pages/project/ProjectDetails.jsx +++ b/src/pages/project/ProjectDetails.jsx @@ -13,7 +13,7 @@ import { cacheData, clearCacheKey, getCachedData, - useSelectedproject, + useSelectedProject, } from "../../slices/apiDataManager"; import "./ProjectDetails.css"; import { @@ -29,7 +29,7 @@ import { setProjectId } from "../../slices/localVariablesSlice"; const ProjectDetails = () => { - const projectId = useSelectedproject() + const projectId = useSelectedProject() const { projectNames, fetchData } = useProjectName(); const dispatch = useDispatch() diff --git a/src/slices/apiDataManager.jsx b/src/slices/apiDataManager.jsx index d0f8bc67..97f6dcb5 100644 --- a/src/slices/apiDataManager.jsx +++ b/src/slices/apiDataManager.jsx @@ -33,13 +33,12 @@ export const clearAllCache = () => { export const cacheProfileData = ( data) => { store.dispatch(setLoginUserPermmisions(data)); }; - // Get cached data export const getCachedProfileData = () => { return store.getState().globalVariables.loginUser; }; -export const useSelectedproject = () => { +export const useSelectedProject = () => { const selectedProject = useSelector((store)=> store.localVariables.projectId); var project = localStorage.getItem("project"); if(project){ @@ -47,7 +46,7 @@ export const useSelectedproject = () => { } else{ return selectedProject } - // return project ? selectedProject + }; \ No newline at end of file