pramod_Bug#122Check-INOUT-Time #57

Closed
pramod.mahajan wants to merge 10 commits from pramod_Bug#122Check-INOUT-Time into Issues_April_5W
Showing only changes of commit cb2950338c - Show all commits

View File

@ -74,15 +74,31 @@ const useAttendanceStatus = (attendanceData) => {
text: "Regularize", text: "Regularize",
color: 'btn-warning', color: 'btn-warning',
}); });
}else if(activity === 4 && checkInTime !== null && checkOutTime !== null && !timeElapsed(checkInTime,THRESH_HOLD) ){ } else if ( activity === 4 && checkInTime !== null && checkOutTime !== null && !timeElapsed( checkInTime, THRESH_HOLD ) )
setStatus({ {
status: "Check-In",
action: ACTIONS.CHECK_IN, if ( activity === 4 && checkInTime !== null && checkOutTime !== null && new Date(checkOutTime).toDateString() !== new Date().toDateString())
disabled: false, {
text: "Check In", setStatus( {
color: 'btn-primary', status: "Approved",
}) action: ACTIONS.APPROVED,
}else if(activity === 2 && checkInTime !== null ){ disabled: true,
text: "Approved",
color: 'btn-success',
} );
} else
{
setStatus( {
status: "Check-In",
action: ACTIONS.CHECK_IN,
disabled: false,
text: "Check In",
color: 'btn-primary',
} )
}
}
else if ( activity === 2 && checkInTime !== null )
{
setStatus({ setStatus({
status: "Requested", status: "Requested",
action: ACTIONS.REQUESTED, action: ACTIONS.REQUESTED,