Merge pull request 'Vaibhav_Resolved_Issues' (#2) from Vaibhav_Resolved_Issues into Feature_Task_Management

Reviewed-on: #2

src/components/Project/Infrastructure/TaskModel.jsx

@@ -26,7 +26,7 @@ const TaskModel = ({
   activities,
   onSubmit,
   clearTrigger,
-  onClearComplete,
+  onClearComplete,onClose
 }) => {
   const [formData, setFormData] = useState(defaultModel);
   const [selectedBuilding, setSelectedBuilding] = useState(null);
@@ -124,12 +124,7 @@ const TaskModel = ({
       <div className="modal-content">
         <div className="modal-body">
           <div className="row">
-            <button
-              type="button"
-              className="btn-close"
-              data-bs-dismiss="modal"
-              aria-label="Close"
-            ></button>
+          <button type="button" className="btn-close" aria-label="Close" onClick={onClose}/>
             <div className="text-center mb-1">
               <h5 className="mb-1">Manage Task</h5>
             </div>
@@ -290,10 +285,9 @@ const TaskModel = ({
                   {formData.id !== "0" && formData.id !== "" ? "Edit Task" : "Add Task"}
                 </button>
                 <button
-                  type="reset"
+                  type="button"
                   className="btn btn-label-secondary"
-                  data-bs-dismiss="modal"
-                  aria-label="Close"
+                  onClick={onClose}
                 >
                   Cancel
                 </button>

src/components/Project/Infrastructure/WorkAreaModel.jsx

@@ -19,7 +19,7 @@ const defaultModel = {
   floorId: "0",
 };
 
-const WorkAreaModel = ({ project, onSubmit, clearTrigger, onClearComplete }) => {
+const WorkAreaModel = ({ project, onSubmit, clearTrigger, onClearComplete, onClose }) => {
   const [selectedBuilding, setSelectedBuilding] = useState(null);
   const [ selectedFloor, setSelectedFloor ] = useState( null );
   const [selectdWorkArea,setWorkArea] = useState()
@@ -111,7 +111,7 @@ const WorkAreaModel = ({ project, onSubmit, clearTrigger, onClearComplete }) =>
       <div className="modal-content">
         <div className="modal-body">
           <div className="row">
-            <button type="button" className="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+          <button type="button" className="btn-close" aria-label="Close" onClick={onClose}/>
             <div className="text-center mb-1">
               <h5 className="mb-1">Manage Work Area</h5>
             </div>

src/components/Project/ProjectInfra.jsx

@@ -49,8 +49,8 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
 
   const openAssignModel=(assignData)=>{
 
-      setCurrentBuilding(assignData)
-      setIsAssingRoleModal(true)
+    setCurrentBuilding(assignData)
+    setIsAssingRoleModal(true)
 
   }
 
@@ -71,111 +71,111 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
       let response = await ProjectRepository.manageProjectInfra( infraObject );      
       const entity = response.data;
 
-     const updatedProject = { ...project };
-     // Handle the building data
-    if (entity.building) {
-      const { id, name, description } = entity.building;
-      const updatedBuildings = updatedProject.buildings.map((building) =>
-        building.id === id
-          ? { ...building, name, description }
-          : building
-      );
+      const updatedProject = { ...project };
+      // Handle the building data
+      if (entity.building) {
+        const { id, name, description } = entity.building;
+        const updatedBuildings = updatedProject.buildings.map((building) =>
+          building.id === id
+            ? { ...building, name, description }
+            : building
+        );
 
-      // Add building if it doesn't exist
-      if (!updatedProject.buildings.some((building) => building.id === id)) {
-        updatedBuildings.push({
-          id: id,
-          name,
-          description,
-          floor: [],
-        });
-      }
+        // Add building if it doesn't exist
+        if (!updatedProject.buildings.some((building) => building.id === id)) {
+          updatedBuildings.push({
+            id: id,
+            name,
+            description,
+            floor: [],
+          });
+        }
 
-      updatedProject.buildings = updatedBuildings;
+        updatedProject.buildings = updatedBuildings;
 
-      // Update the cache for buildings
+        // Update the cache for buildings
       cacheData( "projectInfo", {projectId: updatedProject.id, data: updatedProject} );
-      setProject(updatedProject)
-    }
-    // Handle the floor data
+        setProject(updatedProject)
+      }
+      // Handle the floor data
     else if ( entity.floor )
     {
-      const { buildingId, id, floorName } = entity.floor;
-      const updatedBuildings = updatedProject.buildings.map((building) =>
-        building.id == buildingId
-          ? {
+        const { buildingId, id, floorName } = entity.floor;
+        const updatedBuildings = updatedProject.buildings.map((building) =>
+          building.id == buildingId
+            ? {
               ...building,
             floors: building.floors.map( ( floor ) =>
 
                 floor.id === id
                   ? {
-                      ...floor,
-                      floorName, // Update the floor name only
-                      // Keep other properties as they are (including workArea)
-                    }
+                    ...floor,
+                    floorName, // Update the floor name only
+                    // Keep other properties as they are (including workArea)
+                  }
                   : floor
               )
-              // Add the new floor if it doesn't already exist
-              .concat(
-                !building.floors.some((floor) => floor.id === id)
-                  ? [{ id: id, floorName, workArea: null }] // New floor added with workArea set to null
-                  : []
-              ),
+                // Add the new floor if it doesn't already exist
+                .concat(
+                  !building.floors.some((floor) => floor.id === id)
+                    ? [{ id: id, floorName, workArea: null }] // New floor added with workArea set to null
+                    : []
+                ),
             }
-          : building
-      );
+            : building
+        );
 
-      updatedProject.buildings = updatedBuildings;
+        updatedProject.buildings = updatedBuildings;
 
-      // Cache the updated project
+        // Cache the updated project
       cacheData( "projectInfo", {projectId: updatedProject.id, data: updatedProject} );
-      setProject(updatedProject)
-    }
-    // Handle the work area data
+        setProject(updatedProject)
+      }
+      // Handle the work area data
     else if ( entity.workArea )
     {  
 
 
-      let buildingId = infraObject[0].workArea.buildingId
+        let buildingId = infraObject[0].workArea.buildingId
 
-      const { floorId, areaName, id } = entity.workArea;
-         // Check if the workArea exists, otherwise create a new one
-          const updatedBuildings = updatedProject.buildings.map((building) =>
+        const { floorId, areaName, id } = entity.workArea;
+        // Check if the workArea exists, otherwise create a new one
+        const updatedBuildings = updatedProject.buildings.map((building) =>
           building.id == buildingId
-             ? {
-                 ...building,
-                 floors: building.floors.map((floor) =>
-                  floor.id == floorId
-                    ? {
-                      ...floor,
-                       workAreas: floor.workAreas.some((workArea) => workArea.id === id)
+            ? {
+              ...building,
+              floors: building.floors.map((floor) =>
+                floor.id == floorId
+                  ? {
+                    ...floor,
+                    workAreas: floor.workAreas.some((workArea) => workArea.id === id)
                       ? floor.workAreas.map((workArea) =>
                         workArea.id === id
-                        ? { ...workArea, areaName }
-                        : workArea
-                     )
-                    : [
-                      ...floor.workAreas,
-                      { id, areaName, workItems: null },
-                    ],
+                          ? { ...workArea, areaName }
+                          : workArea
+                      )
+                      : [
+                        ...floor.workAreas,
+                        { id, areaName, workItems: null },
+                      ],
                   }
-            : floor
-         ),
-       }
-     : building
-    );
+                  : floor
+              ),
+            }
+            : building
+        );
 
-    updatedProject.buildings = updatedBuildings;
+        updatedProject.buildings = updatedBuildings;
 
- // Update the cache for work areas
+        // Update the cache for work areas
       cacheData( "projectInfo", {projectId: updatedProject.id, data: updatedProject} );
-      setProject(updatedProject)
-    }
-    // Handle the task (workItem) data
+        setProject(updatedProject)
+      }
+      // Handle the task (workItem) data
 
-    else {
-      console.error("Unsupported data type for submitData", entity);
-    }
+      else {
+        console.error("Unsupported data type for submitData", entity);
+      }
     } catch ( Err )
     {
       showToast("Somthing wrong","error")
@@ -262,25 +262,25 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
           const updatedBuildings = updatedProject.buildings.map((building) =>
             building.id == updatedModel.buildingID
               ? {
-                  ...building,
-                  floors: building.floors.map((floor) =>
-                    floor.id == updatedModel.floorId
-                      ? {
-                          ...floor,
-                          workAreas: floor.workAreas.map((workArea) =>
-                            workArea.id === workItem?.workAreaId
-                              ? {
-                                  ...workArea,
-                                  workItems: workArea.workItems.some((existingItem) => existingItem.workItemId === workItem.workItemId)
-                                  ? workArea.workItems  // If the workItemId already exists, keep the current workItems
-                                  : [...workArea.workItems, workItem],
-                                }
-                              : workArea
-                          ),
-                        }
-                      : floor
-                  ),
-                }
+                ...building,
+                floors: building.floors.map((floor) =>
+                  floor.id == updatedModel.floorId
+                    ? {
+                      ...floor,
+                      workAreas: floor.workAreas.map((workArea) =>
+                        workArea.id === workItem?.workAreaId
+                          ? {
+                            ...workArea,
+                            workItems: workArea.workItems.some((existingItem) => existingItem.workItemId === workItem.workItemId)
+                              ? workArea.workItems  // If the workItemId already exists, keep the current workItems
+                              : [...workArea.workItems, workItem],
+                          }
+                          : workArea
+                      ),
+                    }
+                    : floor
+                ),
+              }
               : building
           );
 
@@ -347,21 +347,21 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
 
   return (
     <>
-        <div
+      <div
         className={`modal fade ${showModal ? 'show' : ''}`}
         tabIndex="-1"
         role="dialog"
         style={{ display: showModal ? 'block' : 'none' }}
         aria-hidden={!showModal}
       >
-          <BuildingModel
-            project={data}
-            onClose={handleClose}
-            onSubmit={handleBuildingModelFormSubmit}
-            clearTrigger={clearFormTrigger}
-            onClearComplete={() => setClearFormTrigger(false)}
-          ></BuildingModel>
-        </div>
+        <BuildingModel
+          project={data}
+          onClose={handleClose}
+          onSubmit={handleBuildingModelFormSubmit}
+          clearTrigger={clearFormTrigger}
+          onClearComplete={() => setClearFormTrigger(false)}
+        ></BuildingModel>
+      </div>
       {isFloorModalOpen && (
         <div
           className="modal fade show"
@@ -383,10 +383,12 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
 
       {isWorkAreaModelOpen && (
         <div
-          className={`modal fade `}
+          className="modal fade show"
           id="work-area-model"
           tabIndex="-1"
-          aria-hidden="true"
+          role="dialog"
+          style={{ display: 'block' }}
+          aria-hidden="false"
         >
           <WorkAreaModel
             project={data}
@@ -395,16 +397,18 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
             onSubmit={handleWorkAreaModelFormSubmit}
             clearTrigger={clearFormTrigger}
             onClearComplete={() => setClearFormTrigger(false)}
-          ></WorkAreaModel>
+          />
         </div>
       )}
 
       {isTaskModelOpen && (
         <div
-          className={`modal fade `}
+          className="modal fade show"
           id="task-model"
           tabIndex="-1"
-          aria-hidden="true"
+          role="dialog"
+          style={{ display: 'block' }}
+          aria-hidden="false"
         >
           <TaskModel
             project={data}
@@ -413,7 +417,7 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
             onSubmit={handleTaskModelFormSubmit}
             clearTrigger={clearFormTrigger}
             onClearComplete={() => setClearFormTrigger(false)}
-          ></TaskModel>
+          />
         </div>
       )}
 
@@ -439,20 +443,18 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
                     Manage Building
                   </button>
                   <button
-  type="button"
-  className="link-button m-1"
-  onClick={() => openFloorModel()}
->
-  <i className="bx bx-plus-circle me-2"></i>
-  Manage Floors
-</button>
+                    type="button"
+                    className="link-button m-1"
+                    onClick={() => openFloorModel()}
+                  >
+                    <i className="bx bx-plus-circle me-2"></i>
+                    Manage Floors
+                  </button>
 
 
                   <button
                     type="button"
-                    data-bs-toggle="modal"
                     className="link-button m-1"
-                    data-bs-target="#work-area-model"
                     onClick={() => openWorkAreaModel()}
                   >
                     <i className="bx bx-plus-circle me-2"></i>
@@ -460,9 +462,7 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
                   </button>
                   <button
                     type="button"
-                    data-bs-toggle="modal"
                     className="link-button m-1"
-                    data-bs-target="#task-model"
                     onClick={() => openTaskModel()}
                   >
                     <i className="bx bx-plus-circle me-2"></i>

src/pages/employee/EmployeeList.jsx

@@ -325,7 +325,7 @@ const EmployeeList = () =>
                           <p>Loading...</p>
                         </td>
                       </tr>}
-                    {( !loading && employeeList?.length === 0 ) && <td colSpan={8}>Not Data Found </td>}
+                    {!loading && employeeList?.length === 0 && (<td colSpan={8} style={{ paddingTop: '20px', textAlign: 'center' }}>No Data Found</td> )}
                     {( !loading && employeeList && currentItems.length === 0 && employeeList.length !==0 ) && <td colSpan={8}><small className="muted">'{searchText}' employee not found</small> </td>}
               
                     {(currentItems && !loading) && currentItems.sort((a, b) => b.id - a.id).map((item) => (