Merge pull request #266 from NREL/issue-234

Updates to Verbiage Changes from 2nd round language check

src/app/core-components/welcome/welcome.component.html

@@ -7,7 +7,7 @@
                         Welcome to JUSTIFI!
                     </div>
                     <p class="card-text fw-light">
-                        Use this tool to identify and estimate potential non-energy benefits (NEBs) that can be
+                        Use this tool to identify, estimate potential and report on non-energy benefits (NEBs) that can be
                         found while conducting energy assessments.
                     </p>
                 </div>

src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/neb-setup-form.component.html

@@ -68,7 +68,7 @@
     <h6>
         <div class="d-flex w-100 justify-content-between">
             <div class="mt-auto bold">
-                Performance Metric Impacts
+                Key Performance Metric Impacts
             </div>
             <div>
                 <app-performance-metrics-modal [nonEnergyBenefit]="nonEnergyBenefit"></app-performance-metrics-modal>

src/app/setup-wizard/data-collection/on-site-assessment/neb-forms-accordion/neb-setup-form/performance-metrics-modal/performance-metrics-modal.component.html

@@ -1,6 +1,6 @@
 <button class="me-2 btn btn-sm btn-outline-metric" (click)="openMetricModal()">
     <fa-icon [icon]="faSearchPlus"></fa-icon>
-    Search Performance Metrics
+    Search Key Performance Metrics
 </button>
 
 
@@ -27,7 +27,8 @@
                         <label class="form-check-label" for="filterAssociatedMetrics">Filter associated metrics</label>
                     </div>
                     <p class="small mb-0">
-                        <fa-icon [icon]="faAsterisk"></fa-icon> Denotes metric typically associated with {{nonEnergyBenefit.name}}.
+                        <fa-icon [icon]="faAsterisk"></fa-icon> Denotes metric typically associated with
+                        {{nonEnergyBenefit.name}}.
                     </p>
                 </div>
                 <div class="col-3">
@@ -52,7 +53,7 @@
                             <th (click)="toggleOrderBy()">
                                 <fa-icon [icon]="faChevronDown" *ngIf="orderByDir == 'asc'"></fa-icon>
                                 <fa-icon [icon]="faChevronUp" *ngIf="orderByDir == 'desc'"></fa-icon>
-                                Performance Metric
+                                Key Performance Metric
                             </th>
                             <th>
                                 KPI

src/app/setup-wizard/pre-visit/company-kpi-details/company-kpi-details.component.html

@@ -93,7 +93,7 @@ <h5>
                     <h6>
                         <div class="d-flex w-100 justify-content-between">
                             <div class="mt-auto bold">
-                                Associated Performance Metrics
+                                Associated Key Performance Metrics
                             </div>
                             <div>
                                 <button class="btn btn-outline-metric btn-sm" (click)="addPerformanceMetric()">
@@ -104,7 +104,7 @@ <h6>
                         </div>
                     </h6>
                     <p class="fw-light small">
-                        The below associated performance metrics (<fa-icon [icon]="faScaleUnbalancedFlip"></fa-icon>)
+                        The below associated key performance metrics (<fa-icon [icon]="faScaleUnbalancedFlip"></fa-icon>)
                         will be used later on during an assessment to tie Non-Energy Benefits found back to company Key
                         Performance Indicators. This information can be added to and modified at a later time if not all
                         of the details are currently known.

src/app/setup-wizard/setup-wizard-help-panel/assessment-nebs-help/assessment-nebs-help.component.css

@@ -0,0 +1,3 @@
+.bold{
+    font-weight: bold;
+}

src/app/setup-wizard/setup-wizard-help-panel/assessment-nebs-help/assessment-nebs-help.component.html

@@ -1,7 +1,13 @@
 <p>
-    If NEBs are found that cannot be associated with a specific energy efficiency opportunity, then they should be added
+    If NEBs are found that cannot be associated with a <span class="bold">specific</span> energy efficiency opportunity,
+    then they should be added
     here.
 </p>
+<p>
+    This could be used for both non-related NEBs found in facility walkthroughs and NEBs requiring the implementation of
+    multiple energy efficiency opportunities. e.g. Implementing several opportunities results in being able to turn off
+    equipment or meet a secondary goal.
+</p>
 <hr>
 <p>
     Non-Energy Benefits can be added to assessment with the "<fa-icon [icon]="faPlus"></fa-icon> Add NEB" button.
@@ -22,12 +28,14 @@
 </ol>
 <hr>
 <p>
-    Once a NEB is entered, <span class="bold">"Performance Metric Impacts"</span> can be added. These are impacts that
+    Once a NEB is entered, <span class="bold">"Key Performance Metric Impacts"</span> can be added. These are impacts
+    that
     the NEB has on
     performance metrics the company is tracking.
 </p>
 <p>
-    The "<fa-icon [icon]="faSearchPlus"></fa-icon> Search Performance Metrics" button will open a modal with a list of
+    The "<fa-icon [icon]="faSearchPlus"></fa-icon> Search Key Performance Metrics" button will open a modal with a list
+    of
     all performance metrics in the tool. If a metric is known to be typically associated with the NEB, it will be
     identified with an <fa-icon [icon]="faAsterisk"></fa-icon>.
 </p>

src/app/setup-wizard/setup-wizard-help-panel/company-kpi-detail-help/company-kpi-detail-help.component.html

@@ -3,7 +3,7 @@
 </p>
 <hr>
 <p>
-    Use the <span class="bold">Associated Performance Metrics</span> section to manage the performance metrics that
+    Use the <span class="bold">Associated Key Performance Metrics</span> section to manage the performance metrics that
     are associated with the selected performance indicator.
 </p>
 <hr>

src/app/setup-wizard/setup-wizard-help-panel/energy-opportunities-help/energy-opportunities-help.component.html

@@ -30,12 +30,12 @@
 </ol>
 <hr>
 <p>
-    Once a NEB is entered, <span class="bold">"Performance Metric Impacts"</span> can be added. These are impacts that
+    Once a NEB is entered, <span class="bold">"Key Performance Metric Impacts"</span> can be added. These are impacts that
     the NEB has on
     performance metrics the company is tracking.
 </p>
 <p>
-    The "<fa-icon [icon]="faSearchPlus"></fa-icon> Search Performance Metrics" button will open a modal with a list of
+    The "<fa-icon [icon]="faSearchPlus"></fa-icon> Search Key Performance Metrics" button will open a modal with a list of
     all performance metrics in the tool. If a metric is known to be typically associated with the NEB, it will be
     identified with an <fa-icon [icon]="faAsterisk"></fa-icon>.
 </p>

src/app/shared/kpm-details-form/kpm-details-form.component.html

@@ -19,7 +19,7 @@
         </label> -->
         <div class="col-sm-6 col-form-label">
             <app-label-with-tooltip [field]="'goalToIncrease'" [labelId]="'goalToIncrease_'+keyPerformanceMetric.value"
-                [label]="'Desired Impact'"></app-label-with-tooltip>
+                [label]="'Expected Impact'"></app-label-with-tooltip>
         </div>
         <div class="col-6">
             <select id="{{'goalToIncrease_'+keyPerformanceMetric.value}}"