diff --git a/src/app/compressed-air-assessment/compressed-air-report/executive-summary/executive-summary.component.html b/src/app/compressed-air-assessment/compressed-air-report/executive-summary/executive-summary.component.html index f1e34f6d85..4ae7666178 100644 --- a/src/app/compressed-air-assessment/compressed-air-report/executive-summary/executive-summary.component.html +++ b/src/app/compressed-air-assessment/compressed-air-report/executive-summary/executive-summary.component.html @@ -219,8 +219,8 @@

Assessment Executive Summary

Annual Emission Output Rate - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) {{baselineResults.total.annualEmissionOutput | number:'1.0-0'}} @@ -264,8 +264,8 @@

Assessment Executive Summary

Annual Emission Savings - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) — — {{dayTypeBaselineResult.annualEmissionOutput | number:'1.0-0'}} - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2)
{{dayTypeModificationResult.annualEmissionOutput | number:'1.0-0'}} - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2)
@@ -228,8 +228,8 @@
{{dayTypeModificationResult.allSavingsResults.savings.annualEmissionOutputSavings | number:'1.0-0'}} - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2)
diff --git a/src/app/examples/mockCompressedAirAssessment.ts b/src/app/examples/mockCompressedAirAssessment.ts index 1ca9ac0ef6..0e98a175c3 100644 --- a/src/app/examples/mockCompressedAirAssessment.ts +++ b/src/app/examples/mockCompressedAirAssessment.ts @@ -17360,6 +17360,7 @@ export const MockCompressedAirAssessmentSettings: Settings = { "language": "English", "currency": "$", "unitsOfMeasure": "Imperial", + "emissionsUnit": "Metric", "distanceMeasurement": "ft", "flowMeasurement": "gpm", "powerMeasurement": "hp", diff --git a/src/app/examples/mockFsat.ts b/src/app/examples/mockFsat.ts index dfa683360a..289476c116 100644 --- a/src/app/examples/mockFsat.ts +++ b/src/app/examples/mockFsat.ts @@ -226,6 +226,7 @@ export const MockFsatSettings: Settings = { language: "English", currency: "$", unitsOfMeasure: "Imperial", + emissionsUnit: "Metric", distanceMeasurement: "ft", flowMeasurement: "gpm", powerMeasurement: "hp", diff --git a/src/app/examples/mockPhast.ts b/src/app/examples/mockPhast.ts index 8f1faf290d..fc87929320 100644 --- a/src/app/examples/mockPhast.ts +++ b/src/app/examples/mockPhast.ts @@ -1302,6 +1302,7 @@ export const MockPhastSettings: Settings = { co2SavingsEnergySource: "Natural Gas", co2SavingsFuelType: "Natural Gas", totalEmissionOutputRate: 401.07, + emissionsUnit: 'Metric', totalFuelEmissionOutputRate: 0, totalNaturalGasEmissionOutputRate: 53.06, totalCoalEmissionOutputRate: 0, diff --git a/src/app/examples/mockPsat.ts b/src/app/examples/mockPsat.ts index f8c7a25e58..3052755388 100644 --- a/src/app/examples/mockPsat.ts +++ b/src/app/examples/mockPsat.ts @@ -175,6 +175,7 @@ export const MockPsatSettings: Settings = { "language": "English", "currency": "$", "unitsOfMeasure": "Imperial", + "emissionsUnit": "Metric", "distanceMeasurement": "ft", "flowMeasurement": "gpm", "powerMeasurement": "hp", diff --git a/src/app/examples/mockSsmt.ts b/src/app/examples/mockSsmt.ts index 5c77be4017..f9aec484f9 100644 --- a/src/app/examples/mockSsmt.ts +++ b/src/app/examples/mockSsmt.ts @@ -450,6 +450,7 @@ export const MockSsmtSettings: Settings = { "language": "English", "currency": "$", "unitsOfMeasure": "Imperial", + "emissionsUnit": "Metric", "distanceMeasurement": "ft", "flowMeasurement": "gpm", "powerMeasurement": "hp", diff --git a/src/app/examples/mockTreasureHunt.ts b/src/app/examples/mockTreasureHunt.ts index a8fcea959e..3dadedd1a3 100644 --- a/src/app/examples/mockTreasureHunt.ts +++ b/src/app/examples/mockTreasureHunt.ts @@ -1394,6 +1394,7 @@ export const MockTreasureHuntSettings: Settings = { "language": "English", "currency": "$", "unitsOfMeasure": "Imperial", + "emissionsUnit": "Metric", "distanceMeasurement": "ft", "flowMeasurement": "gpm", "powerMeasurement": "hp", diff --git a/src/app/examples/mockWasteWater.ts b/src/app/examples/mockWasteWater.ts index ce4f023fdb..8ae7fee469 100644 --- a/src/app/examples/mockWasteWater.ts +++ b/src/app/examples/mockWasteWater.ts @@ -141,6 +141,7 @@ export const MockWasteWaterSettings: Settings = { "language": "English", "currency": "$", "unitsOfMeasure": "Imperial", + "emissionsUnit": "Metric", "distanceMeasurement": "ft", "flowMeasurement": "MGD", "powerMeasurement": "hp", diff --git a/src/app/fsat/fsat-report/results-summary/results-summary.component.html b/src/app/fsat/fsat-report/results-summary/results-summary.component.html index b103c2f8db..ac5a3c3b67 100644 --- a/src/app/fsat/fsat-report/results-summary/results-summary.component.html +++ b/src/app/fsat/fsat-report/results-summary/results-summary.component.html @@ -139,8 +139,8 @@

Report Results

Annual CO2 Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) {{fsat.outputs.co2EmissionsOutput | number:'1.1-1'}} @@ -153,8 +153,8 @@

Report Results

Annual CO2 Emissions Savings - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) —
Annual CO2 Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2)
@@ -242,8 +242,8 @@
Annual CO2 Emissions Savings - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2)
diff --git a/src/app/fsat/fsat-results/fsat-results-panel/fsat-results-panel.component.ts b/src/app/fsat/fsat-results/fsat-results-panel/fsat-results-panel.component.ts index dba316e38a..e30e184007 100644 --- a/src/app/fsat/fsat-results/fsat-results-panel/fsat-results-panel.component.ts +++ b/src/app/fsat/fsat-results/fsat-results-panel/fsat-results-panel.component.ts @@ -36,6 +36,7 @@ export class FsatResultsPanelComponent implements OnInit { constructor(private fsatService: FsatService) { } ngOnInit() { + console.log('settings', this.settings); this.updateDataSub = this.fsatService.updateData.subscribe(() => { this.getResults(); }); if (this.fsat.modifications && this.fsat.modifications.length > 0) { this.isWhatIfScenario = this.fsat.modifications[this.modificationIndex].fsat.whatIfScenario; diff --git a/src/app/motor-inventory/motor-inventory-summary/inventory-summary-overview/inventory-overview-table/inventory-overview-table.component.html b/src/app/motor-inventory/motor-inventory-summary/inventory-summary-overview/inventory-overview-table/inventory-overview-table.component.html index 10ff624443..51ccef507e 100644 --- a/src/app/motor-inventory/motor-inventory-summary/inventory-summary-overview/inventory-overview-table/inventory-overview-table.component.html +++ b/src/app/motor-inventory/motor-inventory-summary/inventory-summary-overview/inventory-overview-table/inventory-overview-table.component.html @@ -53,8 +53,8 @@ — - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) @@ -89,8 +89,8 @@ — - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) diff --git a/src/app/phast/losses/operations/co2-savings-phast/co2-savings-phast.service.ts b/src/app/phast/losses/operations/co2-savings-phast/co2-savings-phast.service.ts index ff1c42413c..73555709b5 100644 --- a/src/app/phast/losses/operations/co2-savings-phast/co2-savings-phast.service.ts +++ b/src/app/phast/losses/operations/co2-savings-phast/co2-savings-phast.service.ts @@ -265,7 +265,7 @@ export class Co2SavingsPhastService { co2EmissionsOutput.totalEmissionOutput = co2EmissionsOutput.hourlyTotalEmissionOutput * phastCopy.operatingHours.hoursPerYear; } - if (settings.unitsOfMeasure !== 'Metric') { + if (settings.emissionsUnit !== 'Metric') { co2EmissionsOutput.hourlyTotalEmissionOutput = co2EmissionsOutput.hourlyTotalEmissionOutput !== undefined? this.convertUnitsService.value(co2EmissionsOutput.hourlyTotalEmissionOutput).from('tonne').to('ton') : undefined; co2EmissionsOutput.emissionsSavings = co2EmissionsOutput.emissionsSavings !== undefined? this.convertUnitsService.value(co2EmissionsOutput.emissionsSavings).from('tonne').to('ton') : undefined; co2EmissionsOutput.totalEmissionOutput = co2EmissionsOutput.totalEmissionOutput !== undefined? this.convertUnitsService.value(co2EmissionsOutput.totalEmissionOutput).from('tonne').to('ton') : undefined; diff --git a/src/app/phast/phast-report/executive-summary/executive-summary.component.html b/src/app/phast/phast-report/executive-summary/executive-summary.component.html index f6054f7f7c..39e129025e 100644 --- a/src/app/phast/phast-report/executive-summary/executive-summary.component.html +++ b/src/app/phast/phast-report/executive-summary/executive-summary.component.html @@ -55,8 +55,8 @@

Assessment Executive Summary

Total CO2 Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) {{baselineSummary.co2EmissionsOutput.totalEmissionOutput | number:'1.0-2'}} @@ -68,8 +68,8 @@

Assessment Executive Summary

CO2 Emissions Savings - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) — — @@ -338,8 +338,8 @@

Assessment Executive Summary

Electrical CO2 Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) {{baselinePhastResults.co2EmissionsOutput.electricityEmissionOutput | number:'1.0-2'}} @@ -354,12 +354,12 @@

Assessment Executive Summary

Natural Gas CO2 Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) Fuel CO2 Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) {{baselinePhastResults.co2EmissionsOutput.fuelEmissionOutput | number:'1.0-2'}} @@ -375,8 +375,8 @@

Assessment Executive Summary

Coal Carbon CO2 Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) {{baselinePhastResults.co2EmissionsOutput.coalCarbonEmissionsOutput | number:'1.0-2'}} @@ -392,8 +392,8 @@

