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

@@ -177,22 +177,16 @@ const WorkItem = ({
           </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 ??
-              "NA"
-            : "NA"}
-        </td>
-
-        {/* Completed - visible on medium and above */}
-        <td className="text-center d-none d-md-table-cell">
-          {hasWorkItem
-            ? NewWorkItem?.workItem?.completedWork ??
             workItem?.completedWork ??
+            "0"}/${NewWorkItem?.workItem?.plannedWork ??
+            workItem?.plannedWork ??
+            "0"}`
+          ) : (
             "NA"
-            : "NA"}
+          )}
         </td>
 
         {/* Progress Bar - always visible */}