From 58c3f22744fca6b07a6031168c9d25cb58c25848 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Wed, 30 Apr 2025 13:30:00 +0530 Subject: [PATCH] time slot should display according activity --- .../Activities/CheckCheckOutForm.jsx | 9 +- .../Activities/RenderAttendanceStatus.jsx | 6 +- src/components/Layout/Header.jsx | 2 +- src/components/common/TimePicker.jsx | 96 ++++++++++++++----- 4 files changed, 84 insertions(+), 29 deletions(-) diff --git a/src/components/Activities/CheckCheckOutForm.jsx b/src/components/Activities/CheckCheckOutForm.jsx index adbb00e3..70f239be 100644 --- a/src/components/Activities/CheckCheckOutForm.jsx +++ b/src/components/Activities/CheckCheckOutForm.jsx @@ -16,11 +16,11 @@ const schema = z.object({ }); const CheckCheckOutmodel = ({modeldata,closeModal,handleSubmitForm,}) => { - const projectId = useSelector((store)=>store.localVariables.projectId) const [isLoading, setIsLoading] = useState(false); const coords = usePositionTracker(); const dispatch = useDispatch() + console.log(modeldata) const { register, @@ -72,7 +72,9 @@ const CheckCheckOutmodel = ({modeldata,closeModal,handleSubmitForm,}) => { setValue("markTime", e)} - interval={10} + interval={10} + activity={modeldata?.action} + checkInTime={modeldata?.checkInTime} /> {errors. markTime &&

{errors.markTime.message}

} @@ -124,7 +126,8 @@ const schemaReg = z.object({ -export const Regularization = ({modeldata,closeModal,handleSubmitForm})=>{ +export const Regularization = ( {modeldata, closeModal, handleSubmitForm} ) => +{ const [isLoading, setIsLoading] = useState(false); const coords = usePositionTracker(); diff --git a/src/components/Activities/RenderAttendanceStatus.jsx b/src/components/Activities/RenderAttendanceStatus.jsx index 647fb2f2..3802b367 100644 --- a/src/components/Activities/RenderAttendanceStatus.jsx +++ b/src/components/Activities/RenderAttendanceStatus.jsx @@ -4,8 +4,7 @@ import useAttendanceStatus from "../../hooks/useAttendanceStatus"; const RenderAttendanceStatus = ({ attendanceData, handleModalData,Tab,currentDate}) => { - const { text, color, disabled, action,checkInTime } = useAttendanceStatus(attendanceData); - + const {text, color, disabled, action, checkInTime} = useAttendanceStatus( attendanceData ); const handleButtonClick = (key) => { if(key === 6){ @@ -17,7 +16,8 @@ const RenderAttendanceStatus = ({ attendanceData, handleModalData,Tab,currentDat action, employeeId: attendanceData?.employeeId, id: attendanceData?.id, - currentDate + currentDate, + checkInTime:attendanceData.checkInTime }); } }; diff --git a/src/components/Layout/Header.jsx b/src/components/Layout/Header.jsx index aeb5429c..f1291599 100644 --- a/src/components/Layout/Header.jsx +++ b/src/components/Layout/Header.jsx @@ -70,7 +70,7 @@ const Header = () => {