From af5519fd6005e98cc43d085fa889e299b58163e8 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Fri, 19 Sep 2025 14:53:40 +0530
Subject: [PATCH] Adding Dropdown and Organization Column in Teams

---
 src/components/Project/Teams.jsx | 65 +++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/components/Project/Teams.jsx b/src/components/Project/Teams.jsx
index 3a8d78cf..e39a4b13 100644
--- a/src/components/Project/Teams.jsx
+++ b/src/components/Project/Teams.jsx
@@ -21,8 +21,6 @@ import {
 import { useSelectedProject } from "../../slices/apiDataManager";
 
 const Teams = () => {
-  // const {projectId} = useParams()
-  // const projectId = useSelector((store)=>store.localVariables.projectId)
   const projectId = useSelectedProject();
   const dispatch = useDispatch();
 
@@ -136,7 +134,6 @@ const Teams = () => {
   useEffect(() => {
     if (projectEmployees) {
       setEmployees(projectEmployees);
-      //setFilteredEmployees(projectEmployees?.filter((emp) => emp.isActive));
       const filtered = projectEmployees.filter((emp) => emp.isActive);
       setFilteredEmployees(filtered);
     }
@@ -179,13 +176,6 @@ const Teams = () => {
 
   const handleFilterEmployee = (e) => {
     const filterValue = e.target.value;
-    // if (filterValue === "true") {
-    //   setActiveEmployee(true);
-    //   setFilteredEmployees(employees.filter((emp) => emp.isActive));
-    // } else {
-    //   setFilteredEmployees(employees.filter((emp) => !emp.isActive));
-    //   setActiveEmployee(false);
-    // }
     setActiveEmployee(filterValue === "true");
     setSearchTerm("");
   };
@@ -274,6 +264,27 @@ const Teams = () => {
                   onChange={handleSearch}
                 />
               </div>
+               {/* Services-Dropdown */}
+
+              <div
+                className="dataTables_length text-start py-2 px-2"
+                id="DataTables_Table_0_length"
+              >
+                <label>
+                  <select
+                    name="DataTables_Table_0_length"
+                    aria-controls="DataTables_Table_0"
+                    className="form-select form-select-sm"
+                    // onChange={handleFilterEmployee}
+                    // value={false}
+                    aria-label=""
+                    defaultValue="true"
+                  >
+                    <option value="true">Fire-Fitting</option>
+                    <option value="false">Weilding</option>
+                  </select>
+                </label>
+              </div>
             </div>
             <div className="col-md-6 col-12 d-flex justify-content-end align-items-center">
               <div
@@ -295,11 +306,13 @@ const Teams = () => {
                   </select>
                 </label>
               </div>
+
+             
+
               <button
                 type="button"
-                className={`link-button btn-primary btn-sm ${
-                  HasAssignUserPermission ? "" : "d-none"
-                }`}
+                className={`link-button btn-primary btn-sm ${HasAssignUserPermission ? "" : "d-none"
+                  }`}
                 data-bs-toggle="modal"
                 data-bs-target="#user-model"
               >
@@ -319,6 +332,7 @@ const Teams = () => {
                       <th>
                         <div className="text-start ms-5">Name</div>
                       </th>
+                      <th>Organization</th>
                       <th>Assigned Date</th>
                       {!activeEmployee && <th>Release Date</th>}
                       <th>Project Role</th>
@@ -334,7 +348,7 @@ const Teams = () => {
                               <Avatar
                                 firstName={item.firstName}
                                 lastName={item.lastName}
-                              ></Avatar>
+                              />
                               <div className="d-flex flex-column">
                                 <a
                                   onClick={() =>
@@ -352,18 +366,16 @@ const Teams = () => {
                               </div>
                             </div>
                           </td>
+
+                          <td>{item.organizationName || "N/A"}</td>
+
                           <td>
-                            {" "}
-                            {moment(item.allocationDate).format(
-                              "DD-MMM-YYYY"
-                            )}{" "}
+                            {moment(item.allocationDate).format("DD-MMM-YYYY")}
                           </td>
                           {!activeEmployee && (
                             <td>
                               {item.reAllocationDate
-                                ? moment(item.reAllocationDate).format(
-                                    "DD-MMM-YYYY"
-                                  )
+                                ? moment(item.reAllocationDate).format("DD-MMM-YYYY")
                                 : "Present"}
                             </td>
                           )}
@@ -373,7 +385,7 @@ const Teams = () => {
                             </span>
                           </td>
                           <td>
-                            {item.isActive && (
+                            {item.isActive ? (
                               <button
                                 aria-label="Delete"
                                 type="button"
@@ -381,27 +393,26 @@ const Teams = () => {
                                 className="btn p-0 dropdown-toggle hide-arrow"
                                 onClick={() => deleteModalOpen(item)}
                               >
-                                {" "}
                                 {removingEmployeeId === item.id ? (
                                   <div
                                     className="spinner-border spinner-border-sm text-primary"
                                     role="status"
                                   >
-                                    <span className="visually-hidden">
-                                      Loading...
-                                    </span>
+                                    <span className="visually-hidden">Loading...</span>
                                   </div>
                                 ) : (
                                   <i className="bx bx-trash me-1 text-danger"></i>
                                 )}
                               </button>
+                            ) : (
+                              <span>Not in project</span>
                             )}
-                            {!item.isActive && <span>Not in project</span>}
                           </td>
                         </tr>
                       ))}
                   </tbody>
                 </table>
+
               )}
             {!employeeLodaing && filteredEmployees.length === 0 && (
               <div className="text-center text-muted py-3">