At the time of Regularize status code 400 were shown now solved we add error message in popup "Checkout time must be later than check-in time".

This commit is contained in:
Kartik Sharma 2025-07-22 11:35:15 +05:30 committed by pramod.mahajan
parent 59c36d099b
commit 633e60d141

View File

@ -10,10 +10,43 @@ import showToast from "../../services/toastService";
import { checkIfCurrentDate } from "../../utils/dateUtils"; import { checkIfCurrentDate } from "../../utils/dateUtils";
const schema = z.object({ // const schema = z.object({
// markTime: z.string().nonempty({ message: "Time is required" }),
// description: z.string().max(200, "description should less than 200 chracters").optional()
// });
const createSchema = (modeldata) => {
return z
.object({
markTime: z.string().nonempty({ message: "Time is required" }), markTime: z.string().nonempty({ message: "Time is required" }),
description: z.string().max(200, "description should less than 200 chracters").optional() description: z
}); .string()
.max(200, "Description should be less than 200 characters")
.optional(),
})
.refine((data) => {
if (modeldata?.checkInTime && !modeldata?.checkOutTime) {
const checkIn = new Date(modeldata.checkInTime);
const [time, modifier] = data.markTime.split(" ");
const [hourStr, minuteStr] = time.split(":");
let hour = parseInt(hourStr, 10);
const minute = parseInt(minuteStr, 10);
if (modifier === "PM" && hour !== 12) hour += 12;
if (modifier === "AM" && hour === 12) hour = 0;
const checkOut = new Date(checkIn);
checkOut.setHours(hour, minute, 0, 0);
return checkOut > checkIn;
}
return true;
}, {
message: "Checkout time must be later than check-in time",
path: ["markTime"],
});
};
const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm, }) => { const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm, }) => {
@ -31,16 +64,28 @@ const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm, }) => {
return `${day}-${month}-${year}`; return `${day}-${month}-${year}`;
}; };
// const {
// register,
// handleSubmit,
// formState: { errors },
// reset,
// setValue,
// } = useForm({
// resolver: zodResolver(schema),
// mode: "onChange"
// });
const { const {
register, register,
handleSubmit, handleSubmit,
formState: { errors }, formState: { errors },
reset, reset,
setValue, setValue,
} = useForm({ } = useForm({
resolver: zodResolver(schema), resolver: zodResolver(createSchema(modeldata)),
mode: "onChange" mode: "onChange",
}); });
const onSubmit = (data) => { const onSubmit = (data) => {
let record = { ...data, date: new Date().toLocaleDateString(), latitude: coords.latitude, longitude: coords.longitude, employeeId: modeldata.employeeId, action: modeldata.action, id: modeldata?.id || null } let record = { ...data, date: new Date().toLocaleDateString(), latitude: coords.latitude, longitude: coords.longitude, employeeId: modeldata.employeeId, action: modeldata.action, id: modeldata?.id || null }
@ -48,8 +93,6 @@ const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm, }) => {
handleSubmitForm(record) handleSubmitForm(record)
} else { } else {
// if ( modeldata?.currentDate && checkIfCurrentDate( modeldata?.currentDate ) )
// {
dispatch(markAttendance(record)) dispatch(markAttendance(record))
.unwrap() .unwrap()
.then((data) => { .then((data) => {
@ -61,11 +104,6 @@ const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm, }) => {
showToast(error, "error"); showToast(error, "error");
}); });
// } else
// {
// let formData = {...data, date: new Date().toLocaleDateString(),latitude:coords.latitude,longitude:coords.longitude,employeeId:modeldata.employeeId,projectId:projectId,action:modeldata.action,id:modeldata?.id || null}
// }
} }
closeModal() closeModal()