Added new field comment

src/components/Project/Infrastructure/EditActivityModal.jsx

@@ -20,7 +20,8 @@ const taskSchema = z
     activityID: z.string().min(1, "Activity is required"),
     workCategoryId: z.string().min(1, "Work Category is required"),
     plannedWork: z.number().min(1, "Planned Work must be greater than 0"),
-    completedWork: z.number().min(0, "Completed Work must be greater than 0"),
+    completedWork: z.number().min( 0, "Completed Work must be greater than 0" ),
+    comment:z.string()
   })
   .refine(
     (data) =>
@@ -47,6 +48,7 @@ const EditActivityModal = ({
     workCategoryId: 0,
     plannedWork: 0,
     completedWork: 0,
+    comment:""
   };
 
   const { projects_Details, refetch } = useProjectDetails(selectedProject);
@@ -185,6 +187,8 @@ const EditActivityModal = ({
         workItem?.workItem?.plannedWork || workItem?.plannedWork || 0,
       completedWork:
         workItem?.workItem?.completedWork || workItem?.completedWork || 0,
+      comment:
+        workItem?.workItem?.description || workItem?.description || ""
     });
     return () => reset();
   }, [activities, workItem]);
@@ -384,6 +388,27 @@ const EditActivityModal = ({
               </div>
               {/* )} */}
 
+
+                <div className="col-12">
+                   <label
+                      className="form-text fs-7 m-1 text-lg text-dark"
+                      htmlFor="descriptionTextarea" 
+                    >
+                      Comment
+                    </label>
+                     <textarea
+                          {...register("comment")}
+                          className="form-control"
+                          id="descriptionTextarea" 
+                          rows="2"
+                        />
+                    {errors.comment && (
+                      <div className="danger-text">
+                        {errors.comment.message}
+                      </div>
+                    )}
+                </div>
+
               <div className="col-12 text-center">
                 <button type="submit" className="btn btn-sm btn-primary me-3" disabled={activities.length === 0 || isSubmitting}>
                   {isSubmitting ? "Please Wait.." : "Edit Task"}

src/components/Project/Infrastructure/TaskModel.jsx

@@ -14,7 +14,8 @@ const taskSchema = z.object({
   activityID: z.string().min(1, "Activity is required"),
   workCategoryId: z.string().min(1, "Work Category is required"),
   plannedWork: z.number().min(1, "Planned Work must be greater than 0"),
-  completedWork: z.number().min(0, "Completed Work must be greater than 0"),
+  completedWork: z.number().min( 0, "Completed Work must be greater than 0" ),
+  comment:z.string(),
 });
 
 const defaultModel = {
@@ -26,6 +27,7 @@ const defaultModel = {
   workCategoryId: "",
   plannedWork: 0,
   completedWork: 0,
+  comment:""
 };
 
 const TaskModel = ({
@@ -124,7 +126,7 @@ const TaskModel = ({
   };
 
   const onSubmitForm = async (data) => {
-    console.log(data);
+
     setIsSubmitting(true);
     await onSubmit(data);
     setValue("plannedWork", 0);
@@ -136,7 +138,7 @@ const TaskModel = ({
 
   const resetForm = () => {
     setFormData(defaultModel);
-    setSelectedBuilding(null); // not "0"
+    setSelectedBuilding(null); 
     setSelectedFloor(null);
     setSelectedWorkArea(null);
     setSelectedActivity(null);
@@ -386,7 +388,6 @@ const TaskModel = ({
                 </div>
               )}
 
-              {/* Unit */}
               {selectedActivity && selectedCategory && (
                 <div className="col-2 col-md-2">
                   <label className="form-label" htmlFor="unit">
@@ -400,7 +401,27 @@ const TaskModel = ({
                   />
                 </div>
               )}
-
+              {selectedActivity && selectedCategory && (
+                <div className="col-12">
+                   <label
+                      className="form-text fs-7 m-1 text-lg text-dark"
+                      htmlFor="descriptionTextarea" 
+                    >
+                      Comment
+                    </label>
+                     <textarea
+                          {...register("comment")}
+                          className="form-control"
+                          id="descriptionTextarea" 
+                          rows="2"
+                        />
+                    {errors.comment && (
+                      <div className="danger-text">
+                        {errors.comment.message}
+                      </div>
+                    )}
+                </div>
+              )}
               <div className="col-12 text-center">
                 <button type="submit" className="btn btn-sm btn-primary me-3">
                   {isSubmitting ? "Please Wait.." : "Add Task"}