New verbiage and UI changes

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

@@ -6,8 +6,8 @@
                     Welcome to JUSTIFI!
                 </div>
                 <p class="card-text">
-                    Use this tool to find the potential impact of energy opportunities in your organization by quantifying their
-                    non-energy benefits.
+                    Use this tool to identify and estimate the potential non-energy benefits (NEBs) that could be generated 
+                    during the energy assessments.
                 </p>
                 <hr>
                 <div class="row">
@@ -60,7 +60,7 @@
                         <div class="d-flex">
                             <fa-icon [icon]="faChevronRight"></fa-icon>
                             <p class="card-text ms-2">
-                                Explore common energy opportunities with Non-Energy Benefits.
+                                Explore potential energy efficiency opportunities with Non-Energy Benefits.
                             </p>
 
                         </div>

src/app/models/contact.ts

@@ -16,7 +16,6 @@ export interface IdbContact extends IdbEntry {
     energyEquipmentIds: Array<string>,
     kpiIds: Array<string>,
     userId: string,
-    focusArea: string,
     notes: string
 }
 
@@ -37,7 +36,6 @@ export function getNewIdbContact(userId: string, companyId: string): IdbContact
         email: undefined,
         role: undefined,
         team: undefined,
-        focusArea: undefined,
         notes: undefined,
         kpiIds: [],
     }

src/app/setup-wizard/data-collection/on-site-assessment/assessment-details-form/assessment-details-form.component.html

@@ -71,8 +71,8 @@
     </div>
 
     <div class="row">
-        <label class="col-sm-5 col-form-label" for="visitDate">Scheduled
-            For</label>
+        <label class="col-sm-5 col-form-label" for="visitDate">Assessment
+            Date</label>
         <div class="col-sm-7">
             {{assessment.visitDate | date}}
         </div>

src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component.html

@@ -1,6 +1,7 @@
-<div class="d-flex w-100 justify-content-end pt-2 pb-2">
+<div class="d-flex w-100 justify-content-between pt-2 pb-2">
+    <h2 class="col-sm-5 col-form-label" for="assessmentName">Energy Efficiency Opportunities</h2>
     <button class="btn btn-outline-energy-opp btn-sm" (click)="addEnergyOpportunity()"><fa-icon [icon]="faPlus"
-            class="me-1"></fa-icon>Add Energy Opportunity</button>
+            class="me-1"></fa-icon>Add Opportunity</button>
 </div>
 <ng-template [ngIf]="assessmentEnergyOpportunityGuids.length > 0" [ngIfElse]="noOpportunitiesBlock">
     <div class="accordion" id="energyOpportunityAccordion">
@@ -29,7 +30,7 @@ <h2 class="accordion-header">
 <ng-template #noOpportunitiesBlock>
     <div class="d-flex flex-column w-100 justify-content-center mt-3">
         <div class="alert alert-info small text-center p-2">
-            No energy opportunities found for this assessment.
+            No energy efficiency opportunities found for this assessment.
         </div>
     </div>
 </ng-template>

src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component.ts

@@ -78,7 +78,7 @@ export class AssessmentEnergyOpportunitiesFormComponent {
     let assessmentEnergyOpportunities: Array<IdbEnergyOpportunity> = this.energyOpportunities.filter(prj => {
       return prj.assessmentId == this.assessment.guid;
     });
-    newOpportunity.name = 'Energy Opportunity #' + (assessmentEnergyOpportunities.length + 1);
+    newOpportunity.name = 'Opportunity #' + (assessmentEnergyOpportunities.length + 1);
     await firstValueFrom(this.energyOpportunityIdbService.addWithObservable(newOpportunity));
     await this.energyOpportunityIdbService.setEnergyOpportunities();
   }

src/app/setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/energy-opportunity-setup-form/energy-opportunity-setup-form.component.html

@@ -12,15 +12,15 @@ <h6>
 </h6>
 
 <p class="fw-light small">
-    Provide details about the energy opportunity in this assessment. Providing an implementation cost will allow for
+    Provide details about this energy efficiency opportunity in this assessment. Providing an implementation cost will allow for
     payback calculations. These details will be rolled up to generate a final report on the assessment.
 </p>
 
 
 <form>
     <div class="row">
