diff --git a/src/components/Project/Infrastructure/TaskModel.jsx b/src/components/Project/Infrastructure/TaskModel.jsx
index 8c46fa03..eb837b51 100644
--- a/src/components/Project/Infrastructure/TaskModel.jsx
+++ b/src/components/Project/Infrastructure/TaskModel.jsx
@@ -20,16 +20,17 @@ const taskSchema = z.object({
const defaultModel = {
id: null,
- buildingID: "0",
- floorId: "0",
- workAreaId: "0",
- activityID: null,
- workCategoryId: "",
+ buildingID: "", // Changed from "0"
+ floorId: "", // Changed from "0"
+ workAreaId: "", // Changed from "0"
+ activityID: "", // Changed from null
+ workCategoryId: "", // Kept as empty
plannedWork: 0,
completedWork: 0,
- comment:""
+ comment: ""
};
+
const TaskModel = ({
project,
onSubmit,
@@ -87,7 +88,7 @@ const TaskModel = ({
reset((prev) => ({
...prev,
floorId: value,
- workAreaId: 0,
+ workAreaId: "",
activityID: "",
workCategoryId: categoryData?.[0]?.id?.toString() ?? "",
}));
@@ -194,7 +195,7 @@ const TaskModel = ({
{...register("buildingID")}
onChange={handleBuildingChange}
>
-
+
{project.buildings
?.filter((building) => building?.name) // Ensure valid name
?.sort((a, b) => a.name?.localeCompare(b.name))
@@ -226,7 +227,7 @@ const TaskModel = ({
{...register("floorId")}
onChange={handleFloorChange}
>
-
+
{selectedBuilding.floors
?.filter(
(floor) =>
@@ -262,7 +263,7 @@ const TaskModel = ({
{...register("workAreaId")}
onChange={handleWorkAreaChange}
>
-
+
{selectedFloor.workAreas
?.filter((workArea) => workArea?.areaName)
?.sort((a, b) => a.areaName?.localeCompare(b.areaName))
@@ -442,4 +443,4 @@ const TaskModel = ({
);
};
-export default TaskModel;
+export default TaskModel;
\ No newline at end of file