Compare commits

...

4 Commits

Author SHA1 Message Date
Pramod Mahajan
4a5d9c05e6 set checkin-out button side right 2025-04-10 02:50:33 +05:30
Pramod Mahajan
60232cf121 added refetch fun 2025-04-10 02:49:05 +05:30
Pramod Mahajan
9e32986969 remove debugger 2025-04-10 02:47:51 +05:30
Pramod Mahajan
aa6ddd7fe9 remove regularization request after approve or reject. 2025-04-10 02:46:54 +05:30
6 changed files with 15 additions and 12 deletions

View File

@ -11,7 +11,7 @@ const Regularization = ( { handleRequest} ) =>
{
var selectedProject = useSelector((store) => store.localVariables.projectId);
const [ regularizesList, setregularizedList ] = useState( [] )
const { regularizes, loading,error} = useRegularizationRequests(selectedProject)
const { regularizes, loading,error,refetch} = useRegularizationRequests(selectedProject)
@ -61,7 +61,7 @@ const Regularization = ( { handleRequest} ) =>
<td>{att.checkOutTime ? convertShortTime(att.checkOutTime):"--"}</td>
<td className='text-center ' >
{/* <div className='d-flex justify-content-center align-items-center gap-3'> */}
<RegularizationActions attendanceData={att} handleRequest={handleRequest} />
<RegularizationActions attendanceData={att} handleRequest={handleRequest} refresh={refetch } />
{/* </div> */}
</td>
</tr>

View File

@ -5,9 +5,10 @@ import { useDispatch, useSelector } from 'react-redux';
import { usePositionTracker } from '../../hooks/usePositionTracker';
import {markCurrentAttendance} from '../../slices/apiSlice/attendanceAllSlice';
import {cacheData, getCachedData} from '../../slices/apiDataManager';
import showToast from '../../services/toastService';
const RegularizationActions = ({attendanceData,handleRequest}) => {
const RegularizationActions = ({attendanceData,handleRequest,refresh}) => {
const [status,setStatus] = useState()
const [loadingApprove,setLoadingForApprove] = useState(false)
const [loadingReject,setLoadingForReject] = useState(false)
@ -17,7 +18,7 @@ const {latitude,longitude} = usePositionTracker();
const dispatch = useDispatch()
const handleRegularization =(request_attendance,IsReqularize)=>{
debugger
if(IsReqularize){
setLoadingForApprove(true)
}else{
@ -47,7 +48,11 @@ const dispatch = useDispatch()
cacheData("regularizedList",{data:updatedata,projectId:projectId})
setLoadingForApprove( false )
setLoadingForReject( false )
})
refresh()
}).catch( ( error ) =>
{
showToast(error.message,"error")
});
}
@ -67,7 +72,7 @@ const dispatch = useDispatch()
return (
<div className="w-auto d-flex gap-2 align-items-center justify-content-between">
<div className="w-auto d-flex gap-2 align-items-center justify-content-end">
{attendanceData.activity == 2 && (
<>
<button

View File

@ -24,7 +24,7 @@ const RenderAttendanceStatus = ({ attendanceData, handleModalData,Tab,currentDat
return (
<div className="d-flex justify-content-center">
<div className="d-flex justify-content-end">
<button
type="button"
className={`btn btn-xs ${color}`}

View File

@ -110,5 +110,5 @@ export const useRegularizationRequests = ( projectId ) =>
}
}, [ projectId ] );
return {regularizes,loading,error}
return {regularizes,loading,error,refetch:fetchData}
}

View File

@ -20,8 +20,6 @@ export const markAttendance = createAsyncThunk(
'attendanceLogs/markAttendance', // Updated action type prefix
async ( formData, thunkAPI ) =>
{
try {
let newRecordAttendance = {
Id: formData.id || null,

View File

@ -6,7 +6,7 @@ export const markCurrentAttendance = createAsyncThunk(
'attendanceCurrentDate/markAttendance',
async ( formData, {getState, dispatch, rejectWithValue} ) =>
{
debugger
const { projectId } = getState().localVariables
try
{