Merge pull request 'Modified Manage task popup from project > project list. Change name planned to completed/planned and completed to Today`s planned.' (#114) from Kartik_Enhancement#276 into Issue_May_3W

Reviewed-on: #114

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",
               }}