Skip to content

Commit

Permalink
Merge pull request #307 from ORNL-AMO/issue-305
Browse files Browse the repository at this point in the history
Issue 305
  • Loading branch information
rhernandez-intertech authored Mar 27, 2024
2 parents 56c429c + 504f5df commit 7a945dc
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -414,9 +414,9 @@ export class App extends React.PureComponent<unknown, AppState> {
return this.state.implementedProjectsIds.includes(page) || renewableProjectSymbols.includes(page);
});
if (!hasSelectedScope1Projects) {
warningDialogProps.text = 'You haven\'t selected any Scope 1 projects for this year. Do you want to go {BACK} and look at some of the possible Scope 1 projects?';
warningDialogProps.text = 'You haven\'t selected any Scope 1 projects for this budget period. Do you want to go {BACK} and look at some of the possible Scope 1 projects?';
} else if (!hasSelectedScope2Projects) {
warningDialogProps.text = 'You haven\'t selected any Scope 2 projects for this year. Do you want to go {BACK} and look at some of the possible Scope 2 projects?';
warningDialogProps.text = 'You haven\'t selected any Scope 2 projects for this budget period. Do you want to go {BACK} and look at some of the possible Scope 2 projects?';
}
hasScopesWarning = !hasSelectedScope1Projects || !hasSelectedScope2Projects;
}
Expand Down
4 changes: 2 additions & 2 deletions src/PageControls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ PageControls[Pages.selectScope] = newGroupedChoicesControl({
});

PageControls[Pages.scope1Projects] = newGroupedChoicesControl({
title: (state) => `These are the possible {Scope 1} projects {${state.companyName}} can do this year.`,
title: (state) => `These are the possible {Scope 1} projects {${state.companyName}} can do this budget period.`,
isProjectGroupChoice: true,
groups: [
{
Expand Down Expand Up @@ -196,7 +196,7 @@ PageControls[Pages.scope1Projects] = newGroupedChoicesControl({
hideDashboard: false,
}, Pages.selectScope);
PageControls[Pages.scope2Projects] = newGroupedChoicesControl({
title: (state) => `These are the possible {Scope 2} projects {${state.companyName}} can do this year.`,
title: (state) => `These are the possible {Scope 2} projects {${state.companyName}} can do this budget period.`,
isProjectGroupChoice: true,
groups: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/EndGameReport/EndGameReportPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ function getProjectCard(implementedProject: ProjectControl,
<ListItemText
primary={
<Typography sx={{ fontSize: '1.25rem', color: 'black', fontWeight: '500' }}>
Year Net Cost:{' '}
Budget Period Net Cost:{' '}
<Emphasis money>
${projectNetCost.toLocaleString('en-US')}
</Emphasis>
Expand Down
2 changes: 1 addition & 1 deletion src/components/SelectGameSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export function SelectGameSettings(props: SelectGameSettingsProps) {
}
<Box m={2}>
<DialogContentText id='alert-dialog-slide-description' gutterBottom>
You have the option to play through in 1 OR 2-year intervals.
You have the option to play through in 1 OR 2-year intervals, which will be referred to as a Budget Period.
</DialogContentText>
<InputLabel id='selectGameYearInterval'>Please Select the interval size you would like to play through:</InputLabel>
<Select
Expand Down
2 changes: 1 addition & 1 deletion src/components/YearRecap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1098,7 +1098,7 @@ export function getProjectCardWithGauges(implementedProject: ProjectControl,
<ListItemText
primary={
<Typography sx={{ fontSize: '1.25rem', color: 'black', fontWeight: '500' }}>
Year Net Cost:{' '}
Budget Period Net Cost:{' '}
<Emphasis money>
${projectNetCost.toLocaleString('en-US')}
</Emphasis>
Expand Down

0 comments on commit 7a945dc

Please sign in to comment.