Display completion percentage for each Work Area header
This commit is contained in:
parent
346e7b1d1d
commit
80d3434bbf
@ -7,7 +7,11 @@ import { refreshData } from "../../../slices/localVariablesSlice";
|
|||||||
import ProjectRepository from "../../../repositories/ProjectRepository";
|
import ProjectRepository from "../../../repositories/ProjectRepository";
|
||||||
import showToast from "../../../services/toastService";
|
import showToast from "../../../services/toastService";
|
||||||
import { useHasUserPermission } from "../../../hooks/useHasUserPermission";
|
import { useHasUserPermission } from "../../../hooks/useHasUserPermission";
|
||||||
import {ASSIGN_REPORT_TASK, MANAGE_PROJECT_INFRA, MANAGE_TASK} from "../../../utils/constants";
|
import {
|
||||||
|
ASSIGN_REPORT_TASK,
|
||||||
|
MANAGE_PROJECT_INFRA,
|
||||||
|
MANAGE_TASK,
|
||||||
|
} from "../../../utils/constants";
|
||||||
import { useParams } from "react-router-dom";
|
import { useParams } from "react-router-dom";
|
||||||
|
|
||||||
const WorkArea = ({ workArea, floor, forBuilding }) => {
|
const WorkArea = ({ workArea, floor, forBuilding }) => {
|
||||||
@ -20,6 +24,21 @@ const WorkArea = ({ workArea, floor, forBuilding }) => {
|
|||||||
const ManageInfra = useHasUserPermission(MANAGE_PROJECT_INFRA);
|
const ManageInfra = useHasUserPermission(MANAGE_PROJECT_INFRA);
|
||||||
const ManageAndAssignTak = useHasUserPermission(ASSIGN_REPORT_TASK);
|
const ManageAndAssignTak = useHasUserPermission(ASSIGN_REPORT_TASK);
|
||||||
|
|
||||||
|
const [percentComplete, setPercentComplete] = useState(0);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const totalCompleted = workItems.reduce(
|
||||||
|
(sum, i) => sum + (i.workItem?.completedWork || 0),
|
||||||
|
0
|
||||||
|
);
|
||||||
|
const totalPlanned = workItems.reduce(
|
||||||
|
(sum, i) => sum + (i.workItem?.plannedWork || 0),
|
||||||
|
0
|
||||||
|
);
|
||||||
|
const percent =
|
||||||
|
totalPlanned > 0 ? (totalCompleted / totalPlanned) * 100 : 0;
|
||||||
|
setPercentComplete(Math.min(percent, 100)); // cap at 100%
|
||||||
|
}, [workItems]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const project = getCachedData("projectInfo");
|
const project = getCachedData("projectInfo");
|
||||||
@ -167,6 +186,11 @@ const WorkArea = ({ workArea, floor, forBuilding }) => {
|
|||||||
<span className="fw-normal text-darkgreen small">
|
<span className="fw-normal text-darkgreen small">
|
||||||
{workArea.areaName}
|
{workArea.areaName}
|
||||||
</span>
|
</span>
|
||||||
|
{workArea?.workItems?.length > 0 && (
|
||||||
|
<span className="small-text px-3">
|
||||||
|
{percentComplete.toFixed(2) + "%"}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</button>
|
</button>
|
||||||
@ -198,7 +222,8 @@ const WorkArea = ({ workArea, floor, forBuilding }) => {
|
|||||||
<th className="infra-activity-table-header">
|
<th className="infra-activity-table-header">
|
||||||
Progress
|
Progress
|
||||||
</th>
|
</th>
|
||||||
{( ManageInfra || ( !projectId && ManageAndAssignTak ) ) && (
|
{(ManageInfra ||
|
||||||
|
(!projectId && ManageAndAssignTak)) && (
|
||||||
<th className="infra-activity-table-header text-end">
|
<th className="infra-activity-table-header text-end">
|
||||||
<span className="px-2">Actions</span>
|
<span className="px-2">Actions</span>
|
||||||
</th>
|
</th>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user