src/components/Activities/Regularization.jsx

@@ -11,7 +11,7 @@ const Regularization = ( { handleRequest} ) =>
 {
   var selectedProject = useSelector((store) => store.localVariables.projectId);  
   const [ regularizesList, setregularizedList ] = useState( [] )
-  const { regularizes, loading,error,refetch} = useRegularizationRequests(selectedProject)
+  const { regularizes, loading,error} = 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} refresh={refetch } />
+                        <RegularizationActions attendanceData={att} handleRequest={handleRequest} />
                         {/* </div> */}
                         </td>
                       </tr>

src/components/Activities/RegularizationActions.jsx

@@ -5,10 +5,9 @@ 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,refresh}) => {
+const RegularizationActions = ({attendanceData,handleRequest}) => {
 const [status,setStatus] = useState()
 const [loadingApprove,setLoadingForApprove] = useState(false)
 const [loadingReject,setLoadingForReject] = useState(false)
@@ -18,7 +17,7 @@ const {latitude,longitude} = usePositionTracker();
 const dispatch = useDispatch()
 
   const handleRegularization =(request_attendance,IsReqularize)=>{
- 
+  debugger
     if(IsReqularize){
       setLoadingForApprove(true)
     }else{
@@ -47,12 +46,8 @@ const dispatch = useDispatch()
      
       cacheData("regularizedList",{data:updatedata,projectId:projectId})
       setLoadingForApprove( false )
-      setLoadingForReject( false )
-      refresh()
-   }).catch( ( error ) =>
-    {
-      showToast(error.message,"error")
-  });
+      setLoadingForReject(false)
+   })
     
     
   }
@@ -72,7 +67,7 @@ const dispatch = useDispatch()
 
 
   return (
-    <div className="w-auto d-flex gap-2 align-items-center justify-content-end">
+    <div className="w-auto d-flex gap-2 align-items-center justify-content-between">
    {attendanceData.activity == 2 && (  
     <>
       <button

src/components/Activities/RenderAttendanceStatus.jsx

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

src/hooks/useAttendance.js

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

src/slices/apiSlice/attedanceLogsSlice.js

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

src/slices/apiSlice/attendanceAllSlice.js

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