Skip to content

Commit a6d160d

Browse files
committed
filtering
1 parent 60954c7 commit a6d160d

3 files changed

Lines changed: 361 additions & 95 deletions

File tree

src/frontend/src/pages/FinancePage/FinanceComponents/PieChart.tsx

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ const FinancePieChart: React.FC<FinancePieChartProps> = ({
2424
available
2525
}) => {
2626
const [isLegendOpen, setIsLegendOpen] = useState(true);
27+
28+
// Combine pending categories into one
29+
const pendingReimbursement = pendingLeadership + pendingFinance + submittedToSABO;
30+
2731
const [sectionStates, setSectionStates] = useState([
28-
{ title: 'Pending Leadership', color: '#562016', expanded: false },
29-
{ title: 'Pending Finance', color: '#8e3c2d', expanded: false },
30-
{ title: 'Submitted to SABO', color: '#dd514c', expanded: false },
32+
{ title: 'Pending Reimbursement', color: '#8e3c2d', expanded: false },
3133
{ title: 'Reimbursed', color: '#797a7a', expanded: false },
3234
{ title: 'Available', color: '#afafaf', expanded: false }
3335
]);
3436

3537
const MIN_PERCENTAGE = 0.05;
3638

3739
const data = [
38-
{ name: 'Pending Leadership', value: pendingLeadership },
39-
{ name: 'Pending Finance', value: pendingFinance },
40-
{ name: 'Submitted to SABO', value: submittedToSABO },
40+
{ name: 'Pending Reimbursement', value: pendingReimbursement },
4141
{ name: 'Reimbursed', value: reimbursed },
4242
{ name: 'Available', value: available }
4343
];
@@ -73,9 +73,7 @@ const FinancePieChart: React.FC<FinancePieChartProps> = ({
7373
}
7474

7575
const sectionColorMap = new Map([
76-
['Pending Leadership', '#562016'],
77-
['Pending Finance', '#8e3c2d'],
78-
['Submitted to SABO', '#dd514c'],
76+
['Pending Reimbursement', '#8e3c2d'],
7977
['Reimbursed', '#797a7a'],
8078
['Available', '#afafaf']
8179
]);

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/ProjectViewContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ const ProjectViewContainer: React.FC<ProjectViewContainerProps> = ({ project, en
181181
{ tabUrlValue: 'gantt', tabName: 'Gantt' },
182182
{ tabUrlValue: 'change-requests', tabName: 'Change Requests' },
183183
{ tabUrlValue: 'parts-review', tabName: 'Parts Review' },
184-
{ tabUrlValue: 'spending', tabName: 'Spending History' }
184+
{ tabUrlValue: 'spending', tabName: 'Budget' }
185185
]}
186186
baseUrl={`${routes.PROJECTS}/${wbsNum}`}
187187
defaultTab="overview"

0 commit comments

Comments
 (0)