Skip to content

3604 maintenence tracking spending on project overview #3638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chpy04 merged 12 commits into from
Feb 21, 2026
Merged

3604 maintenence tracking spending on project overview #3638

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a646f11
progress
superhvarn Sep 24, 2025
60954c7
#3604 new tab
superhvarn Sep 25, 2025
a6d160d
filtering
superhvarn Oct 6, 2025
d404ea8
Merge branch 'develop' into 3604-maintenence---tracking-spending-on-p…
superhvarn Oct 6, 2025
0e5d66f
only considering reimbursement requests
superhvarn Oct 6, 2025
309ee76
linting
superhvarn Oct 6, 2025
22f2487
Merge branch 'develop' into 3604-maintenence---tracking-spending-on-p…
chpy04 Oct 21, 2025
2b97432
progress
superhvarn Oct 29, 2025
cf2047d
#3604 finishing touches
superhvarn Dec 19, 2025
c8aa259
#3604 prettier
superhvarn Dec 19, 2025
4abc205
Merge branch 'develop' into 3604-maintenence---tracking-spending-on-p…
chpy04 Feb 21, 2026
6d9e8bc
better looking spending bar and shared datagrid
chpy04 Feb 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/frontend/src/pages/FinancePage/FinanceComponents/PieChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,19 @@ const FinancePieChart: React.FC<FinancePieChartProps> = ({
available
}) => {
const [isLegendOpen, setIsLegendOpen] = useState(true);

const pendingReimbursement = pendingLeadership + pendingFinance + submittedToSABO;

const [sectionStates, setSectionStates] = useState([
{ title: 'Pending Leadership', color: '#562016', expanded: false },
{ title: 'Pending Finance', color: '#8e3c2d', expanded: false },
{ title: 'Submitted to SABO', color: '#dd514c', expanded: false },
{ title: 'Pending Reimbursement', color: '#8e3c2d', expanded: false },
{ title: 'Reimbursed', color: '#797a7a', expanded: false },
{ title: 'Available', color: '#afafaf', expanded: false }
]);

const MIN_PERCENTAGE = 0.05;

const data = [
{ name: 'Pending Leadership', value: pendingLeadership },
{ name: 'Pending Finance', value: pendingFinance },
{ name: 'Submitted to SABO', value: submittedToSABO },
{ name: 'Pending Reimbursement', value: pendingReimbursement },
{ name: 'Reimbursed', value: reimbursed },
{ name: 'Available', value: available }
];
Expand Down Expand Up @@ -73,9 +72,7 @@ const FinancePieChart: React.FC<FinancePieChartProps> = ({
}

const sectionColorMap = new Map([
['Pending Leadership', '#562016'],
['Pending Finance', '#8e3c2d'],
['Submitted to SABO', '#dd514c'],
['Pending Reimbursement', '#8e3c2d'],
['Reimbursed', '#797a7a'],
['Available', '#afafaf']
]);
Expand Down
8 changes: 6 additions & 2 deletions src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/ProjectViewContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { useGetMaterialsForWbsElement } from '../../../hooks/bom.hooks';
import ChangeRequestTab from '../../../components/ChangeRequestTab';
import PartsReviewPage from './PartReview/PartsReviewPage';
import ActionsMenu from '../../../components/ActionsMenu';
import ProjectSpendingHistory from '../../ProjectPage/ProjectSpendingHistory';
import { useMyTeamAsHead } from '../../../hooks/teams.hooks';

interface ProjectViewContainerProps {
Expand Down Expand Up @@ -193,7 +194,8 @@ const ProjectViewContainer: React.FC<ProjectViewContainerProps> = ({ project, en
{ tabUrlValue: 'changes', tabName: 'Changes' },
{ tabUrlValue: 'gantt', tabName: 'Gantt' },
{ tabUrlValue: 'change-requests', tabName: 'Change Requests' },
{ tabUrlValue: 'parts-review', tabName: 'Parts Review' }
{ tabUrlValue: 'parts-review', tabName: 'Parts Review' },
{ tabUrlValue: 'spending', tabName: 'Budget' }
]}
baseUrl={`${routes.PROJECTS}/${wbsNum}`}
defaultTab="overview"
Expand All @@ -216,8 +218,10 @@ const ProjectViewContainer: React.FC<ProjectViewContainerProps> = ({ project, en
<ProjectGantt workPackages={project.workPackages} />
) : tab === 6 ? (
<ChangeRequestTab wbsElement={project} />
) : (
) : tab === 7 ? (
<PartsReviewPage project={project} />
) : (
<ProjectSpendingHistory wbsNum={project.wbsNum} />
Comment on lines +221 to +224
Copy link

Copilot AI Dec 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tab ordering logic is incorrect. Tab index 7 is mapped to PartsReviewPage but should be mapped to ProjectSpendingHistory based on the tab array order. The new Budget tab is at index 7 (8th position starting from 0), but the conditional checks tab === 7 and renders PartsReviewPage instead. The correct logic should check tab === 7 for ProjectSpendingHistory and tab === 6 should remain for PartsReviewPage. Currently, the Budget tab (index 7) will incorrectly show PartsReviewPage.

Copilot uses AI. Check for mistakes.
)}
{deleteModalShow && (
<DeleteProject modalShow={deleteModalShow} handleClose={handleDeleteClose} wbsNum={project.wbsNum} />
Expand Down
Loading