Compare commits

..

No commits in common. "e252c909dbb1496a31c377e94773fc03d721aa4c" and "818725fba48cc90daa17b969ed42315dd6fbfe4c" have entirely different histories.

2 changed files with 25 additions and 16 deletions

View File

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

View File

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