-        <label class="col-sm-5 col-form-label" for="{{'energyOpportunityName_'+energyOpportunity.guid}}">Energy
-            Opportunity Name</label>
+        <label class="col-sm-5 col-form-label" for="{{'energyOpportunityName_'+energyOpportunity.guid}}">Opportunity
+            Name</label>
         <div class="col-sm-7">
             <input name="{{'energyOpportunityName_'+energyOpportunity.guid}}" type="text" class="form-control"
                 [(ngModel)]="energyOpportunity.name" minlength="1" maxlength="42"
@@ -98,7 +98,7 @@ <h6>
                 <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
+                <label class="form-check-label" for="{{'includeNotes_'+energyOpportunity.guid}}">Opportunity
                     Notes</label>
             </div>
         </div>
@@ -135,10 +135,9 @@ <h6>
         </div>
     </h6>
     <p class="fw-light small">
-        Use this section to add Non-Energy Benefits (<fa-icon [icon]="faWeightHanging"></fa-icon>) that are <span
-            class="bold">directly
-            associated with this energy opportunity</span>. Use the "<fa-icon [icon]="faPlus"></fa-icon> Add NEB"
-        dropdown to select adding a "Custom NEB" or searching our database for potential known NEBs.
+        Use the "<fa-icon [icon]="faPlus"></fa-icon> Add NEB" dropdown to add Non-Energy Benefits 
+            (<fa-icon [icon]="faWeightHanging"></fa-icon>) that are <span class="bold">directly
+            associated with this energy efficiency opportunity</span>.
     </p>
 
     <app-neb-forms-accordion [energyOpportunity]="energyOpportunity"></app-neb-forms-accordion>

src/app/setup-wizard/data-collection/on-site-assessment/assessment-nebs-form/assessment-nebs-form.component.html

@@ -24,10 +24,9 @@ <h6 class="pt-2 pb-2">
     </div>
 </h6>
 <p class="fw-light small">
-    Use this section to add Non-Energy Benefits (<fa-icon [icon]="faWeightHanging"></fa-icon>) to this assessment that
-    are <span class="bold">not associated with a specific energy opportunity</span>. Use the "<fa-icon
-        [icon]="faPlus"></fa-icon> Add NEB"
-    dropdown to select adding a "Custom NEB" or searching our database for potential known NEBs.
+    Use the "<fa-icon [icon]="faPlus"></fa-icon> Add NEB" dropdown to add Non-Energy Benefits 
+    (<fa-icon [icon]="faWeightHanging"></fa-icon>) that are 
+    <span class="bold">not associated with any specific energy efficiency opportunity</span> to this assessment .
 </p>
 
 <app-neb-forms-accordion [assessment]="assessment"></app-neb-forms-accordion>

src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.html

@@ -5,7 +5,7 @@
                 <nav class="navbar top-nav">
                     <div>
                         <h5>
-                            <fa-icon [icon]="faScrewdriverWrench"></fa-icon> {{assessment.name}}
+                            <fa-icon [icon]="faScrewdriverWrench"></fa-icon> {{assessment.name}} @if (assessment.assessmentType) {- {{assessment.assessmentType}}}
                         </h5>
                     </div>
                     <ul class="nav nav-underline">
@@ -15,7 +15,7 @@ <h5>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link pt-0" [routerLink]="'energy-opportunities'"
-                            [routerLinkActive]="['active']">Energy Opportunities</a>
+                            [routerLinkActive]="['active']">Energy Efficiency Opportunities</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link pt-0" [routerLink]="'nebs'"

src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.component.html

@@ -67,14 +67,14 @@ <h2 class="accordion-header">
                         </div>
                     </div>
                     <div class="row mb-1">
-                        <label class="col-sm-5 col-form-label" for="role">Role</label>
+                        <label class="col-sm-5 col-form-label" for="role">Title</label>
                         <div class="col-sm-7">
                             <input type="text" class="form-control"
                                 formControlName="role"
                                 (input)="saveChanges()"
                                 id="role" name="role">
                             <div class="alert alert-warning form-error" *ngIf="contactForm.controls['role'].errors">
-                                Invalid role
+                                Invalid title
                             </div>
                         </div>
                     </div>
@@ -90,21 +90,6 @@ <h2 class="accordion-header">
                             </div>
                         </div>
                     </div>