Assessment Executive Summary

Electrode CO2 Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) {{baselinePhastResults.co2EmissionsOutput.electrodeEmissionsOutput | number:'1.0-2'}} @@ -408,8 +408,8 @@

Assessment Executive Summary

Other Fuel CO2 Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) {{baselinePhastResults.co2EmissionsOutput.otherFuelEmissionsOutput diff --git a/src/app/phast/phast-report/results-data/results-data.component.html b/src/app/phast/phast-report/results-data/results-data.component.html index 3c062a8bb1..1f1a8a4d18 100644 --- a/src/app/phast/phast-report/results-data/results-data.component.html +++ b/src/app/phast/phast-report/results-data/results-data.component.html @@ -405,8 +405,8 @@

Results Data

CO2 Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) @@ -423,8 +423,8 @@

Results Data

CO2 Emissions Savings - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) — —
Annual CO2 Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2)
@@ -198,8 +198,8 @@
Annual CO2 Emissions Savings - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2)
diff --git a/src/app/psat/psat-report/output-summary/output-summary.component.html b/src/app/psat/psat-report/output-summary/output-summary.component.html index ec70c3f36c..9a0d90e9c8 100644 --- a/src/app/psat/psat-report/output-summary/output-summary.component.html +++ b/src/app/psat/psat-report/output-summary/output-summary.component.html @@ -146,8 +146,8 @@

