diff --git a/src/components/Project/Infrastructure/WorkArea.jsx b/src/components/Project/Infrastructure/WorkArea.jsx index dfebe350..cbe34dc5 100644 --- a/src/components/Project/Infrastructure/WorkArea.jsx +++ b/src/components/Project/Infrastructure/WorkArea.jsx @@ -184,10 +184,7 @@ const WorkArea = ({ workArea, floor, forBuilding }) => { Category - Planned - - - Completed + Completed/Planned Progress 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 = ({ {hasWorkItem ? NewWorkItem?.workItem?.activityMaster?.activityName || - workItem.activityMaster?.activityName + workItem.activityMaster?.activityName : "NA"} @@ -157,8 +157,8 @@ const WorkItem = ({ {hasWorkItem ? NewWorkItem?.workItem?.completedWork ?? - workItem?.completedWork ?? - "NA" + workItem?.completedWork ?? + "NA" : "NA"} /{" "} {hasWorkItem @@ -171,28 +171,22 @@ const WorkItem = ({ {hasWorkItem ? NewWorkItem?.workItem?.workCategoryMaster?.name || - workItem.workCategoryMaster?.name || - "NA" + workItem.workCategoryMaster?.name || + "NA" : "NA"} - {/* Planned - visible on medium and above */} - {hasWorkItem - ? NewWorkItem?.workItem?.plannedWork ?? - workItem?.plannedWork ?? - "NA" - : "NA"} - - - {/* Completed - visible on medium and above */} - - {hasWorkItem - ? NewWorkItem?.workItem?.completedWork ?? - workItem?.completedWork ?? - "NA" - : "NA"} + {hasWorkItem ? ( + `${NewWorkItem?.workItem?.completedWork ?? + workItem?.completedWork ?? + "0"}/${NewWorkItem?.workItem?.plannedWork ?? + workItem?.plannedWork ?? + "0"}` + ) : ( + "NA" + )} {/* 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", }}