-                    <div class="row mb-1">
-                        <label class="col-sm-5 col-form-label" for="focusArea">Focus
-                            Area</label>
-                        <div class="col-sm-7">
-                            <div class="input-group">
-                                <input type="text" class="form-control"
-                                    formControlName="focusArea"
-                                    (input)="saveChanges()" minlength="1"
-                                    id="focusArea" name="focusArea">
-                                <div class="alert alert-warning form-error" *ngIf="contactForm.controls['focusArea'].errors">
-                                    Invalid focus area
-                                </div>
-                            </div>
-                        </div>
-                    </div>
                     <div class="row mb-1">
                         <label class="col-sm-5 col-form-label" for="notes">Notes</label>
                         <div class="col-sm-7">

src/app/setup-wizard/pre-visit/company-contacts-setup/company-contacts-form/company-contacts-form.service.ts

@@ -31,7 +31,6 @@ export class CompanyContactsFormService {
       'email': [contact.email, [Validators.email, Validators.maxLength(255)]],
       'role': [contact.role, []],
       'team': [contact.team, []],
-      'focusArea': [contact.focusArea, []],
       'notes': [contact.notes, []]
     }, {validator: this.phoneNumberValidator()});
   }
@@ -46,7 +45,6 @@ export class CompanyContactsFormService {
     contact.email = contactForm.controls['email'].value;
     contact.role = contactForm.controls['role'].value;
     contact.team = contactForm.controls['team'].value;
-    contact.focusArea = contactForm.controls['focusArea'].value;
     contact.notes = contactForm.controls['notes'].value;
     return contact;
   }

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

@@ -39,7 +39,7 @@ <h5>
             Go Back
         </button>
         <button class="btn btn-dark" (click)="goToKPIs()" [disabled]="hasInvalidContacts">
-            Company KPI's
+            Company KPIs
             <fa-icon [icon]="faChevronRight"></fa-icon>
         </button>
     </div>

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

@@ -159,7 +159,7 @@ <h6>
                                 <div class="row" *ngIf="keyPerformanceMetric.totalUnit">
                                     <label class="col-sm-6 col-form-label pm-label"
                                         for="{{'isQuantitative_'+keyPerformanceMetric.value}}">
-                                        Quantitative or Qualitative Metric
+                                        Metric Type
                                     </label>
                                     <div class="col-6">
                                         <select id="{{'isQuantitative_'+keyPerformanceMetric.value}}"

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

@@ -11,7 +11,7 @@
             </td>
             <td class="w-25">
                 <fa-icon [icon]="faFileLines" class="me-1"></fa-icon>
-                Energy Opportunity
+                Energy Efficiency Opportunity
             </td>
             <td class="w-25">
                 <fa-icon [icon]="faWeightHanging" class="me-1"></fa-icon>

src/app/setup-wizard/pre-visit/company-kpi-select/add-kpi-search/add-kpi-search.component.html

@@ -2,7 +2,7 @@
     <div class="col-4">
         <h6>
             <fa-icon [icon]="faMagnifyingGlassPlus" class="me-2"></fa-icon>
-            Find Common KPI's
+            Find Potential KPIs
         </h6>
     </div>
     <div class="col-4">

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

@@ -2,7 +2,7 @@
     <div class="col-8">
         <h6>
             <fa-icon [icon]="faBullseye" class="me-2"></fa-icon>
-            Selected Company KPI's
+            Selected Company KPIs
         </h6>
     </div>
     <div class="col-4">

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

@@ -3,7 +3,7 @@
         <div class="col-10 pt-4 pb-4">
             <div class="form-paper shadow">
                 <h5>
-                    <fa-icon [icon]="faChartBar" class="me-2"></fa-icon> Company Key Performance Indicators
+                    <fa-icon [icon]="faChartBar" class="me-2"></fa-icon> Company Key Performance Indicators (KPIs)
                 </h5>
                 <hr>
                 <div class="row">

src/app/setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.component.html

@@ -10,8 +10,8 @@ <h5>
                     <div class="d-flex w-100 justify-content-between pb-2">
                         <div class="p-0">
                             <div class="row">
-                                <label class="col-sm-5 col-form-label bold" for="visitDate">Visit Date</label>
-                                <div class="col-sm-7">
+                                <label class="col-sm-6 col-form-label bold" for="visitDate">Assessment Date</label>
+                                <div class="col-sm-6">
                                     <input name="visitDate" id="visitDate" type="date" class="form-control" [(ngModel)]="onSiteVisit.visitDate"
                                         name="visitDate" (change)="setVisitDate()">
                                 </div>
