admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge pull request 'Missing Error Message When Required Fields Are Not Selected in Infrastructure > Create Task' (#225) from Kartik_Bug#521 into Issues_Jun_3W

Browse Source 
Reviewed-on: #225
This commit is contained in:
Vikas Nale 2025-07-01 09:36:03 +00:00
commit 73b693f826
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/components/Project/Infrastructure/TaskModel.jsx
View File

@ -20,16 +20,17 @@ const taskSchema = z.object({
const defaultModel = { const defaultModel = {
id: null, id: null,
buildingID: "0", buildingID: "", // Changed from "0"
floorId: "0", floorId: "", // Changed from "0"
workAreaId: "0", workAreaId: "", // Changed from "0"
activityID: null, activityID: "", // Changed from null
workCategoryId: "", workCategoryId: "", // Kept as empty
plannedWork: 0, plannedWork: 0,
completedWork: 0, completedWork: 0,
comment:"" comment: ""
}; };
const TaskModel = ({ const TaskModel = ({
project, project,
onSubmit, onSubmit,
@ -87,7 +88,7 @@ const TaskModel = ({
reset((prev) => ({ reset((prev) => ({
...prev, ...prev,
floorId: value, floorId: value,
workAreaId: 0, workAreaId: "",
activityID: "", activityID: "",
workCategoryId: categoryData?.[0]?.id?.toString() ?? "", workCategoryId: categoryData?.[0]?.id?.toString() ?? "",
})); }));
@ -194,7 +195,7 @@ const TaskModel = ({
{...register("buildingID")} {...register("buildingID")}
onChange={handleBuildingChange} onChange={handleBuildingChange}
> >
<option value="0">Select Building</option> <option value="">Select Building</option>
{project.buildings {project.buildings
?.filter((building) => building?.name) // Ensure valid name ?.filter((building) => building?.name) // Ensure valid name
?.sort((a, b) => a.name?.localeCompare(b.name)) ?.sort((a, b) => a.name?.localeCompare(b.name))
@ -226,7 +227,7 @@ const TaskModel = ({
{...register("floorId")} {...register("floorId")}
onChange={handleFloorChange} onChange={handleFloorChange}
> >
<option value="0">Select Floor</option> <option value="">Select Floor</option>
{selectedBuilding.floors {selectedBuilding.floors
?.filter( ?.filter(
(floor) => (floor) =>
@ -262,7 +263,7 @@ const TaskModel = ({
{...register("workAreaId")} {...register("workAreaId")}
onChange={handleWorkAreaChange} onChange={handleWorkAreaChange}
> >
<option value="0">Select Work Area</option> <option value="">Select Work Area</option>
{selectedFloor.workAreas {selectedFloor.workAreas
?.filter((workArea) => workArea?.areaName) ?.filter((workArea) => workArea?.areaName)
?.sort((a, b) => a.areaName?.localeCompare(b.areaName)) ?.sort((a, b) => a.areaName?.localeCompare(b.areaName))
@ -442,4 +443,4 @@ const TaskModel = ({
); );
}; };
export default TaskModel; export default TaskModel;