From 54e609883d8ea36d96f6517b63d901d18d5199a6 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Fri, 19 Sep 2025 16:13:09 +0530
Subject: [PATCH 1/2] Adding Dropdown in Create Task Popup.

---
 .../Project/Infrastructure/TaskModel.jsx      | 43 ++++++++++++++++---
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/components/Project/Infrastructure/TaskModel.jsx b/src/components/Project/Infrastructure/TaskModel.jsx
index f0bb5c35..e7c1438d 100644
--- a/src/components/Project/Infrastructure/TaskModel.jsx
+++ b/src/components/Project/Infrastructure/TaskModel.jsx
@@ -6,9 +6,10 @@ import {
   useActivitiesMaster,
   useWorkCategoriesMaster,
 } from "../../../hooks/masterHook/useMaster";
-import { useManageTask } from "../../../hooks/useProjects";
+import { useManageTask, useProjectAssignedServices } from "../../../hooks/useProjects";
 import showToast from "../../../services/toastService";
 import Label from "../../common/Label";
+import { useSelectedProject } from "../../../slices/apiDataManager";
 
 const taskSchema = z.object({
   buildingID: z.string().min(1, "Building is required"),
@@ -37,6 +38,15 @@ const TaskModel = ({ project, onSubmit, onClose }) => {
   const { activities, loading: activityLoading } = useActivitiesMaster();
   const { categories, categoryLoading } = useWorkCategoriesMaster();
 
+  const projectId = useSelectedProject();
+
+  const { data: assignedServices, isLoading: servicesLoading } = useProjectAssignedServices(projectId);
+
+  const [selectedService, setSelectedService] = useState("");
+
+  const handleServiceChange = (e) => {
+    setSelectedService(e.target.value);
+  };
   const {
     register,
     handleSubmit,
@@ -96,10 +106,12 @@ const TaskModel = ({ project, onSubmit, onClose }) => {
   }, [categories]);
 
   const onSubmitForm = async (data) => {
-       const payload = [data];
-      CreateTask({payload:payload,buildingId: data.buildingID,
+    const payload = [data];
+    CreateTask({
+      payload: payload, buildingId: data.buildingID,
       floorId: data.floorId,
-      workAreaId: data.workAreaId, PreviousPlannedWork:0,previousCompletedWork:0});
+      workAreaId: data.workAreaId, PreviousPlannedWork: 0, previousCompletedWork: 0
+    });
   };
 
   return (
@@ -107,6 +119,27 @@ const TaskModel = ({ project, onSubmit, onClose }) => {
       <div className="text-center mb-1">
         <h5 className="mb-1">Manage Task</h5>
       </div>
+      <div className="col-6 text-start">
+        <Label className="form-label" required>Select Services</Label>
+        <select
+          name="DataTables_Table_0_length"
+          aria-controls="DataTables_Table_0"
+          className="form-select form-select-sm"
+          aria-label="Select Service"
+          value={selectedService}
+          onChange={handleServiceChange}
+        >
+          {servicesLoading && <option>Loading...</option>}
+          {assignedServices?.map((service) => (
+            <option key={service.id} value={service.id}>
+              {service.name}
+            </option>
+          ))}
+        </select>
+        {errors.buildingID && (
+          <p className="danger-text">{errors.buildingID.message}</p>
+        )}
+      </div>
       <div className="col-6 text-start">
         <Label className="form-label" required>Select Building</Label>
         <select
@@ -261,7 +294,7 @@ const TaskModel = ({ project, onSubmit, onClose }) => {
         </div>
       )}
 
-      <div className="col-12 text-end mt-5">        
+      <div className="col-12 text-end mt-5">
         <button
           type="button"
           className="btn btn-sm btn-label-secondary me-3"
-- 
2.43.0


From 00d6774e06c95111b3e1710db62d19d02d4c679f Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Fri, 19 Sep 2025 19:26:46 +0530
Subject: [PATCH 2/2] Change the position of Services in Create Task popup in
 Infrastructure.

---
 .../Project/Infrastructure/TaskModel.jsx      | 49 +++++++++++--------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/components/Project/Infrastructure/TaskModel.jsx b/src/components/Project/Infrastructure/TaskModel.jsx
index e7c1438d..9c65fa6f 100644
--- a/src/components/Project/Infrastructure/TaskModel.jsx
+++ b/src/components/Project/Infrastructure/TaskModel.jsx
@@ -119,27 +119,6 @@ const TaskModel = ({ project, onSubmit, onClose }) => {
       <div className="text-center mb-1">
         <h5 className="mb-1">Manage Task</h5>
       </div>
-      <div className="col-6 text-start">
-        <Label className="form-label" required>Select Services</Label>
-        <select
-          name="DataTables_Table_0_length"
-          aria-controls="DataTables_Table_0"
-          className="form-select form-select-sm"
-          aria-label="Select Service"
-          value={selectedService}
-          onChange={handleServiceChange}
-        >
-          {servicesLoading && <option>Loading...</option>}
-          {assignedServices?.map((service) => (
-            <option key={service.id} value={service.id}>
-              {service.name}
-            </option>
-          ))}
-        </select>
-        {errors.buildingID && (
-          <p className="danger-text">{errors.buildingID.message}</p>
-        )}
-      </div>
       <div className="col-6 text-start">
         <Label className="form-label" required>Select Building</Label>
         <select
@@ -183,6 +162,7 @@ const TaskModel = ({ project, onSubmit, onClose }) => {
         </div>
       )}
 
+      {/* Work Area Selection */}
       {selectedFloor && (
         <div className="col-12 text-start">
           <Label className="form-label" required>Select Work Area</Label>
@@ -205,6 +185,32 @@ const TaskModel = ({ project, onSubmit, onClose }) => {
         </div>
       )}
 
+      {/* Services Selection */}
+      {selectedWorkArea && (
+        <div className="col-12 text-start">
+          <Label className="form-label">Select Services</Label>
+          <select
+            name="DataTables_Table_0_length"
+            aria-controls="DataTables_Table_0"
+            className="form-select form-select-sm"
+            aria-label="Select Service"
+            value={selectedService}
+            onChange={handleServiceChange}
+          >
+            {servicesLoading && <option>Loading...</option>}
+            {assignedServices?.map((service) => (
+              <option key={service.id} value={service.id}>
+                {service.name}
+              </option>
+            ))}
+          </select>
+          {errors.buildingID && (
+            <p className="danger-text">{errors.buildingID.message}</p>
+          )}
+        </div>
+      )}
+
+      {/* Activity Selection */}
       {selectedWorkArea && (
         <div className="col-12 text-start">
           <Label className="form-label" required>Select Activity</Label>
@@ -225,6 +231,7 @@ const TaskModel = ({ project, onSubmit, onClose }) => {
         </div>
       )}
 
+
       {selectedWorkArea && (
         <div className="col-12 text-start">
           <label className="form-label">Select Work Category</label>
-- 
2.43.0