From e69efe61cb022db704947ffc11935ad793b80660 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Mon, 22 Sep 2025 14:53:01 +0530
Subject: [PATCH] Adding Activity-Group in Create Task popup.

---
 .../Project/Infrastructure/TaskModel.jsx      | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/components/Project/Infrastructure/TaskModel.jsx b/src/components/Project/Infrastructure/TaskModel.jsx
index 9c65fa6f..fef57cfb 100644
--- a/src/components/Project/Infrastructure/TaskModel.jsx
+++ b/src/components/Project/Infrastructure/TaskModel.jsx
@@ -6,7 +6,7 @@ import {
   useActivitiesMaster,
   useWorkCategoriesMaster,
 } from "../../../hooks/masterHook/useMaster";
-import { useManageTask, useProjectAssignedServices } from "../../../hooks/useProjects";
+import { useManageTask, useProjectAssignedOrganizations, useProjectAssignedServices } from "../../../hooks/useProjects";
 import showToast from "../../../services/toastService";
 import Label from "../../common/Label";
 import { useSelectedProject } from "../../../slices/apiDataManager";
@@ -41,8 +41,17 @@ const TaskModel = ({ project, onSubmit, onClose }) => {
   const projectId = useSelectedProject();
 
   const { data: assignedServices, isLoading: servicesLoading } = useProjectAssignedServices(projectId);
+  const { data: assignedOrganizations, isLoading: orgLoading } = useProjectAssignedOrganizations(projectId);
 
   const [selectedService, setSelectedService] = useState("");
+  // Fetch Assigned Organizations (Activity Groups)
+
+  const [selectedOrg, setSelectedOrg] = useState("");
+
+  const handleOrgChange = (e) => {
+    setSelectedOrg(e.target.value);
+  };
+
 
   const handleServiceChange = (e) => {
     setSelectedService(e.target.value);
@@ -188,7 +197,7 @@ const TaskModel = ({ project, onSubmit, onClose }) => {
       {/* Services Selection */}
       {selectedWorkArea && (
         <div className="col-12 text-start">
-          <Label className="form-label">Select Services</Label>
+          <Label className="form-label" required>Select Services</Label>
           <select
             name="DataTables_Table_0_length"
             aria-controls="DataTables_Table_0"
@@ -210,8 +219,28 @@ const TaskModel = ({ project, onSubmit, onClose }) => {
         </div>
       )}
 
+      {/* Activity Group (Organization) Selection */}
+      {selectedService && (
+        <div className="col-12 text-start">
+          <Label className="form-label" required>Select Activity Group</Label>
+          <select
+            className="form-select form-select-sm"
+            value={selectedOrg}
+            onChange={handleOrgChange}
+          >
+            <option value="">Select Activity Group</option>
+            {orgLoading && <option>Loading...</option>}
+            {assignedOrganizations?.map((org) => (
+              <option key={org.id} value={org.id}>
+                {org.name}
+              </option>
+            ))}
+          </select>
+        </div>
+      )}
+
       {/* Activity Selection */}
-      {selectedWorkArea && (
+      {selectedOrg && (
         <div className="col-12 text-start">
           <Label className="form-label" required>Select Activity</Label>
           <select
@@ -232,6 +261,7 @@ const TaskModel = ({ project, onSubmit, onClose }) => {
       )}
 
 
+
       {selectedWorkArea && (
         <div className="col-12 text-start">
           <label className="form-label">Select Work Category</label>