Merge pull request #168 from NREL/demo-quick-fix

Quick Fixes
NREL · Jul 19, 2024 · fa0b0c5 · fa0b0c5
2 parents fa56ff3 + 3f6e9e6
commit fa0b0c5
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 30 deletions.
diff --git a/src/app/indexed-db/db-changes.service.ts b/src/app/indexed-db/db-changes.service.ts
@@ -348,7 +348,8 @@ export class DbChangesService {
     await this.keyPerformanceIndicatorIdbService.setKeyPerformanceIndicators();
     await this.nonEnergyBenefitsIdbService.setNonEnergyBenefits();
     await this.onSiteVisitIdbService.setOnSiteVisits();
-
+    await this.energyEquipmentIdbService.setEnergyEquipments();
+    await this.processEquipmentIdbService.setProcessEquipments();
     this.userIdbService.user.next(user);
   }
 

diff --git a/...rtunities-form/energy-opportunity-setup-form/energy-opportunity-setup-form.component.html b/...rtunities-form/energy-opportunity-setup-form/energy-opportunity-setup-form.component.html
@@ -12,16 +12,16 @@
 
 <form>
     <div class="row">
-        <label class="col-sm-5 col-form-label" for="energyOpportunityName">Energy Opportunity Name</label>
+        <label class="col-sm-5 col-form-label" for="{{'energyOpportunityName_'+energyOpportunity.guid}}">Energy Opportunity Name</label>
         <div class="col-sm-7">
-            <input name="energyOpportunityName" type="text" class="form-control" [(ngModel)]="energyOpportunity.name"
-                minlength="1" maxlength="42" id="energyOpportunityName" (input)="saveEnergyOpportunity()">
+            <input name="{{'energyOpportunityName_'+energyOpportunity.guid}}" type="text" class="form-control" [(ngModel)]="energyOpportunity.name"
+                minlength="1" maxlength="42" id="{{'energyOpportunityName_'+energyOpportunity.guid}}" (input)="saveEnergyOpportunity()">
         </div>
     </div>
     <div class="row">
-        <label class="col-sm-5 col-form-label" for="energyOpportunityType">Opportunity Type</label>
+        <label class="col-sm-5 col-form-label" for="{{'opportunityType_'+energyOpportunity.guid}}">Opportunity Type</label>
         <div class="col-sm-7">
-            <select name="opportunityType" class="form-select" id="opportunityType"
+            <select name="{{'opportunityType_'+energyOpportunity.guid}}" class="form-select" id="{{'opportunityType_'+energyOpportunity.guid}}"
                 [(ngModel)]="energyOpportunity.opportunityType" (change)="saveEnergyOpportunity()">
                 <option [ngValue]="undefined">
                     Other
@@ -33,11 +33,11 @@
         </div>
     </div>
     <div class="row">
-        <label class="col-sm-5 col-form-label" for="implementationCost">Implementation Cost</label>
+        <label class="col-sm-5 col-form-label" for="{{'implementationCost_'+energyOpportunity.guid}}">Implementation Cost</label>
         <div class="col-sm-7">
             <div class="input-group">
-                <input name="implementationCost" type="number" class="form-control"
-                    [(ngModel)]="energyOpportunity.implementationCost" id="implementationCost"
+                <input name="{{'implementationCost_'+energyOpportunity.guid}}" type="number" class="form-control"
+                    [(ngModel)]="energyOpportunity.implementationCost" id="{{'implementationCost_'+energyOpportunity.guid}}"
                     (input)="saveEnergyOpportunity()">
                 <span class="input-group-text">&dollar;</span>
             </div>
@@ -46,32 +46,32 @@
     <div class="row">
         <div class="col-12">
             <div class="form-check form-switch">
-                <input class="form-check-input" type="checkbox" role="switch" id="includeSavings"
-                    [(ngModel)]="energyOpportunity.includeSavings" name="includeSavings"
+                <input class="form-check-input" type="checkbox" role="switch" id="{{'includeSavings_'+energyOpportunity.guid}}"
+                    [(ngModel)]="energyOpportunity.includeSavings" name="{{'includeSavings_'+energyOpportunity.guid}}"
                     (input)="saveEnergyOpportunity()">
-                <label class="form-check-label" for="includeSavings">Include Savings</label>
+                <label class="form-check-label" for="{{'includeSavings_'+energyOpportunity.guid}}">Include Savings</label>
             </div>
         </div>
     </div>
 
     <ng-container *ngIf="energyOpportunity.includeSavings">
         <div class="row">
