Merge pull request #6801 from ORNL-AMO/issue-6752

Issue 6752 - let users continue to delete sole energy source in custom opps
ORNL-AMO · May 29, 2024 · f49075b · f49075b
2 parents 100c270 + 50acfd4
commit f49075b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/src/app/treasure-hunt/treasure-hunt-calculator-services/assessment-opportunity.service.ts b/src/app/treasure-hunt/treasure-hunt-calculator-services/assessment-opportunity.service.ts
@@ -45,7 +45,16 @@ export class AssessmentOpportunityService {
     let totalCostSavings: number = 0;
     let baselineElectricityResult: { energyUse: number, energyCost: number, numItems: number };
     let modificationElectricityResult: { energyUse: number, energyCost: number, numItems: number };
-    let electricityResults: AssessmentOpportunityResult;
+    let electricityResults: AssessmentOpportunityResult = {
+      baselineEnergyUse: 0,
+      baselineEnergyCost: 0,
+      baselineItems: 0,
+      modificationEnergyUse: 0,
+      modificationEnergyCost: 0,
+      modificationItems: 0,
+      energySavings: 0,
+      energyCostSavings: 0
+    };
 
     let baselineGasResult: { energyUse: number, energyCost: number, numItems: number };
     let modificationGasResult: { energyUse: number, energyCost: number, numItems: number };

diff --git a/src/app/treasure-hunt/treasure-hunt-report/opportunity-summary.service.ts b/src/app/treasure-hunt/treasure-hunt-report/opportunity-summary.service.ts
@@ -367,11 +367,9 @@ export class OpportunitySummaryService {
         owner: oppSheet.businessUnits,
         opportunityCost: oppSheet.opportunityCost
       }
-
       let treasureHuntOpportunityResults: TreasureHuntOpportunityResults;
       let numEnergyTypes: number = this.getNumberOfEnergyTypes(oppSheetResults);
 
-
       if (oppSheetResults.electricityResults && (oppSheetResults.electricityResults.baselineItems != 0 || oppSheetResults.electricityResults.modificationItems != 0)) {
         energyTypeLabel = 'Electricity';
         totalEnergySavings = totalEnergySavings + oppSheetResults.electricityResults.energySavings;
@@ -432,12 +430,9 @@ export class OpportunitySummaryService {
         treasureHuntOpportunityResults.modificationCost = 0;
         oppSummary = this.getNewOpportunitySummary(opportunityMetaData, treasureHuntOpportunityResults, mixedIndividualSummaries);
       } else {
-        //no energy savings
-        treasureHuntOpportunityResults.utilityType = '';
-        treasureHuntOpportunityResults.costSavings = 0;
-        treasureHuntOpportunityResults.energySavings = 0;
-        treasureHuntOpportunityResults.baselineCost = 0;
-        treasureHuntOpportunityResults.modificationCost = 0;
+        if (!treasureHuntOpportunityResults) {
+          treasureHuntOpportunityResults = this.setResultsFromOppSheet(oppSheetResults.electricityResults, energyTypeLabel);
+        }
         opportunityMetaData.opportunityCost = undefined;
         oppSummary = this.getNewOpportunitySummary(opportunityMetaData, treasureHuntOpportunityResults);
       }
@@ -530,11 +525,9 @@ export class OpportunitySummaryService {
         oppSummary = this.getNewOpportunitySummary(opportunityMetaData, treasureHuntOpportunityResults, mixedIndividualSummaries);
       } else {
         //no energy savings
-        treasureHuntOpportunityResults.utilityType = 'None';
-        treasureHuntOpportunityResults.costSavings = 0;
-        treasureHuntOpportunityResults.energySavings = 0;
-        treasureHuntOpportunityResults.baselineCost = 0;
-        treasureHuntOpportunityResults.modificationCost = 0;
+        if (!treasureHuntOpportunityResults) {
+          treasureHuntOpportunityResults = this.setResultsFromOppSheet(oppSheetResults.electricityResults, energyTypeLabel);
+        }
         opportunityMetaData.opportunityCost = undefined;
         oppSummary = this.getNewOpportunitySummary(opportunityMetaData, treasureHuntOpportunityResults);
       }
@@ -547,7 +540,7 @@ export class OpportunitySummaryService {
         energySavings: 0,
         baselineCost: 0,
         modificationCost: 0,
-        utilityType: '',
+        utilityType: 'None',
       }
 
       treasureHuntOpportunityResults.baselineCost = sheetResults.baselineEnergyCost;

diff --git a/...treasure-hunt-report/report-graphs/effort-savings-chart/effort-savings-chart.component.ts b/...treasure-hunt-report/report-graphs/effort-savings-chart/effort-savings-chart.component.ts
@@ -218,7 +218,7 @@ export class EffortSavingsChartComponent implements OnInit {
 
   buildTrace() {
     this.treasureHuntResults.opportunitySummaries.forEach((summary, index) => {
-      if (summary.opportunityCost.implementationEffort) {
+      if (summary.opportunityCost && summary.opportunityCost.implementationEffort) {
         let currentColor = graphColors[index % graphColors.length];
         let trace: TraceData = {
           x: [summary.payback],