Merge pull request #2285 from ORNL-AMO/issue-2126

Issue 2126 - bulk analysis baseline year bug resolved

Author: rmroot

src/app/data-evaluation/account/account-analysis/account-analysis-setup/account-analysis-setup.component.ts

@@ -193,6 +193,18 @@ export class AccountAnalysisSetupComponent implements OnInit {
       this.dbChangesService.selectFacility(facility);
       let newIdbItem: IdbAnalysisItem = getNewIdbAnalysisItem(this.account, facility, accountMeterGroups, accountPredictors, this.analysisItem.analysisCategory);
       newIdbItem.energyIsSource = this.analysisItem.energyIsSource;
+      let facilityBaselineYear: number;
+      if (this.analysisItem.analysisCategory == 'energy') {
+        facilityBaselineYear = facility.sustainabilityQuestions.energyReductionBaselineYear;
+      }
+      else if (this.analysisItem.analysisCategory == 'water') {
+        facilityBaselineYear = facility.sustainabilityQuestions.waterReductionBaselineYear;
+      }
+      if (facility.isNewFacility && (facilityBaselineYear > this.analysisItem.baselineYear)) {
+        newIdbItem.baselineYear = facilityBaselineYear;
+      } else {
+        newIdbItem.baselineYear = this.analysisItem.baselineYear;
+      }
       newIdbItem.reportYear = this.analysisItem.reportYear;
       if (this.analysisItem.name != '') {
         newIdbItem.name = this.analysisItem.name;