From a01e2deee7647f05d02b37ec1a90f7c2cc40eab6 Mon Sep 17 00:00:00 2001 From: Kartik Sharma Date: Sat, 23 Aug 2025 13:19:41 +0530 Subject: [PATCH] Changes in Regularizationaction. --- src/components/Activities/CheckCheckOutForm.jsx | 4 +++- src/components/Activities/RegularizationActions.jsx | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/Activities/CheckCheckOutForm.jsx b/src/components/Activities/CheckCheckOutForm.jsx index 333b60f8..1bcb7007 100644 --- a/src/components/Activities/CheckCheckOutForm.jsx +++ b/src/components/Activities/CheckCheckOutForm.jsx @@ -9,6 +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"; const createSchema = (modeldata) => { return z @@ -43,7 +44,8 @@ const createSchema = (modeldata) => { }; const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm }) => { - const projectId = useSelector((store) => store.localVariables.projectId); + // const projectId = useSelector((store) => store.localVariables.projectId); + const projectId = useSelectedproject(); const { mutate: MarkAttendance } = useMarkAttendance(); const [isLoading, setIsLoading] = useState(false); const coords = usePositionTracker(); diff --git a/src/components/Activities/RegularizationActions.jsx b/src/components/Activities/RegularizationActions.jsx index 4ec9b7b9..318b8382 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} 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'; @@ -17,7 +17,8 @@ const [loadingReject,setLoadingForReject] = useState(false) const {mutate:MarkAttendance,isPending} = useMarkAttendance() const queryClient = useQueryClient() -const projectId = useSelector((store)=>store.localVariables.projectId) +// const projectId = useSelector((store)=>store.localVariables.projectId) +const projectId = useSelectedproject(); const {latitude,longitude} = usePositionTracker(); const dispatch = useDispatch()