Merge pull request #308 from ORNL-AMO/hotfix-project

Hotfix projected financing
ORNL-AMO · Mar 27, 2024 · 5056043 · 5056043
2 parents 7a945dc + 24b82ef
commit 5056043
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Financing.tsx b/src/Financing.tsx
@@ -181,7 +181,7 @@ export function getRemainingProjectCosts(project: ImplementedProject, mutableSta
     let yearsRemaining = project.financingOption.financingType.loanTerm - yearsPaid;
     let projectControl = Projects[project.page];
     let isAnnuallyFinanced = getIsAnnuallyFinanced(project.financingOption.financingType.id);
-    if ((isAnnuallyFinanced || projectControl.isPPA) && yearsRemaining) {
+    if ((isAnnuallyFinanced || projectControl.isPPA) && yearsRemaining > 0) {
         // we always want this cost to be expressed in single year 
         let yearInterval = 1
         let annualCost = projectControl.getImplementationCost(project.financingOption.financingType.id, yearInterval);

diff --git a/src/components/YearRecap.tsx b/src/components/YearRecap.tsx
@@ -241,7 +241,7 @@ export class YearRecap extends React.Component<YearRecapProps, { inView }> {
 									<ListItemText
 										primary={
 											<Typography variant={'h5'}>
-												You are projected to spend {' '}<Emphasis>${projectedFinancedSpendingFormatted}</Emphasis>{' '} on financed and renewed projects. Your total projected spend is {' '}<Emphasis>${gameCurrentAndProjectedSpendingFormatted}</Emphasis>{' '}.
+												You are projected to spend {' '}<Emphasis>${projectedFinancedSpendingFormatted}</Emphasis>{' '} on financed and renewed projects. Your total projected spend is {' '}<Emphasis>${gameCurrentAndProjectedSpendingFormatted}</Emphasis>.
 											</Typography>
 										}
 									/>