From c609387924823853afe840b312eb1c70052874b8 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Mon, 22 Sep 2025 16:00:24 +0530
Subject: [PATCH] Changes in Organization popup

---
 src/components/Organization/ManagOrg.jsx |  1 +
 src/components/common/SelectMultiple.jsx |  4 ++-
 src/pages/Activities/AttendancePage.jsx  | 41 ++++++++++++------------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/components/Organization/ManagOrg.jsx b/src/components/Organization/ManagOrg.jsx
index 8ac9f677..0f4aa49e 100644
--- a/src/components/Organization/ManagOrg.jsx
+++ b/src/components/Organization/ManagOrg.jsx
@@ -146,6 +146,7 @@ const ManagOrg = () => {
             required
             valueKey="id"
             options={service?.data || []}
+            required = {true}
           />
           {errors.serviceIds && (
             <span className="danger-text">{errors.serviceIds.message}</span>
diff --git a/src/components/common/SelectMultiple.jsx b/src/components/common/SelectMultiple.jsx
index 01b327cc..ff59d89a 100644
--- a/src/components/common/SelectMultiple.jsx
+++ b/src/components/common/SelectMultiple.jsx
@@ -12,6 +12,7 @@ const SelectMultiple = ({
   valueKey = "id",
   placeholder = "Please select...",
   IsLoading = false,
+  required = false
 }) => {
   const { setValue, watch } = useFormContext();
   const selectedValues = watch(name) || [];
@@ -146,7 +147,8 @@ const SelectMultiple = ({
         className="multi-select-dropdown-container"
         style={{ position: "relative" }}
       >
-       <label>{label}</label>
+      <Label required={required}>{label}</Label>
+
 
         <div
           className="multi-select-dropdown-header"
diff --git a/src/pages/Activities/AttendancePage.jsx b/src/pages/Activities/AttendancePage.jsx
index 142cab4b..4cd5956a 100644
--- a/src/pages/Activities/AttendancePage.jsx
+++ b/src/pages/Activities/AttendancePage.jsx
@@ -174,27 +174,25 @@ const AttendancePage = () => {
               {/* Search + Organization filter */}
               <div className="col-12 col-md-auto mt-2 mt-md-0 ms-md-auto d-flex gap-2 align-items-center">
                 {/* Organization Dropdown */}
-                {organizations?.length > 1 && (
-                  <select
-                    className="form-select form-select-sm"
-                    style={{ minWidth: "180px" }}
-                    value={appliedFilters.selectedOrganization}
-                    onChange={(e) =>
-                      setAppliedFilters((prev) => ({
-                        ...prev,
-                        selectedOrganization: e.target.value,
-                      }))
-                    }
-                    disabled={orgLoading}
-                  >
-                    <option value="">All Organizations</option>
-                    {organizations?.map((org) => (
-                      <option key={org.id} value={org.id}>
-                        {org.name}
-                      </option>
-                    ))}
-                  </select>
-                )}
+                <select
+                  className="form-select form-select-sm"
+                  style={{ minWidth: "180px" }}
+                  value={appliedFilters.selectedOrganization}
+                  onChange={(e) =>
+                    setAppliedFilters((prev) => ({
+                      ...prev,
+                      selectedOrganization: e.target.value,
+                    }))
+                  }
+                  disabled={orgLoading}
+                >
+                  <option value="">All Organizations</option>
+                  {organizations?.map((org) => (
+                    <option key={org.id} value={org.id}>
+                      {org.name}
+                    </option>
+                  ))}
+                </select>
 
                 {/* Search Input */}
                 <input
@@ -207,6 +205,7 @@ const AttendancePage = () => {
                 />
               </div>
 
+
             </div>
           </div>