@@ -128,8 +128,8 @@ <h2 class="accordion-header">
                                                     </div>
 
                                                     <div class="row">
-                                                        <label class="col-sm-5 col-form-label" for="visitDate">Scheduled
-                                                            For</label>
+                                                        <label class="col-sm-5 col-form-label" for="visitDate">Assessment
+                                                            Date</label>
                                                         <div id="visitDate" class="col-sm-7">
                                                             {{assessment.visitDate | date}}
                                                         </div>

src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component.html

@@ -23,7 +23,7 @@
                 </tr>
                 <tr>
                     <td>
-                        Role
+                        Title
                     </td>
                     <td>
                         <app-single-cell-item [strValue]="contact.role"></app-single-cell-item>
@@ -37,14 +37,6 @@
                         <app-single-cell-item [strValue]="contact.team"></app-single-cell-item>
                     </td>
                 </tr>
-                <tr>
-                    <td>
-                        Focus Area
-                    </td>
-                    <td>
-                        <app-single-cell-item [strValue]="contact.focusArea"></app-single-cell-item>
-                    </td>
-                </tr>
                 <tr>
                     <td>
                         Notes
@@ -55,7 +47,7 @@
                 </tr>
                 <tr>
                     <td>
-                        KPI's
+                        KPIs
                     </td>
                     <td>
                         <ng-template [ngIf]="contact.kpiIds.length != 0" [ngIfElse]="kpiMdash">
@@ -73,7 +65,7 @@
                 </tr>
                 <tr>
                     <td>
-                        Equipment
+                        End Use
                     </td>
                     <td>
                         <ng-template [ngIf]="contact.processEquipmentIds.length != 0" [ngIfElse]="equipmentMdash">

src/app/setup-wizard/setup-wizard-sidebar/setup-wizard-sidebar.component.html

@@ -35,7 +35,7 @@
                 <div class="nav-item">
                     <a class="nav-link secondary-nav" [routerLink]="'pre-visit/'+onSiteVisit.guid+'/company-kpi-select'"
                         [routerLinkActive]="['active']">
-                        Select KPI's
+                        Select KPIs
                     </a>
                 </div>
 
@@ -64,7 +64,7 @@
                 <div class="nav-item">
                     <a class="nav-link secondary-nav" [routerLink]="'pre-visit/'+onSiteVisit.guid+'/process-equipment'"
                         [routerLinkActive]="['active']">
-                        End Uses Inventory
+                        End Use Inventory
                     </a>
                 </div>
                 <div class="nav-item">
@@ -117,7 +117,7 @@
                         <a class="nav-link secondary-nav"
                             [routerLink]="'data-collection/'+onSiteVisit.guid+'/assessment/'+assessmentGuid+'/energy-opportunities'"
                             [routerLinkActive]="['active']">
-                            Energy Opportunities
+                            Energy Efficiency Opportunities
                         </a>
                     </div>
                     <div class="nav-item">

src/app/shared/contact-modal/contact-modal.component.html

@@ -68,7 +68,7 @@
                     </tr>
                     <tr>
                         <td>
-                            Role
+                            Title
                         </td>
                         <td>
                             {{selectedContact.role}}
@@ -82,14 +82,6 @@
                             {{selectedContact.team}}
                         </td>
                     </tr>
-                    <tr>
-                        <td>
-                            Focus Area
-                        </td>
-                        <td>
-                            {{selectedContact.focusArea}}
-                        </td>
-                    </tr>
                     <tr>
                         <td>
                             Notes

src/app/shared/helper-pipes/contact-name-display.pipe.ts

@@ -9,7 +9,7 @@ export class ContactNameDisplayPipe implements PipeTransform {
 
   transform(contact: IdbContact): string {
     if (contact) {
-      return contact.firstName + ' ' + contact.lastName;
+      return (contact.firstName || '') + ' ' + (contact.lastName  || '');
     } else {
       return '';
     }

src/app/shared/reports/assessment-report/assessment-report.component.html

@@ -26,7 +26,7 @@
             </tr>
             <tr>
                 <td>
-                    Energy Equipment
+                    Industrial Equipment
                 </td>
                 <td>
                     <app-single-cell-item