Merge pull request #7245 from ORNL-AMO/issue-7244

issue 7244 TH PPT bug from PF calc fix
ORNL-AMO · Jan 8, 2025 · 9cfefd6 · 9cfefd6
2 parents a1a35af + 0702cc8
commit 9cfefd6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/...p/treasure-hunt/treasure-hunt-report/treasure-hunt-ppt/treasure-hunt-ppt-table.service.ts b/...p/treasure-hunt/treasure-hunt-report/treasure-hunt-ppt/treasure-hunt-ppt-table.service.ts
@@ -702,6 +702,8 @@ export class TreasureHuntPptTableService {
             } else {
                 utilityUnit = 'GJ';
             }
+        } else if (utilityType == 'Other') {
+            utilityUnit = ' ';
         }
         return utilityUnit;
     }

diff --git a/src/app/treasure-hunt/treasure-hunt-report/treasure-hunt-ppt/treasure-hunt-ppt.service.ts b/src/app/treasure-hunt/treasure-hunt-report/treasure-hunt-ppt/treasure-hunt-ppt.service.ts
@@ -375,17 +375,13 @@ export class TreasureHuntPptService {
               { text: "Payback (Years)", options: { color: "FFFFFF", bold: true, fill: { color: '1D428A' } } }
             ]);
             let utilityUnit: string;
-            opp.annualEnergySavings.forEach(annulEnergy => {
-              let additionalSavings: number = 0;
-              if(opp.opportunitySheet.opportunityCost.additionalAnnualSavings){
-                additionalSavings = opp.opportunitySheet.opportunityCost.additionalAnnualSavings.cost;
-              }
+            opp.annualEnergySavings.forEach(annulEnergy => {              
               utilityUnit = this.treasureHuntPptTableService.getUtilityUnit(annulEnergy.label, settings);
               rows.push([
                 annulEnergy.label,
                 this.treasureHuntPptTableService.roundValToFormatString(annulEnergy.savings),
                 utilityUnit,
-                this.treasureHuntPptTableService.roundValToCurrency(opp.annualCostSavings + additionalSavings),
+                this.treasureHuntPptTableService.roundValToCurrency(opp.annualCostSavings),
                 this.treasureHuntPptTableService.roundValToCurrency(opp.opportunitySheet.opportunityCost.material),
                 this.treasureHuntPptTableService.roundValToCurrency(opp.opportunitySheet.opportunityCost.labor),
                 this.treasureHuntPptTableService.getOtherCost(opp.opportunitySheet.opportunityCost),
@@ -436,16 +432,12 @@ export class TreasureHuntPptService {
         ]);
         let utilityUnit: string;
         opp.annualEnergySavings.forEach(annulEnergy => {
-        let additionalSavings: number = 0;
-            if(opp.opportunitySheet.opportunityCost.additionalAnnualSavings){
-              additionalSavings = opp.opportunitySheet.opportunityCost.additionalAnnualSavings.cost;
-            }
           utilityUnit = this.treasureHuntPptTableService.getUtilityUnit(annulEnergy.label, settings);
           rows.push([
             annulEnergy.label,
             this.treasureHuntPptTableService.roundValToFormatString(annulEnergy.savings),
             utilityUnit,
-            this.treasureHuntPptTableService.roundValToCurrency(opp.annualCostSavings + additionalSavings),
+            this.treasureHuntPptTableService.roundValToCurrency(opp.annualCostSavings),
             this.treasureHuntPptTableService.roundValToCurrency(opp.opportunitySheet.opportunityCost.material),
             this.treasureHuntPptTableService.roundValToCurrency(opp.opportunitySheet.opportunityCost.labor),
             this.treasureHuntPptTableService.getOtherCost(opp.opportunitySheet.opportunityCost),