From 27cf6f2703c2bad15a97381891af45b00e23e1dd Mon Sep 17 00:00:00 2001
From: "kartik.sharma" <kartik.sharma@marcoaiot.com>
Date: Fri, 16 May 2025 09:51:36 +0530
Subject: [PATCH 1/3] Modified Manage task popup from project > project list.
 Change name planned to completed/planned and completed to Today`s planned.

---
 src/components/Project/Infrastructure/EditActivityModal.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Project/Infrastructure/EditActivityModal.jsx b/src/components/Project/Infrastructure/EditActivityModal.jsx
index e539df96..916e1395 100644
--- a/src/components/Project/Infrastructure/EditActivityModal.jsx
+++ b/src/components/Project/Infrastructure/EditActivityModal.jsx
@@ -335,7 +335,7 @@ const EditActivityModal = ({
               {/* {ISselectedActivity && ( */}
               <div className="col-5 col-md-5">
                 <label className="form-label" htmlFor="plannedWork">
-                  Planned Work
+                  Completed/Planned
                 </label>
                 <input
                   {...register("plannedWork", { valueAsNumber: true })}
@@ -354,7 +354,7 @@ const EditActivityModal = ({
               {/* {ISselectedActivity && ( */}
               <div className="col-5 col-md-5">
                 <label className="form-label" htmlFor="completedWork">
-                  Completed Work
+                  Today`s Planned
                 </label>
                 <input
                   {...register("completedWork", { valueAsNumber: true })}

From 21b2feb13f074927aba03b49fb82048fcb644646 Mon Sep 17 00:00:00 2001
From: "kartik.sharma" <kartik.sharma@marcoaiot.com>
Date: Fri, 16 May 2025 17:14:43 +0530
Subject: [PATCH 2/3] Update the Project List component column names: 1.Change
 'Planned' to 'Completed/Planned' 2.Change 'Completed' to 'Today's Planned

---
 src/components/Project/Infrastructure/EditActivityModal.jsx | 4 ++--
 src/components/Project/Infrastructure/WorkArea.jsx          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Project/Infrastructure/EditActivityModal.jsx b/src/components/Project/Infrastructure/EditActivityModal.jsx
index 916e1395..e539df96 100644
--- a/src/components/Project/Infrastructure/EditActivityModal.jsx
+++ b/src/components/Project/Infrastructure/EditActivityModal.jsx
@@ -335,7 +335,7 @@ const EditActivityModal = ({
               {/* {ISselectedActivity && ( */}
               <div className="col-5 col-md-5">
                 <label className="form-label" htmlFor="plannedWork">
-                  Completed/Planned
+                  Planned Work
                 </label>
                 <input
                   {...register("plannedWork", { valueAsNumber: true })}
@@ -354,7 +354,7 @@ const EditActivityModal = ({
               {/* {ISselectedActivity && ( */}
               <div className="col-5 col-md-5">
                 <label className="form-label" htmlFor="completedWork">
-                  Today`s Planned
+                  Completed Work
                 </label>
                 <input
                   {...register("completedWork", { valueAsNumber: true })}
diff --git a/src/components/Project/Infrastructure/WorkArea.jsx b/src/components/Project/Infrastructure/WorkArea.jsx
index dfebe350..05f16089 100644
--- a/src/components/Project/Infrastructure/WorkArea.jsx
+++ b/src/components/Project/Infrastructure/WorkArea.jsx
@@ -184,10 +184,10 @@ 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
+                            Today's Planned
                           </th>
                           <th className="infra-activity-table-header">
                             Progress

From 48f013edd592bd48fcff905741d5931d0717afb5 Mon Sep 17 00:00:00 2001
From: "kartik.sharma" <kartik.sharma@marcoaiot.com>
Date: Sat, 17 May 2025 14:45:35 +0530
Subject: [PATCH 3/3] On the Infrastructure tab, the Planned and Completed
 columns have been merged, and their data is now shown as '2/3'.

---
 .../Project/Infrastructure/WorkArea.jsx       |  3 --
 .../Project/Infrastructure/WorkItem.jsx       | 36 ++++++++-----------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/components/Project/Infrastructure/WorkArea.jsx b/src/components/Project/Infrastructure/WorkArea.jsx
index 05f16089..cbe34dc5 100644
--- a/src/components/Project/Infrastructure/WorkArea.jsx
+++ b/src/components/Project/Infrastructure/WorkArea.jsx
@@ -186,9 +186,6 @@ const WorkArea = ({ workArea, floor, forBuilding }) => {
                           <th className="infra-activity-table-header d-none d-md-table-cell">
                             Completed/Planned
                           </th>
-                          <th className="infra-activity-table-header d-none d-md-table-cell">
-                            Today's Planned
-                          </th>
                           <th className="infra-activity-table-header">
                             Progress
                           </th>
diff --git a/src/components/Project/Infrastructure/WorkItem.jsx b/src/components/Project/Infrastructure/WorkItem.jsx
index 6cf17687..9a694729 100644
--- a/src/components/Project/Infrastructure/WorkItem.jsx
+++ b/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 ??
-              "NA"
+            workItem?.completedWork ??
+            "NA"
             : "NA"}
           /{" "}
           {hasWorkItem
@@ -171,28 +171,22 @@ const WorkItem = ({
           <span className="fw-light">
             {hasWorkItem
               ? NewWorkItem?.workItem?.workCategoryMaster?.name ||
-                workItem.workCategoryMaster?.name ||
-                "NA"
+              workItem.workCategoryMaster?.name ||
+              "NA"
               : "NA"}
           </span>
         </td>
 
-        {/* Planned - visible on medium and above */}
         <td className="text-center d-none d-md-table-cell">
-          {hasWorkItem
-            ? NewWorkItem?.workItem?.plannedWork ??
-              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 ??
-              "NA"
-            : "NA"}
+          {hasWorkItem ? (
+            `${NewWorkItem?.workItem?.completedWork ??
+            workItem?.completedWork ??
+            "0"}/${NewWorkItem?.workItem?.plannedWork ??
+            workItem?.plannedWork ??
+            "0"}`
+          ) : (
+            "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",
               }}