Report Results

Annual CO2 Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) {{psat.outputs.co2EmissionsOutput | number:'1.1-1'}} @@ -160,8 +160,8 @@

Report Results

Annual CO2 Emissions Savings - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) — — - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) @@ -89,8 +89,8 @@ — - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) diff --git a/src/app/report-rollup/report-rollup.service.ts b/src/app/report-rollup/report-rollup.service.ts index eebcc0c790..8f36d898bd 100644 --- a/src/app/report-rollup/report-rollup.service.ts +++ b/src/app/report-rollup/report-rollup.service.ts @@ -175,7 +175,7 @@ export class ReportRollupService { getCarbonEmissionsUnit(settings: Settings): string { let carbonEmissionsUnit = 'tonne CO2'; - if (settings.unitsOfMeasure !== 'Metric') { + if (settings.emissionsUnit !== 'Metric') { carbonEmissionsUnit = 'ton CO2'; } return carbonEmissionsUnit diff --git a/src/app/settings/assessment-settings/assessment-settings.component.html b/src/app/settings/assessment-settings/assessment-settings.component.html index 2f7bb0482b..0b0d139628 100644 --- a/src/app/settings/assessment-settings/assessment-settings.component.html +++ b/src/app/settings/assessment-settings/assessment-settings.component.html @@ -34,9 +34,31 @@ +

These will be default settings for any new assessments and folders.

- + +
+
+ +
+
+
+ +
+
+ +
+
+
+
+
+ +
diff --git a/src/app/settings/co2-savings-settings/co2-savings-settings.component.ts b/src/app/settings/co2-savings-settings/co2-savings-settings.component.ts index c613f6383e..e059fb0ceb 100644 --- a/src/app/settings/co2-savings-settings/co2-savings-settings.component.ts +++ b/src/app/settings/co2-savings-settings/co2-savings-settings.component.ts @@ -13,8 +13,6 @@ export class Co2SavingsSettingsComponent implements OnInit { settingsForm: UntypedFormGroup; @Output('startSavePolling') startSavePolling = new EventEmitter(); - @Input() - generalSettings: boolean; co2SavingsData: Co2SavingsData; diff --git a/src/app/settings/settings.service.ts b/src/app/settings/settings.service.ts index d7e9c1c13a..fd71725faa 100644 --- a/src/app/settings/settings.service.ts +++ b/src/app/settings/settings.service.ts @@ -15,42 +15,6 @@ export class SettingsService { } - // getSettingsForm(): FormGroup { - // return this.formBuilder.group({ - // 'language': ['', Validators.required], - // 'currency': ['', Validators.required], - // 'unitsOfMeasure': ['', Validators.required], - // 'distanceMeasurement': [''], - // 'flowMeasurement': [''], - // 'powerMeasurement': [''], - // 'pressureMeasurement': [''], - // 'steamPressureMeasurement': [''], - // 'steamTemperatureMeasurement': [''], - // 'steamSpecificEnthalpyMeasurement': [''], - // 'steamSpecificEntropyMeasurement': [''], - // 'steamSpecificVolumeMeasurement': [''], - // 'steamPowerMeasurement': [''], - // 'steamMassFlowMeasurement': [''], - // 'steamVolumeMeasurement': [''], - // 'steamVolumeFlowMeasurement': [''], - // 'steamVacuumPressure': [''], - // 'currentMeasurement': [''], - // 'viscosityMeasurement': [''], - // 'voltageMeasurement': [''], - // 'energySourceType': [''], - // 'furnaceType': [''], - // 'energyResultUnit': [''], - // 'customFurnaceName': [''], - // 'temperatureMeasurement': [''], - // 'phastRollupUnit': [''], - // 'defaultPanelTab': [''], - // 'fuelCost': [3.99], - // 'steamCost': [4.69], - // 'electricityCost': [.066], - // 'densityMeasurement': [''] - // }); - // } - setPumpSettingsUnitType(settings: Settings): Settings { let hasImperialUnits: boolean = this.checkHasPumpMatchingUnitTypes(settings, PumpImperialDefaults); let hasMetricUnits: boolean = this.checkHasPumpMatchingUnitTypes(settings, PumpMetricDefaults); @@ -168,6 +132,7 @@ export class SettingsService { 'co2SavingsEnergyType': settings.co2SavingsEnergyType || 'electricity', 'co2SavingsEnergySource': settings.co2SavingsEnergySource || 'Natural Gas', 'co2SavingsFuelType': settings.co2SavingsFuelType || 'Natural Gas', + 'emissionsUnit': settings.emissionsUnit || 'Metric', 'totalEmissionOutputRate': settings.totalEmissionOutputRate || 401.07, 'electricityUse': settings.electricityUse || 0, 'eGridRegion': settings.eGridRegion || '', @@ -275,6 +240,7 @@ export class SettingsService { co2SavingsEnergySource: form.controls.co2SavingsEnergySource.value, co2SavingsFuelType: form.controls.co2SavingsFuelType.value, totalEmissionOutputRate: form.controls.totalEmissionOutputRate.value, + emissionsUnit: form.controls.emissionsUnit.value, totalFuelEmissionOutputRate: form.controls.totalFuelEmissionOutputRate.value, electricityUse: form.controls.electricityUse.value, eGridRegion: form.controls.eGridRegion.value, @@ -380,6 +346,7 @@ export class SettingsService { co2SavingsEnergySource: settings.co2SavingsEnergySource, co2SavingsFuelType: settings.co2SavingsFuelType, totalEmissionOutputRate: settings.totalEmissionOutputRate, + emissionsUnit: settings.emissionsUnit, totalFuelEmissionOutputRate: settings.totalFuelEmissionOutputRate, electricityUse: settings.electricityUse, eGridRegion: settings.eGridRegion, @@ -454,6 +421,8 @@ export class SettingsService { co2SavingsEnergySource: "Natural Gas", co2SavingsFuelType: "Natural Gas", totalEmissionOutputRate: 401.07, + // emissionsUnit should always default to Metric + emissionsUnit: 'Metric', totalNaturalGasEmissionOutputRate: 53.06, totalCoalEmissionOutputRate: 0, totalOtherEmissionOutputRate: 0, @@ -508,6 +477,7 @@ export class SettingsService { co2SavingsFuelType: "Natural Gas", totalEmissionOutputRate: 401.07, totalNaturalGasEmissionOutputRate: 53.06, + emissionsUnit: 'Metric', totalCoalEmissionOutputRate: 0, totalOtherEmissionOutputRate: 0, coalFuelType: 'Mixed - Industrial Sector', diff --git a/src/app/shared/assessment-co2-savings/assessment-co2-savings.service.ts b/src/app/shared/assessment-co2-savings/assessment-co2-savings.service.ts index 9180623489..fd111074f5 100644 --- a/src/app/shared/assessment-co2-savings/assessment-co2-savings.service.ts +++ b/src/app/shared/assessment-co2-savings/assessment-co2-savings.service.ts @@ -137,7 +137,7 @@ export class AssessmentCo2SavingsService { totalEmissionsOutput = 0; } - if (settings.unitsOfMeasure !== 'Metric') { + if (settings.emissionsUnit !== 'Metric') { totalEmissionsOutput = this.convertUnitsService.value(totalEmissionsOutput).from('tonne').to('ton'); } diff --git a/src/app/shared/models/settings.ts b/src/app/shared/models/settings.ts index b80cc49555..3816f657f8 100644 --- a/src/app/shared/models/settings.ts +++ b/src/app/shared/models/settings.ts @@ -97,6 +97,7 @@ export interface Settings { co2SavingsEnergySource?: string, co2SavingsFuelType?: string, totalEmissionOutputRate?: number, + emissionsUnit?: 'Metric' | 'Imperial', electricityUse?: number, eGridRegion?: string, eGridSubregion?: string, diff --git a/src/app/ssmt/ssmt-report/energy-summary/energy-summary.component.html b/src/app/ssmt/ssmt-report/energy-summary/energy-summary.component.html index 2137e6a4bc..c2254cb381 100644 --- a/src/app/ssmt/ssmt-report/energy-summary/energy-summary.component.html +++ b/src/app/ssmt/ssmt-report/energy-summary/energy-summary.component.html @@ -94,8 +94,8 @@

Energy Summary

CO2 Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) Energy Summary CO2 Emissions Savings - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) Energy Summary CO2 Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2)
Annual Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2)
@@ -355,8 +355,8 @@
Annual Emissions Savings - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2)
diff --git a/src/app/ssmt/ssmt.service.ts b/src/app/ssmt/ssmt.service.ts index 02b64ec8cd..c8296154cf 100644 --- a/src/app/ssmt/ssmt.service.ts +++ b/src/app/ssmt/ssmt.service.ts @@ -136,7 +136,7 @@ export class SsmtService { ssmtInputCopy.co2SavingsData.electricityUse = fuelUse; ssmtOutput.co2EmissionsOutput.fuelEmissionOutput = this.assessmentCo2SavingsService.getCo2EmissionsResult(ssmtInputCopy.co2SavingsData, settings, true); - if (settings.unitsOfMeasure !== 'Metric') { + if (settings.emissionsUnit !== 'Metric') { ssmtOutput.co2EmissionsOutput.electricityEmissionsFromChange = this.convertUnitsService.value(ssmtOutput.co2EmissionsOutput.electricityEmissionsFromChange).from('tonne').to('ton'); ssmtOutput.co2EmissionsOutput.electricityEmissionsFromSelling = this.convertUnitsService.value(ssmtOutput.co2EmissionsOutput.electricityEmissionsFromSelling).from('tonne').to('ton'); } diff --git a/src/app/treasure-hunt/treasure-chest/summary-card/summary-card.component.html b/src/app/treasure-hunt/treasure-chest/summary-card/summary-card.component.html index dcd577a1fa..d8aa80423b 100644 --- a/src/app/treasure-hunt/treasure-chest/summary-card/summary-card.component.html +++ b/src/app/treasure-hunt/treasure-chest/summary-card/summary-card.component.html @@ -36,8 +36,8 @@
diff --git a/src/app/treasure-hunt/treasure-hunt-report/executive-summary/carbon-emissions-summary-pie-chart/carbon-emissions-summary-pie-chart.component.ts b/src/app/treasure-hunt/treasure-hunt-report/executive-summary/carbon-emissions-summary-pie-chart/carbon-emissions-summary-pie-chart.component.ts index 584082b084..07b72fba8a 100644 --- a/src/app/treasure-hunt/treasure-hunt-report/executive-summary/carbon-emissions-summary-pie-chart/carbon-emissions-summary-pie-chart.component.ts +++ b/src/app/treasure-hunt/treasure-hunt-report/executive-summary/carbon-emissions-summary-pie-chart/carbon-emissions-summary-pie-chart.component.ts @@ -99,7 +99,7 @@ export class CarbonEmissionsSummaryPieChartComponent implements OnInit { }]; let emissionsUnits: string = 'tonne CO2'; - if (this.settings.unitsOfMeasure !== 'Metric') { + if (this.settings.emissionsUnit !== 'Metric') { emissionsUnits = 'ton CO2'; } var layout = { diff --git a/src/app/treasure-hunt/treasure-hunt-report/executive-summary/carbon-emissions-summary-table/carbon-emissions-summary-table.component.html b/src/app/treasure-hunt/treasure-hunt-report/executive-summary/carbon-emissions-summary-table/carbon-emissions-summary-table.component.html index a43cdf18f0..ca5f3fec1f 100644 --- a/src/app/treasure-hunt/treasure-hunt-report/executive-summary/carbon-emissions-summary-table/carbon-emissions-summary-table.component.html +++ b/src/app/treasure-hunt/treasure-hunt-report/executive-summary/carbon-emissions-summary-table/carbon-emissions-summary-table.component.html @@ -7,18 +7,18 @@ Current CO2 Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) Projected CO2 Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) CO2 Emission Savings - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) diff --git a/src/app/treasure-hunt/treasure-hunt-report/report-graphs/report-graphs.component.html b/src/app/treasure-hunt/treasure-hunt-report/report-graphs/report-graphs.component.html index b73c49ff70..45b07dc112 100644 --- a/src/app/treasure-hunt/treasure-hunt-report/report-graphs/report-graphs.component.html +++ b/src/app/treasure-hunt/treasure-hunt-report/report-graphs/report-graphs.component.html @@ -47,8 +47,8 @@
@@ -56,8 +56,8 @@
@@ -93,8 +93,8 @@ [ngClass]="{'col-lg-3 col-12': !showPrint, 'col-4': showPrint}" *ngFor="let savingsItem of carbonSavingsItems">
diff --git a/src/app/treasure-hunt/treasure-hunt-report/treasure-hunt-report.service.ts b/src/app/treasure-hunt/treasure-hunt-report/treasure-hunt-report.service.ts index 09a1e713ce..277778329b 100644 --- a/src/app/treasure-hunt/treasure-hunt-report/treasure-hunt-report.service.ts +++ b/src/app/treasure-hunt/treasure-hunt-report/treasure-hunt-report.service.ts @@ -363,7 +363,7 @@ export class TreasureHuntReportService { if (outputRate && electricityUsed) { totalEmissionsResult = (outputRate) * (electricityUsed / 1000); - if (settings.unitsOfMeasure !== 'Metric') { + if (settings.emissionsUnit !== 'Metric') { totalEmissionsResult = this.convertUnitsService.value(totalEmissionsResult).from('tonne').to('ton'); } } diff --git a/src/app/waste-water/results-panel/results-table/results-table.component.html b/src/app/waste-water/results-panel/results-table/results-table.component.html index b7e1e68f35..2fd1c9f099 100644 --- a/src/app/waste-water/results-panel/results-table/results-table.component.html +++ b/src/app/waste-water/results-panel/results-table/results-table.component.html @@ -358,8 +358,8 @@
Annual CO2 - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2)
Annual CO2 Savings - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2)
-
- — -
{{modificationResults.co2EmissionsSavings | number: '1.0-0'}} diff --git a/src/app/waste-water/waste-water-report/result-data/result-data.component.html b/src/app/waste-water/waste-water-report/result-data/result-data.component.html index 596c4df92b..d46e7ad946 100644 --- a/src/app/waste-water/waste-water-report/result-data/result-data.component.html +++ b/src/app/waste-water/waste-water-report/result-data/result-data.component.html @@ -301,8 +301,8 @@

Report Results

Annual CO2 Emissions - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) {{wasteWater.baselineData.outputs.co2EmissionsOutput | number:'1.0-0'}} @@ -312,8 +312,8 @@

Report Results

Annual CO2 Emissions Savings - (ton CO2) - (tonne CO2) + (ton CO2) + (tonne CO2) —