Merge pull request #319 from ORNL-AMO/issue-279-d

Issue 279 - Use carbon savings per tonne stat
ORNL-AMO · Apr 2, 2024 · 7f56711 · 7f56711
2 parents a30233a + f6709a2
commit 7f56711
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -648,7 +648,10 @@ export class App extends React.PureComponent<unknown, AppState> {
 		});
 		const carbonSavingsPercentFormatted: string = (endYearStats.carbonSavingsPercent * 100).toFixed(2);
 		const gameTotalNetCostFormatted: string = noDecimalsFormatter.format(endYearStats.gameTotalSpending);
-		const carbonSavingsKgFormatted: string = noDecimalsFormatter.format(endYearStats.carbonSavingsPerKg);
+
+        const carbonSavingsPerTonne = endYearStats.carbonSavingsPerKg / 1000;
+		const carbonSavingsPerTonneFormatted: string = noDecimalsFormatter.format(carbonSavingsPerTonne);
+
 		const projectedFinancedSpendingFormatted: string = noDecimalsFormatter.format(projectedFinancedSpending);
 		const gameCurrentAndProjectedSpendingFormatted: string = noDecimalsFormatter.format(projectedFinancedSpending + endYearStats.gameTotalSpending);
 		const costPerCarbonSavingsFormatted: string = endYearStats.costPerCarbonSavings !== undefined ? Intl.NumberFormat('en-US', {
@@ -659,7 +662,7 @@ export class App extends React.PureComponent<unknown, AppState> {
 		// todo add NAN / undefined defensives
 		let endGameResults: EndGameResults = {
 			carbonSavingsPercent: carbonSavingsPercentFormatted,
-			carbonSavingsKg: carbonSavingsKgFormatted,
+			carbonSavingsPerTonne: carbonSavingsPerTonneFormatted,
 			gameTotalSpending: gameTotalNetCostFormatted,
 			projectedFinancedSpending: projectedFinancedSpendingFormatted,
 			gameCurrentAndProjectedSpending: gameCurrentAndProjectedSpendingFormatted,

diff --git a/src/components/WinGame.tsx b/src/components/WinGame.tsx
@@ -77,7 +77,7 @@ export default class WinGame extends React.Component<WinGameProps> {
                                         <span>In the game, you spent
                                             <UnderlineSpan text={`$${this.props.endGameResults.gameTotalSpending}`}
                                                 animationClass='animate-underline-emphasis'></UnderlineSpan>
-                                            on GHG reduction measures.
+                                            on GHG reduction measures
                                         </span>
 
                                     </div>,
@@ -86,7 +86,7 @@ export default class WinGame extends React.Component<WinGameProps> {
                                         className='slide-stat-div child-stat-div'>
                                         {this.props.endGameResults.projectedFinancedSpending ?
                                             <span>In the years after the game, you will spend <UnderlineSpan text={`$${this.props.endGameResults.projectedFinancedSpending}`}
-                                                animationClass='animate-underline-emphasis'></UnderlineSpan> on financed and power purchase agreement projects.
+                                                animationClass='animate-underline-emphasis'></UnderlineSpan> on financed and power purchase agreement projects
                                             </span>
                                             :
                                             <></>
@@ -108,7 +108,7 @@ export default class WinGame extends React.Component<WinGameProps> {
                                             <UnderlineSpan text={`$${this.props.endGameResults.gameCurrentAndProjectedSpending}`}
                                                 animationClass='animate-underline-emphasis'></UnderlineSpan>
                                             and you will have reduced your GHG emissions by
-                                            <UnderlineSpan text={`${this.props.endGameResults.carbonSavingsKg} kg/yr`} animationClass='animate-underline-emphasis'></UnderlineSpan>
+                                            <UnderlineSpan text={`${this.props.endGameResults.carbonSavingsPerTonne} tonne/yr`} animationClass='animate-underline-emphasis'></UnderlineSpan>
                                         </span>
                                     </div>,
                                     <div
@@ -130,7 +130,7 @@ export default class WinGame extends React.Component<WinGameProps> {
                                     <div
                                         key={'slide4c'}
                                         className='slide-stat-div'>
-                                        Overall, You reduced your GHG emissions by {this.props.endGameResults.carbonSavingsPercent}%
+                                        Overall, you reduced your GHG emissions by {this.props.endGameResults.carbonSavingsPercent}%
                                     </div>,
                                     <div
                                         key={'slide4b'}

diff --git a/src/trackedStats.tsx b/src/trackedStats.tsx
@@ -112,7 +112,7 @@ export interface TrackedStats {
 export interface EndGameResults {
 	carbonSavingsPercent: string,
 	gameTotalSpending: string,
-	carbonSavingsKg: string,
+	carbonSavingsPerTonne: string,
 	projectedFinancedSpending: string,
 	gameCurrentAndProjectedSpending: string,
 	costPerCarbonSavings: string,