Merge pull request #335 from NREL/issue-305

Issue 305: Percent change in KPI table
NREL · Nov 26, 2024 · 1555483 · 1555483
2 parents 496acfa + 84d26c1
commit 1555483
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/app/shared/reports/calculations/keyPerformanceIndicatorReport.ts b/src/app/shared/reports/calculations/keyPerformanceIndicatorReport.ts
@@ -27,16 +27,26 @@ export function getKeyPerfomanceIndicatorReport(nebReports: Array<NebReport>): K
                 }
                 if (kpiReportItems[itemExistIndex].keyPerformanceMetric.baselineCost) {
                     kpiReportItems[itemExistIndex].performanceMetricImpact.percentSavings = (kpiReportItems[itemExistIndex].performanceMetricImpact.costAdjustment / kpiReportItems[itemExistIndex].keyPerformanceMetric.baselineCost) * 100;
+                } else if (kpiReportItems[itemExistIndex].keyPerformanceMetric.baselineValue && kpiReportItems[itemExistIndex].performanceMetricImpact.modificationValue) {
+                    kpiReportItems[itemExistIndex].performanceMetricImpact.percentSavings = (kpiReportItems[itemExistIndex].performanceMetricImpact.modificationValue / kpiReportItems[itemExistIndex].keyPerformanceMetric.baselineValue) * 100;
                 }
             } else {
                 if (performanceMetric.keyPerformanceMetric.isCustom) {
 
                 }
+                let percentSavings: number = 0;
+
+                if (performanceMetric.keyPerformanceMetric.baselineCost) {
+                    percentSavings = (performanceMetric.performanceMetricImpact.costAdjustment / performanceMetric.keyPerformanceMetric.baselineCost) * 100;
+                } else if (performanceMetric.keyPerformanceMetric.baselineValue && performanceMetric.performanceMetricImpact.modificationValue) {
+                    percentSavings = (performanceMetric.performanceMetricImpact.modificationValue / performanceMetric.keyPerformanceMetric.baselineValue) * 100;
+                }
+
                 kpiReportItems.push({
                     keyPerformanceMetric: performanceMetric.keyPerformanceMetric,
                     performanceMetricImpact: {
                         ...performanceMetric.performanceMetricImpact,
-                        percentSavings: (performanceMetric.performanceMetricImpact.costAdjustment / performanceMetric.keyPerformanceMetric.baselineCost) * 100,
+                        percentSavings: percentSavings,
                         modifiedCost: (performanceMetric.keyPerformanceMetric.baselineCost - performanceMetric.performanceMetricImpact.costAdjustment)
                     },
                     // nebsImpacts: [{

diff --git a/src/app/shared/reports/performance-metrics-table/performance-metrics-table.component.html b/src/app/shared/reports/performance-metrics-table/performance-metrics-table.component.html
@@ -65,7 +65,7 @@
     <tfoot>
         <tr>
             <th colspan="2">
-                Totals
+                Cost Totals
             </th>
             <th class="text-right">
                 <app-single-cell-item [numValue]="keyPerformanceIndicatorReport.total.baselineCost"