admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

On the Infrastructure tab, the Planned and Completed columns have been merged, and their data is now shown as '2/3'.

Browse Source
This commit is contained in:
kartik.sharma 2025-05-17 14:45:35 +05:30 committed by Gitea Admin
parent 21b2feb13f
commit 48f013edd5
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/Project/Infrastructure/WorkArea.jsx
View File

@ -186,9 +186,6 @@ const WorkArea = ({ workArea, floor, forBuilding }) => {
<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 Completed/Planned
</th> </th>
<th className="infra-activity-table-header d-none d-md-table-cell">
Today's Planned
</th>
<th className="infra-activity-table-header"> <th className="infra-activity-table-header">
Progress Progress
</th> </th>

36
src/components/Project/Infrastructure/WorkItem.jsx
View File

@ -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,28 +171,22 @@ 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?.plannedWork ?? `${NewWorkItem?.workItem?.completedWork ??
workItem?.plannedWork ?? workItem?.completedWork ??
"NA" "0"}/${NewWorkItem?.workItem?.plannedWork ??
: "NA"} workItem?.plannedWork ??
</td> "0"}`
) : (
{/* Completed - visible on medium and above */} "NA"
<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 */}
@ -205,7 +199,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",
}} }}