-            <label class="col-sm-5 col-form-label" for="energySavings">Energy Savings</label>
+            <label class="col-sm-5 col-form-label" for="{{'energySavings_'+energyOpportunity.guid}}">Energy Savings</label>
             <div class="col-sm-7">
                 <div class="input-group">
-                    <input name="energySavings" type="number" class="form-control"
-                        [(ngModel)]="energyOpportunity.energySavings" id="energySavings"
+                    <input name="{{'energySavings_'+energyOpportunity.guid}}" type="number" class="form-control"
+                        [(ngModel)]="energyOpportunity.energySavings" id="{{'energySavings_'+energyOpportunity.guid}}"
                         (input)="saveEnergyOpportunity()">
                     <span class="input-group-text">MMBtu/yr</span>
                 </div>
             </div>
         </div>
         <div class="row">
-            <label class="col-sm-5 col-form-label" for="costSavings">Cost Savings</label>
+            <label class="col-sm-5 col-form-label" for="{{'costSavings_'+energyOpportunity.guid}}">Cost Savings</label>
             <div class="col-sm-7">
                 <div class="input-group">
-                    <input name="costSavings" type="number" class="form-control"
-                        [(ngModel)]="energyOpportunity.costSavings" id="costSavings" (input)="saveEnergyOpportunity()">
+                    <input name="{{'costSavings_'+energyOpportunity.guid}}" type="number" class="form-control"
+                        [(ngModel)]="energyOpportunity.costSavings" id="{{'costSavings_'+energyOpportunity.guid}}" (input)="saveEnergyOpportunity()">
                     <span class="input-group-text">&dollar;</span>
                 </div>
             </div>
@@ -80,9 +80,9 @@
     <div class="row">
         <div class="col-sm-12 col-form-label">
             <div class="form-check form-switch">
-                <input class="form-check-input" type="checkbox" role="switch" id="includeNote"
-                    [(ngModel)]="energyOpportunity.includeNote" name="includeNote" (input)="saveEnergyOpportunity()">
-                <label class="form-check-label" for="includeNote">Energy Opportunity Notes</label>
+                <input class="form-check-input" type="checkbox" role="switch" id="{{'includeNotes_'+energyOpportunity.guid}}"
+                    [(ngModel)]="energyOpportunity.includeNote" name="{{'includeNotes_'+energyOpportunity.guid}}" (input)="saveEnergyOpportunity()">
+                <label class="form-check-label" for="{{'includeNotes_'+energyOpportunity.guid}}">Energy Opportunity Notes</label>
             </div>
         </div>
         <div class="col-sm-12 mb-1" *ngIf="energyOpportunity.includeNote">

