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

Modified Manage task popup from project > project list. Change name planned to completed/planned and completed to Today`s planned. #114

Merged
admin merged 3 commits from Kartik_Enhancement#276 into Issue_May_3W 2025-05-17 10:57:50 +00:00
Conversation 0 Commits 3 Files Changed 2 +16 -25
2 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,10 +184,7 @@ 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">
Planned Completed/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

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

@ -177,22 +177,16 @@ 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?.plannedWork ?? `${NewWorkItem?.workItem?.completedWork ??
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 ?? workItem?.completedWork ??
"0"}/${NewWorkItem?.workItem?.plannedWork ??
workItem?.plannedWork ??
"0"}`
) : (
"NA" "NA"
: "NA"} )}
</td> </td>
{/* Progress Bar - always visible */} {/* Progress Bar - always visible */}