Merge branch 'Issue_May_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_3W

# Conflicts:
#	src/components/Project/AssignRole.jsx

src/components/Project/AboutProject.jsx

@@ -12,7 +12,7 @@ const AboutProject = ({ data }) => {
             <small className="card-text text-uppercase text-muted small">
               Profile
             </small>
-            <ul className="list-unstyled my-3 py-1">
+            <ul className="list-unstyled my-3">
               <li className="d-flex align-items-center mb-4">
                 <i className="bx bx-check"></i>
                 <span className="fw-medium mx-2">Start Date:</span>{" "}
@@ -41,27 +41,17 @@ const AboutProject = ({ data }) => {
                 <span className="fw-medium mx-2">Contact:</span>{" "}
                 <span>{data.contactPerson}</span>
               </li>
-              <li className="d-flex align-items-center mb-4">
+              <li className="d-flex flex-column align-items-start mb-4">
-                <i className="bx bx-flag"></i>
+                <div className="d-flex align-items-center">
-                <span className="fw-medium mx-2">Address:</span>{" "}
+                  <i className="bx bx-flag"></i>
-              </li>
+                  <span className="fw-medium mx-2">Address:</span>
-            </ul>
+                  {data.projectAddress?.length <= 20 && (
-            {/* <small className="card-text text-uppercase text-muted small">
+                    <span>{data.projectAddress}</span>
-              Contacts
+                  )}
-            </small> */}
+                </div>
-            <ul className="list-unstyled my-3 py-1">
+                {data.projectAddress?.length > 20 && (
-             
+                  <div className="ms-4 text-start">{data.projectAddress}</div>
-              {/* <li className="d-flex align-items-center mb-4">
+                )}
-                <i className="bx bx-phone"></i>
-                <span className="fw-medium mx-2">Contact Number:</span>{" "}
-                <span>NA</span>
-              </li> */}
-              {/* <li className="d-flex align-items-center mb-4">
-                <i className="bx bx-envelope"></i>
-                <span className="fw-medium mx-2">Email:</span> <span>NA</span>
-              </li> */}          
-              <li className="d-flex align-items-start test-start mb-4">
-                <span>{data.projectAddress}</span>
               </li>
             </ul>
           </div>

src/components/Project/Infrastructure/BuildingModel.jsx

@@ -47,7 +47,7 @@ const BuildingModel = ({
     }
 
     return () => {
-      setValue("name", null);
+      setValue("name", "");
     };
   }, [clearTrigger, onClearComplete, editingBuilding, project?.id]);
 
@@ -199,3 +199,5 @@ const BuildingModel = ({
 };
 
 export default BuildingModel;
+
+

src/components/Project/Infrastructure/InfraTable.jsx

@@ -31,7 +31,7 @@ const InfraTable = ({ buildings }) => {
         {
           building: null,
           floor: {
-            id: data.id || "0",
+            id: data.id || null,
             floorName: data.floorName,
             buildingId: data.buildingId,
           },

src/components/Project/Infrastructure/WorkArea.jsx

@@ -184,10 +184,7 @@ const WorkArea = ({ workArea, floor, forBuilding }) => {
                             Category
                           </th>
                           <th className="infra-activity-table-header d-none d-md-table-cell">
-                            Planned
+                            Completed/Planned
-                          </th>
-                          <th className="infra-activity-table-header d-none d-md-table-cell">
-                            Completed
                           </th>
                           <th className="infra-activity-table-header">
                             Progress

src/components/Project/Infrastructure/WorkItem.jsx

@@ -148,7 +148,7 @@ const WorkItem = ({
           <span className="fw-light">
             {hasWorkItem
               ? NewWorkItem?.workItem?.activityMaster?.activityName ||
-                workItem.activityMaster?.activityName
+              workItem.activityMaster?.activityName
               : "NA"}
           </span>
         </td>
@@ -157,8 +157,8 @@ const WorkItem = ({
         <td className="text-center d-sm-table-cell d-md-none">
           {hasWorkItem
             ? NewWorkItem?.workItem?.completedWork ??
-              workItem?.completedWork ??
+            workItem?.completedWork ??
-              "NA"
+            "NA"
             : "NA"}
           /{" "}
           {hasWorkItem
@@ -171,28 +171,22 @@ const WorkItem = ({
           <span className="fw-light">
             {hasWorkItem
               ? NewWorkItem?.workItem?.workCategoryMaster?.name ||
-                workItem.workCategoryMaster?.name ||
+              workItem.workCategoryMaster?.name ||
-                "NA"
+              "NA"
               : "NA"}
           </span>
         </td>
 
-        {/* Planned - visible on medium and above */}
         <td className="text-center d-none d-md-table-cell">
-          {hasWorkItem
+          {hasWorkItem ? (
-            ? NewWorkItem?.workItem?.plannedWork ??
+            `${NewWorkItem?.workItem?.completedWork ??
-              workItem?.plannedWork ??
+            workItem?.completedWork ??
-              "NA"
+            "0"}/${NewWorkItem?.workItem?.plannedWork ??
-            : "NA"}
+            workItem?.plannedWork ??
-        </td>
+            "0"}`
-
+          ) : (
-        {/* Completed - visible on medium and above */}
+            "NA"
-        <td className="text-center d-none d-md-table-cell">
+          )}
-          {hasWorkItem
-            ? NewWorkItem?.workItem?.completedWork ??
-              workItem?.completedWork ??
-              "NA"
-            : "NA"}
         </td>
 
         {/* Progress Bar - always visible */}
@@ -205,7 +199,7 @@ const WorkItem = ({
                 width: getProgress(
                   NewWorkItem?.workItem?.plannedWork || workItem?.plannedWork,
                   NewWorkItem?.workItem?.completedWork ||
-                    workItem?.completedWork
+                  workItem?.completedWork
                 ),
                 height: "5px",
               }}

src/components/Project/MapUsers.jsx

@@ -114,8 +114,8 @@ const MapUsers = ({
     <>
       <div className="modal-dialog modal-dialog-scrollable mx-sm-auto mx-1 modal-lg modal-simple modal-edit-user">
         <div className="modal-content">
-          <div className="modal-header">
+          <div className="modal-header ">
-            <div className="md-2 mb-1">
+            <div className="md-2 mb-n5">
               {(filteredData.length > 0 ||
                   allocationEmployeesData.length > 0)&& (
                   <div className="input-group">

src/data/menuData.json

@@ -48,7 +48,7 @@
                         "link": "/activities/task"
                     },
                     {
-                        "text": "Daily Task",
+                        "text": "Daily Progress Report",
                         "available": true,
                         "link": "/activities/records"
                     },

src/pages/Activities/AttendancePage.jsx

@@ -161,6 +161,7 @@ const AttendancePage = () => {
               )}
             </div>
           </ul>
+          
           <ul className="nav nav-tabs" role="tablist">
             <li className="nav-item">
               <button
@@ -170,7 +171,7 @@ const AttendancePage = () => {
                 data-bs-toggle="tab"
                 data-bs-target="#navs-top-home"
               >
-                All
+                Today's
               </button>
             </li>
             <li className="nav-item">
@@ -216,6 +217,7 @@ const AttendancePage = () => {
                 </div>
               </>
             )}
+            
 
             {activeTab === "logs" && (
               <div className="tab-pane fade show active py-0">