From d1e1b6c7bca4495f3c0f388d62db6b78c755eba3 Mon Sep 17 00:00:00 2001
From: rmroot <rootrm@ornl.gov>
Date: Wed, 9 Oct 2024 10:37:58 -0500
Subject: [PATCH 1/2] fix html labels in reports

---
 .../performance-metrics-chart.component.ts    |  4 +--
 .../performance-metrics-report.component.html | 28 +++++++++----------
 .../single-cell-item.component.html           |  4 +--
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/app/shared/reports/assessment-report/performance-metrics-chart/performance-metrics-chart.component.ts b/src/app/shared/reports/assessment-report/performance-metrics-chart/performance-metrics-chart.component.ts
index 8f2b9ecd..e7d429a9 100644
--- a/src/app/shared/reports/assessment-report/performance-metrics-chart/performance-metrics-chart.component.ts
+++ b/src/app/shared/reports/assessment-report/performance-metrics-chart/performance-metrics-chart.component.ts
@@ -31,7 +31,7 @@ export class PerformanceMetricsChartComponent {
 
     var trace1 = {
       x: kpiReportItems.map(kpiReport => {
-        return kpiReport.keyPerformanceMetric.htmlLabel
+        return kpiReport.keyPerformanceMetric.label
       }),
       y: kpiReportItems.map(kpiReportItem => {
         return kpiReportItem.keyPerformanceMetric.baselineCost - kpiReportItem.performanceMetricImpact.costAdjustment
@@ -42,7 +42,7 @@ export class PerformanceMetricsChartComponent {
 
     var trace2 = {
       x: kpiReportItems.map(kpiReport => {
-        return kpiReport.keyPerformanceMetric.htmlLabel
+        return kpiReport.keyPerformanceMetric.label
       }),
       y: kpiReportItems.map(kpiReportItem => {
         return kpiReportItem.performanceMetricImpact.costAdjustment
diff --git a/src/app/shared/reports/assessment-report/performance-metrics-report/performance-metrics-report.component.html b/src/app/shared/reports/assessment-report/performance-metrics-report/performance-metrics-report.component.html
index 180d4ca2..209cf563 100644
--- a/src/app/shared/reports/assessment-report/performance-metrics-report/performance-metrics-report.component.html
+++ b/src/app/shared/reports/assessment-report/performance-metrics-report/performance-metrics-report.component.html
@@ -24,7 +24,8 @@
     <tbody>
         <tr *ngFor="let kpiReportItem of keyPerformanceIndicatorReport.kpiReportItems">
             <td class="">
-                {{kpiReportItem.keyPerformanceMetric.kpiValue | kpiValueDisplay: keyPerformanceIndicators}}
+                <span
+                    [innerHTML]="kpiReportItem.keyPerformanceMetric.kpiValue | kpiValueDisplay: keyPerformanceIndicators"></span>
             </td>
             <td class="">
                 <span [innerHTML]="kpiReportItem.keyPerformanceMetric.htmlLabel"></span>
@@ -45,8 +46,7 @@
                         [isCurrency]="true"></app-single-cell-item>
                 </td>
                 <td class="text-right">
-                    <app-single-cell-item
-                        [numValue]="kpiReportItem.performanceMetricImpact.percentSavings"
+                    <app-single-cell-item [numValue]="kpiReportItem.performanceMetricImpact.percentSavings"
                         [isCurrency]="false" [units]="'%'"></app-single-cell-item>
                 </td>
             </ng-template>
@@ -62,24 +62,22 @@
             <th colspan="2">
                 Totals
             </th>
-            <td class="text-right">
+            <th class="text-right">
                 <app-single-cell-item [numValue]="keyPerformanceIndicatorReport.total.baselineCost"
                     [isCurrency]="true"></app-single-cell-item>
-            </td>
-            <td class="text-right">
-                <app-single-cell-item
-                    [numValue]="keyPerformanceIndicatorReport.total.annualSavings"
+            </th>
+            <th class="text-right">
+                <app-single-cell-item [numValue]="keyPerformanceIndicatorReport.total.annualSavings"
                     [isCurrency]="true"></app-single-cell-item>
-            </td>
-            <td class="text-right">
+            </th>
+            <th class="text-right">
                 <app-single-cell-item [numValue]="keyPerformanceIndicatorReport.total.modifiedCost"
                     [isCurrency]="true"></app-single-cell-item>
-            </td>
-            <td class="text-right">
-                <app-single-cell-item
-                    [numValue]="keyPerformanceIndicatorReport.total.percentSavings"
+            </th>
+            <th class="text-right">
+                <app-single-cell-item [numValue]="keyPerformanceIndicatorReport.total.percentSavings"
                     [isCurrency]="false" [units]="'%'"></app-single-cell-item>
-            </td>
+            </th>
         </tr>
     </tfoot>
 </table>
\ No newline at end of file
diff --git a/src/app/shared/table-entries/single-cell-item/single-cell-item.component.html b/src/app/shared/table-entries/single-cell-item/single-cell-item.component.html
index 30c0e263..e5959c91 100644
--- a/src/app/shared/table-entries/single-cell-item/single-cell-item.component.html
+++ b/src/app/shared/table-entries/single-cell-item/single-cell-item.component.html
@@ -12,10 +12,10 @@
 
     <ng-template #numValueBlock>
         <ng-template [ngIf]="!isCurrency" [ngIfElse]="currencyBlock">
-            {{numValue | number}}
+            {{numValue | number:'1.0-2'}}
         </ng-template>
         <ng-template #currencyBlock>
-            {{numValue | currency}}
+            {{numValue | currency : 'USD' : 'symbol' : '1.0-0'}}
         </ng-template>
         <ng-template [ngIf]="units && !per">
             <span [innerHTML]="units | unitsDisplay"></span>

From 1c531f260bc0ac49102e094375872e7cb5f8127e Mon Sep 17 00:00:00 2001
From: rmroot <rootrm@ornl.gov>
Date: Wed, 9 Oct 2024 10:43:16 -0500
Subject: [PATCH 2/2] fix non neb payback value

---
 src/app/shared/reports/calculations/assessmentReport.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/reports/calculations/assessmentReport.ts b/src/app/shared/reports/calculations/assessmentReport.ts
index 4f52dc4d..14a487dc 100644
--- a/src/app/shared/reports/calculations/assessmentReport.ts
+++ b/src/app/shared/reports/calculations/assessmentReport.ts
@@ -111,7 +111,7 @@ export function getAssessmentReport(assessment: IdbAssessment, energyOpportuniti
     if (totalPaybackWithNebs == Infinity) {
         totalPaybackWithNebs = 0;
     }
-    let totalPaybackWithoutNebs: number = (implementationCost / totalNonOpportunitySavings);
+    let totalPaybackWithoutNebs: number = (implementationCost / totalEnergyCostSavings);
     if (totalPaybackWithoutNebs == Infinity) {
         totalPaybackWithoutNebs = 0;
     }