Merge pull request #2274 from ORNL-AMO/issue-2263-other-impacts

fixup: updated help text and template

Author: rmroot

src/app/data-evaluation/facility/facility-reports/facility-report-setup/facility-overview-report-setup/facility-overview-report-setup.component.html

@@ -28,7 +28,8 @@ export class FacilityOverviewReportSetupComponent {
   months: Array<Month> = Months;
   errorMessage: string;
   errorMessageSub: Subscription;
-
+  account: IdbAccount;
+  accountSub: Subscription;
   constructor(private facilityReportsDbService: FacilityReportsDbService,
     private accountDbService: AccountdbService,
     private facilityDbService: FacilitydbService,
@@ -40,6 +41,9 @@ export class FacilityOverviewReportSetupComponent {
   }
 
   ngOnInit() {
+    this.accountSub = this.accountDbService.selectedAccount.subscribe(account => {
+      this.account = account;
+    });
     this.facilityReportSub = this.facilityReportsDbService.selectedReport.subscribe(report => {
       if (this.isFormChange == false) {
         this.facilityReport = report;
@@ -58,16 +62,16 @@ export class FacilityOverviewReportSetupComponent {
   ngOnDestroy() {
     this.facilityReportSub.unsubscribe();
     this.errorMessageSub.unsubscribe();
+    this.accountSub.unsubscribe();
   }
 
   async save() {
     this.isFormChange = true;
     let facilityReport: IdbFacilityReport = this.facilityReportsDbService.selectedReport.getValue();
     this.facilityReport.dataOverviewReportSettings = this.reportSettings;
     this.facilityReport = await firstValueFrom(this.facilityReportsDbService.updateWithObservable(facilityReport));
-    let selectedAccount: IdbAccount = this.accountDbService.selectedAccount.getValue();
     let selectedFacility: IdbFacility = this.facilityDbService.selectedFacility.getValue();
-    await this.dbChangesService.setAccountFacilityReports(selectedAccount, selectedFacility);
+    await this.dbChangesService.setAccountFacilityReports(this.account, selectedFacility);
     this.facilityReportsDbService.selectedReport.next(facilityReport);
   }
 

src/app/data-evaluation/facility/facility-reports/facility-report-setup/facility-overview-report-setup/facility-overview-report-setup.component.ts

@@ -13,7 +13,7 @@ <h4>Account Overview</h4>
 <hr>
 <p>
     The first section of the overview provides a map of the facilities is provided based on their zip code. The size on
-    the graph is based on their relative consumption, cost, or emissions.
+    the graph is based on their relative consumption or cost.
 </p>
 <p>
     Next is a breakdown of the data by facility. The graph colors are representative of the facility color set in the

src/app/data-evaluation/help-panel/account-help/account-overview-help/account-overview-help.component.html

@@ -9,10 +9,9 @@ import { IdbUtilityMeterGroup } from '../models/idbModels/utilityMeterGroup';
 import { IdbAccountReport } from '../models/idbModels/accountReport';
 import { IdbAnalysisItem } from '../models/idbModels/analysisItem';
 import { IdbAccountAnalysisItem } from '../models/idbModels/accountAnalysisItem';
-import { IdbFacilityReport } from '../models/idbModels/facilityReport';
 import { IdbUtilityMeterData } from '../models/idbModels/utilityMeterData';
 import { getGUID } from '../shared/sharedHelperFunctions';
-import { ChargeCostUnit, MeterChargeType } from '../shared/shared-meter-content/edit-meter-form/meter-charges-form/meterChargesOptions';
+import { MeterChargeType } from '../shared/shared-meter-content/edit-meter-form/meter-charges-form/meterChargesOptions';
 import { IdbCustomGWP } from '../models/idbModels/customGWP';
 
 @Injectable({
@@ -47,8 +46,12 @@ export class UpdateDbEntryService {
     //default to displaying emissions if not defined. 
     // This was added in 2026 and we want legacy accounts to display emissions by default
     // unless they had it explicitly set to false.
-    if(account.displayEmissions == undefined){
-      account.displayEmissions = true;
+    if (account.displayEmissions == undefined) {
+      if (account.name != 'Cocoa Co. Example') {
+        account.displayEmissions = true;
+      }else{
+        account.displayEmissions = false;
+      }
       isChanged = true;
     }
 
@@ -142,19 +145,19 @@ export class UpdateDbEntryService {
           group.maxModelVariables = 4;
           isChanged = true;
         }
-        if(group.analysisType == 'regression' && !group.userDefinedModel && group.regressionModelStartMonth == undefined){
+        if (group.analysisType == 'regression' && !group.userDefinedModel && group.regressionModelStartMonth == undefined) {
           group.regressionModelStartMonth = 0;
           isChanged = true;
         }
-        if(group.analysisType == 'regression' && !group.userDefinedModel && group.regressionStartYear == undefined){
+        if (group.analysisType == 'regression' && !group.userDefinedModel && group.regressionStartYear == undefined) {
           group.regressionStartYear = analysisItem.baselineYear;
           isChanged = true;
         }
-        if(group.analysisType == 'regression' && !group.userDefinedModel && group.regressionModelEndMonth == undefined){
+        if (group.analysisType == 'regression' && !group.userDefinedModel && group.regressionModelEndMonth == undefined) {
           group.regressionModelEndMonth = 11;
           isChanged = true;
         }
-        if(group.analysisType == 'regression' && !group.userDefinedModel && group.regressionEndYear == undefined){
+        if (group.analysisType == 'regression' && !group.userDefinedModel && group.regressionEndYear == undefined) {
           group.regressionEndYear = analysisItem.baselineYear;
           isChanged = true;
         }
@@ -396,7 +399,7 @@ export class UpdateDbEntryService {
 
   updateCustomGWP(customGWP: IdbCustomGWP): { customGWP: IdbCustomGWP, isChanged: boolean } {
     let isChanged: boolean = false;
-    if(customGWP.gwp_ar4 == undefined && customGWP['gwp'] != undefined){
+    if (customGWP.gwp_ar4 == undefined && customGWP['gwp'] != undefined) {
       customGWP.gwp_ar4 = customGWP['gwp'];
       customGWP.gwp_ar5 = customGWP['gwp'];
       customGWP.gwp_ar6 = customGWP['gwp'];

src/app/indexedDB/update-db-entry.service.ts

@@ -113,7 +113,7 @@ export function getDataOverviewReportSettings(groups: Array<IdbUtilityMeterGroup
         emissionsDisplay: 'market',
         includeEnergySection: true,
         includeCostsSection: true,
-        includeEmissionsSection: true,
+        includeEmissionsSection: false,
         includeWaterSection: true,
         includeAllMeterData: true,
         startYear: undefined,