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

Merge pull request 'Modified Manage task popup from project > project list. Change name planned to completed/planned and completed to Today`s planned.' (#114) from Kartik_Enhancement#276 into Issue_May_3W

Browse Source 
Reviewed-on: #114
This commit is contained in:
Gitea Admin 2025-05-17 10:57:50 +00:00
commit e252c909db
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
</th>
<th className="infra-activity-table-header d-none d-md-table-cell">
Planned
</th>
<th className="infra-activity-table-header d-none d-md-table-cell">
Completed
Completed/Planned
</th>
<th className="infra-activity-table-header">
Progress

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

@ -148,7 +148,7 @@ const WorkItem = ({
<span className="fw-light">
{hasWorkItem
? NewWorkItem?.workItem?.activityMaster?.activityName ||
workItem.activityMaster?.activityName
workItem.activityMaster?.activityName
: "NA"}
</span>
</td>
@ -157,8 +157,8 @@ const WorkItem = ({
<td className="text-center d-sm-table-cell d-md-none">
{hasWorkItem
? NewWorkItem?.workItem?.completedWork ??
workItem?.completedWork ??
"NA"
workItem?.completedWork ??
"NA"
: "NA"}
/{" "}
{hasWorkItem
@ -171,28 +171,22 @@ const WorkItem = ({
<span className="fw-light">
{hasWorkItem
? NewWorkItem?.workItem?.workCategoryMaster?.name ||
workItem.workCategoryMaster?.name ||
"NA"
workItem.workCategoryMaster?.name ||
"NA"
: "NA"}
</span>
</td>
{/* Planned - visible on medium and above */}
<td className="text-center d-none d-md-table-cell">
{hasWorkItem
? NewWorkItem?.workItem?.plannedWork ??
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 ??
"NA"
: "NA"}
{hasWorkItem ? (
`${NewWorkItem?.workItem?.completedWork ??
workItem?.completedWork ??
"0"}/${NewWorkItem?.workItem?.plannedWork ??
workItem?.plannedWork ??
"0"}`
) : (
"NA"
)}
</td>
{/* 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",
}}