Skip to content

Commit d6e5fda

Browse files
committed
#4074 filter don't remove
1 parent 03bad7c commit d6e5fda

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

src/frontend/src/pages/ProjectPage/ProjectSpendingHistory.tsx

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,8 @@ const ProjectSpendingHistory: React.FC<ProjectSpendingHistoryProps> = ({ wbsNum
5353

5454
const reimbursementRequests = useMemo(() => {
5555
if (!allReimbursementRequests || !project) return [];
56-
return allReimbursementRequests.filter((rr) => {
57-
if (getCurrentReimbursementStatus(rr.reimbursementStatuses).type == 'DENIED') return false; // exclude denied requests
58-
return rr.reimbursementProducts.some((product) => {
56+
return allReimbursementRequests.filter((rr) =>
57+
rr.reimbursementProducts.some((product) => {
5958
const reason = product.reimbursementProductReason;
6059
if ((reason as WBSElementData).wbsNum) {
6160
return equalsWbsNumber(
@@ -64,14 +63,17 @@ const ProjectSpendingHistory: React.FC<ProjectSpendingHistoryProps> = ({ wbsNum
6463
);
6564
}
6665
return false;
67-
});
68-
});
66+
})
67+
);
6968
}, [allReimbursementRequests, project, wbsNum]);
7069

7170
const budgetInfo = useMemo(() => {
7271
if (!project) return null;
7372
const totalBudget = project.budget; // already in dollars
74-
const totalSpent = reimbursementRequests.reduce((sum, rr) => sum + getProjectCost(rr, wbsNum), 0) / 100; // cents → dollars
73+
const nonDeniedRequests = reimbursementRequests.filter(
74+
(rr) => getCurrentReimbursementStatus(rr.reimbursementStatuses).type !== 'DENIED'
75+
);
76+
const totalSpent = nonDeniedRequests.reduce((sum, rr) => sum + getProjectCost(rr, wbsNum), 0) / 100; // cents → dollars
7577
const budgetRemaining = totalBudget - totalSpent;
7678
const budgetUsedPercentage = totalBudget > 0 ? (totalSpent / totalBudget) * 100 : 0;
7779
return {

0 commit comments

Comments
 (0)