diff --git a/...portunities-form/energy-opportunity-setup-form/energy-opportunity-setup-form.component.ts b/...portunities-form/energy-opportunity-setup-form/energy-opportunity-setup-form.component.ts
@@ -26,7 +26,7 @@ export class EnergyOpportunitySetupFormComponent {
   faSearchPlus: IconDefinition = faSearchPlus;
   faPlus: IconDefinition = faPlus;
 
-  opportunityTypes: Array<EnergyOpportunityType> = FanOpportunities;
+  opportunityTypes: Array<EnergyOpportunityType> = [{value: 'other', label: 'Other'}];
   displayDeleteModal: boolean = false;
   constructor(
     private energyOpportunityIdbService: EnergyOpportunityIdbService,

diff --git a/...ction/on-site-assessment/neb-forms-accordion/neb-setup-form/neb-setup-form.component.html b/...ction/on-site-assessment/neb-forms-accordion/neb-setup-form/neb-setup-form.component.html
@@ -62,9 +62,9 @@
     <div class="row mb-1">
         <div class="col-sm-12 col-form-label">
             <div class="form-check form-switch">
-                <input class="form-check-input" type="checkbox" role="switch" id="includeNote"
-                    [(ngModel)]="nonEnergyBenefit.includeNote" name="includeNote" (input)="saveChanges()">
-                <label class="form-check-label" for="includeNote">Non-Energy Benefit Notes</label>
+                <input class="form-check-input" type="checkbox" role="switch" id="{{'includeNEBNote'+nonEnergyBenefit.guid}}"
+                    [(ngModel)]="nonEnergyBenefit.includeNote" name="{{'includeNEBNote'+nonEnergyBenefit.guid}}" (input)="saveChanges()">
+                <label class="form-check-label" for="{{'includeNEBNote'+nonEnergyBenefit.guid}}">Non-Energy Benefit Notes</label>
             </div>
         </div>
         <div class="col-sm-12" *ngIf="nonEnergyBenefit.includeNote">

diff --git a/src/app/shared/constants/keyPerformanceMetrics.ts b/src/app/shared/constants/keyPerformanceMetrics.ts
@@ -287,7 +287,11 @@ export const KeyPerformanceMetrics: Array<KeyPerformanceMetric> = [
         htmlLabel: "Defect Rate-PPM or DPM",
         value: "defectRatePPMorDPM",
         kpiValue: "quality",
-        isQuantitative: false,
+        isQuantitative: true,
+        baselineValue: undefined,
+        costPerValue: undefined,
+        totalUnit: 'product',
+        baselineCost: undefined,
         includeMetric: true
     },
     {

diff --git a/src/app/shared/helper-pipes/associated-contacts.pipe.ts b/src/app/shared/helper-pipes/associated-contacts.pipe.ts
@@ -20,6 +20,8 @@ export class AssociatedContactsPipe implements PipeTransform {
         _contacts.push(_contact);
       } else if (context == 'KPI' && _contact.kpiIds.includes(guid)) {
         _contacts.push(_contact);
+      } else if (context == 'nonEnergyBenefit' && _contact.nonEnergyBenefitIds.includes(guid)) {
+        _contacts.push(_contact);
       }
     });
     if (_contacts.length > 0) {

diff --git a/src/app/shared/reports/calculations/keyPerformanceIndicatorReport.ts b/src/app/shared/reports/calculations/keyPerformanceIndicatorReport.ts
@@ -1,5 +1,5 @@
 import { KeyPerformanceMetric } from "../../constants/keyPerformanceMetrics";
-import {  PerformanceMetricImpact } from "../../../models/nonEnergyBenefit";
+import { PerformanceMetricImpact } from "../../../models/nonEnergyBenefit";
 import * as _ from 'lodash';
 import { NebReport } from "./nebReport";
 
@@ -8,14 +8,25 @@ export function getKeyPerfomanceIndicatorReport(nebReports: Array<NebReport>): K
     let kpiReportItems: Array<KeyPerformanceIndicatorReportItem> = new Array();
     nebReports.forEach(nebReport => {
         nebReport.reportPerformanceMetrics.forEach(performanceMetric => {
+            if(isNaN(performanceMetric.performanceMetricImpact.costAdjustment)){
+                performanceMetric.performanceMetricImpact.costAdjustment = 0;
+            }
             let itemExistIndex: number = kpiReportItems.findIndex(reportItem => {
                 return reportItem.keyPerformanceMetric.value == performanceMetric.keyPerformanceMetric.value;
             });
             if (itemExistIndex != -1) {
-                kpiReportItems[itemExistIndex].performanceMetricImpact.costAdjustment += performanceMetric.performanceMetricImpact.costAdjustment;
-                kpiReportItems[itemExistIndex].performanceMetricImpact.modificationValue += performanceMetric.performanceMetricImpact.modificationValue;
-                kpiReportItems[itemExistIndex].performanceMetricImpact.percentSavings = (kpiReportItems[itemExistIndex].performanceMetricImpact.costAdjustment / kpiReportItems[itemExistIndex].keyPerformanceMetric.baselineCost) * 100;
+                if (performanceMetric.performanceMetricImpact.costAdjustment) {
+                    kpiReportItems[itemExistIndex].performanceMetricImpact.costAdjustment += performanceMetric.performanceMetricImpact.costAdjustment;
+                }
+                if (performanceMetric.performanceMetricImpact.modificationValue) {
+                    kpiReportItems[itemExistIndex].performanceMetricImpact.modificationValue += performanceMetric.performanceMetricImpact.modificationValue;
+                }
+                if (kpiReportItems[itemExistIndex].keyPerformanceMetric.baselineCost) {
+                    kpiReportItems[itemExistIndex].performanceMetricImpact.percentSavings = (kpiReportItems[itemExistIndex].performanceMetricImpact.costAdjustment / kpiReportItems[itemExistIndex].keyPerformanceMetric.baselineCost) * 100;
+                }
             } else {
+
+
                 kpiReportItems.push({
                     keyPerformanceMetric: performanceMetric.keyPerformanceMetric,
                     performanceMetricImpact: {

diff --git a/src/assets/styles/report.css b/src/assets/styles/report.css
@@ -1,5 +1,6 @@
 .report .table td, .report .table th{
     padding: .25rem;
+    font-size: 14px;
 }
 
 .report .savings-table .text-right{