Compare commits
No commits in common. "e252c909dbb1496a31c377e94773fc03d721aa4c" and "818725fba48cc90daa17b969ed42315dd6fbfe4c" have entirely different histories.
e252c909db
...
818725fba4
@ -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
|
||||||
|
|||||||
@ -148,7 +148,7 @@ const WorkItem = ({
|
|||||||
<span className="fw-light">
|
<span className="fw-light">
|
||||||
{hasWorkItem
|
{hasWorkItem
|
||||||
? NewWorkItem?.workItem?.activityMaster?.activityName ||
|
? NewWorkItem?.workItem?.activityMaster?.activityName ||
|
||||||
workItem.activityMaster?.activityName
|
workItem.activityMaster?.activityName
|
||||||
: "NA"}
|
: "NA"}
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
@ -157,8 +157,8 @@ const WorkItem = ({
|
|||||||
<td className="text-center d-sm-table-cell d-md-none">
|
<td className="text-center d-sm-table-cell d-md-none">
|
||||||
{hasWorkItem
|
{hasWorkItem
|
||||||
? NewWorkItem?.workItem?.completedWork ??
|
? NewWorkItem?.workItem?.completedWork ??
|
||||||
workItem?.completedWork ??
|
workItem?.completedWork ??
|
||||||
"NA"
|
"NA"
|
||||||
: "NA"}
|
: "NA"}
|
||||||
/{" "}
|
/{" "}
|
||||||
{hasWorkItem
|
{hasWorkItem
|
||||||
@ -171,22 +171,28 @@ const WorkItem = ({
|
|||||||
<span className="fw-light">
|
<span className="fw-light">
|
||||||
{hasWorkItem
|
{hasWorkItem
|
||||||
? NewWorkItem?.workItem?.workCategoryMaster?.name ||
|
? NewWorkItem?.workItem?.workCategoryMaster?.name ||
|
||||||
workItem.workCategoryMaster?.name ||
|
workItem.workCategoryMaster?.name ||
|
||||||
"NA"
|
"NA"
|
||||||
: "NA"}
|
: "NA"}
|
||||||
</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 ??
|
workItem?.plannedWork ??
|
||||||
"0"}/${NewWorkItem?.workItem?.plannedWork ??
|
"NA"
|
||||||
workItem?.plannedWork ??
|
: "NA"}
|
||||||
"0"}`
|
</td>
|
||||||
) : (
|
|
||||||
"NA"
|
{/* 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 */}
|
||||||
@ -199,7 +205,7 @@ const WorkItem = ({
|
|||||||
width: getProgress(
|
width: getProgress(
|
||||||
NewWorkItem?.workItem?.plannedWork || workItem?.plannedWork,
|
NewWorkItem?.workItem?.plannedWork || workItem?.plannedWork,
|
||||||
NewWorkItem?.workItem?.completedWork ||
|
NewWorkItem?.workItem?.completedWork ||
|
||||||
workItem?.completedWork
|
workItem?.completedWork
|
||||||
),
|
),
|
||||||
height: "5px",
|
height: "5px",
|
||||||
}}
|
}}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user