Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W

This commit is contained in:
Vikas Nale 2025-05-07 16:43:50 +05:30
commit 18125f7c6a
2 changed files with 2 additions and 3 deletions

View File

@ -19,7 +19,7 @@ const taskSchema = z
.object({ .object({
activityID: z.string().min(1, "Activity is required"), activityID: z.string().min(1, "Activity is required"),
plannedWork: z.number().min(1, "Planned Work must be greater than 0"), plannedWork: z.number().min(1, "Planned Work must be greater than 0"),
completedWork: z.number().optional(), completedWork: z.number().min(0, "Completed Work must be greater than 0"),
}) })
.refine( .refine(
(data) => (data) =>
@ -84,7 +84,6 @@ const EditActivityModal = ({
floorId: floor?.id, floorId: floor?.id,
workAreaId: workArea?.id, workAreaId: workArea?.id,
}; };
console.log(finalData);
ProjectRepository.manageProjectTasks([finalData]) ProjectRepository.manageProjectTasks([finalData])
.then((response) => { .then((response) => {

View File

@ -10,7 +10,7 @@ const taskSchema = z.object({
workAreaId: z.string().min(1, "Work Area is required"), workAreaId: z.string().min(1, "Work Area is required"),
activityID: z.string().min(1, "Activity is required"), activityID: z.string().min(1, "Activity is required"),
plannedWork: z.number().min(1, "Planned Work must be greater than 0"), plannedWork: z.number().min(1, "Planned Work must be greater than 0"),
completedWork: z.number().optional(), completedWork: z.number().min(0, "Completed Work must be greater than 0"),
}); });
const defaultModel = { const defaultModel = {