fix merge conflicts with dev

NREL · Jan 21, 2025 · 2aff0f1 · 2aff0f1
2 parents 50d0309 + f7b8f9b
commit 2aff0f1
Show file tree

Hide file tree

Showing 102 changed files with 2,580 additions and 2,008 deletions.
diff --git a/src/app/indexed-db/db-changes.service.ts b/src/app/indexed-db/db-changes.service.ts
@@ -154,13 +154,15 @@ export class DbChangesService {
 
     //update on site visits
     let onSiteVisits: Array<IdbOnSiteVisit> = this.onSiteVisitIdbService.onSiteVisits.getValue();
-    let assessmentOnSiteVisits: Array<IdbOnSiteVisit> = onSiteVisits.filter(onSiteVisit => { return onSiteVisit.assessmentIds.includes(assessment.guid) });
-    if (assessmentOnSiteVisits.length > 0) {
-      for (let i = 0; i < assessmentOnSiteVisits.length; i++) {
-        assessmentOnSiteVisits[i].assessmentIds = assessmentOnSiteVisits[i].assessmentIds.filter(assessmentId => { return assessmentId != assessment.guid });
-        await firstValueFrom(this.onSiteVisitIdbService.updateWithObservable(assessmentOnSiteVisits[i]));
-      }
+    let assessmentOnSiteVisit: IdbOnSiteVisit = onSiteVisits.find(onSiteVisit => { return onSiteVisit.assessmentIds.includes(assessment.guid) });
+    if (assessmentOnSiteVisit) {
+      assessmentOnSiteVisit.assessmentIds = assessmentOnSiteVisit.assessmentIds.filter(assessmentId => { return assessmentId != assessment.guid });
+      await firstValueFrom(this.onSiteVisitIdbService.updateWithObservable(assessmentOnSiteVisit));
       await this.onSiteVisitIdbService.setOnSiteVisits();
+      let selectedOnSiteVisit: IdbOnSiteVisit = this.onSiteVisitIdbService.selectedVisit.getValue();
+      if (selectedOnSiteVisit && selectedOnSiteVisit.guid == assessmentOnSiteVisit.guid) {
+        this.onSiteVisitIdbService.selectedVisit.next(assessmentOnSiteVisit);
+      }
     }
 
     //delete assessment

diff --git a/src/app/indexed-db/key-performance-indicators-idb.service.ts b/src/app/indexed-db/key-performance-indicators-idb.service.ts
@@ -121,4 +121,12 @@ export class KeyPerformanceIndicatorsIdbService {
     }
     return addedMetric;
   }
+
+  getByFacilityGuid(facilityGuid: string): Array<IdbKeyPerformanceIndicator> {
+    let keyPerformanceIndicators: Array<IdbKeyPerformanceIndicator> = this.keyPerformanceIndicators.getValue();
+    let facilityKPIs: Array<IdbKeyPerformanceIndicator> = keyPerformanceIndicators.filter(kpi => {
+      return kpi.facilityId == facilityGuid;
+    });
+    return facilityKPIs;
+  }
 }
diff --git a/src/app/models/assessment.ts b/src/app/models/assessment.ts
@@ -20,7 +20,8 @@ export interface IdbAssessment extends IdbEntry {
     costSavings: number,
     visitDate: Date,
     notes: string,
-    implementationCost: number
+    implementationCost: number,
+    sidebarOpen: boolean
 }
 
 const defaultAssessmentType: AssessmentType = "Pump";
@@ -46,6 +47,7 @@ export function getNewIdbAssessment(userId: string, companyId: string, facilityI
         costSavings: 0,
         notes: undefined,
         visitDate: undefined,
-        implementationCost: 0
+        implementationCost: 0,
+        sidebarOpen: false
     }
 }
diff --git a/src/app/models/company.ts b/src/app/models/company.ts
@@ -7,6 +7,8 @@ export interface IdbCompany extends IdbEntry {
     generalInformation: GeneralInformation,
     displayFacilities: boolean,
     companyEnergyUnit: string,
+    sidebarOpen: boolean,
+    sidebarContactsOpen: boolean
 }
 
 export function getNewIdbCompany(userId: string): IdbCompany {
@@ -18,6 +20,8 @@ export function getNewIdbCompany(userId: string): IdbCompany {
         generalInformation: generalInformation,
         displayFacilities: true,
         companyEnergyUnit: 'MMBtu',
+        sidebarOpen: true,
+        sidebarContactsOpen: false
     }
 }
 
diff --git a/src/app/models/facility.ts b/src/app/models/facility.ts
@@ -10,6 +10,11 @@ export interface IdbFacility extends IdbEntry {
     generalInformation: GeneralInformation,
     energyUse: number,
     cost: number,
+    sidebarOpen: boolean,
+    sidebarKPIsOpen: boolean,
+    sidebarSystemInventoryOpen: boolean,
+    sidebarEndUseInventoryOpen: boolean,
+    sidebarPreAssessmentOpen: boolean
 }
 
 export function getNewIdbFacility(userId: string, companyId: string): IdbFacility {
@@ -24,5 +29,10 @@ export function getNewIdbFacility(userId: string, companyId: string): IdbFacilit
         generalInformation: generalInformation,
         energyUse: 0,
         cost: 0,
+        sidebarOpen: true,
+        sidebarKPIsOpen: false,
+        sidebarSystemInventoryOpen: false,
+        sidebarEndUseInventoryOpen: false,
+        sidebarPreAssessmentOpen: false
     }
 }
diff --git a/src/app/routing/setup-wizard.routes.ts b/src/app/routing/setup-wizard.routes.ts
@@ -3,11 +3,7 @@ import { SetupWizardComponent } from "../setup-wizard/setup-wizard.component";
 import { PreVisitComponent } from "../setup-wizard/pre-visit/pre-visit.component";
 import { CompanySetupComponent } from "../setup-wizard/pre-visit/company-setup/company-setup.component";
 import { CanDeactivateGuard } from "../guards/can-deactivate.guard";
-import { CompanyContactsSetupComponent } from "../setup-wizard/pre-visit/company-contacts-setup/company-contacts-setup.component";
 import { FacilitySetupComponent } from "../setup-wizard/pre-visit/facility-setup/facility-setup.component";
-import { FacilityEnergyEquipmentSetupComponent } from "../setup-wizard/pre-visit/facility-energy-equipment-setup/facility-energy-equipment-setup.component";
-import { FacilityProcessEquipmentSetupComponent } from "../setup-wizard/pre-visit/facility-process-equipment-setup/facility-process-equipment-setup.component";
-import { PreAssessmentSetupComponent } from "../setup-wizard/pre-visit/pre-assessment-setup/pre-assessment-setup.component";
 import { ReviewPreVisitSetupComponent } from "../setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component";
 import { DataCollectionComponent } from "../setup-wizard/data-collection/data-collection.component";
 import { DataCollectionManageAssessmentsComponent } from "../setup-wizard/data-collection/data-collection-manage-assessments/data-collection-manage-assessments.component";
@@ -23,6 +19,14 @@ import { AssessmentDetailsFormComponent } from "../shared/shared-assessment-form
 import { AssessmentEnergyOpportunitiesFormComponent } from "../setup-wizard/data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component";
 import { FacilityKpiSelectComponent } from "../setup-wizard/pre-visit/facility-kpi-select/facility-kpi-select.component";
 import { FacilityKpiDetailsComponent } from "../setup-wizard/pre-visit/facility-kpi-details/facility-kpi-details.component";
+import { ManageCompanyContactsComponent } from "../setup-wizard/pre-visit/company-contacts/manage-company-contacts/manage-company-contacts.component";
+import { CompanyContactDetailsFormComponent } from "../setup-wizard/pre-visit/company-contacts/company-contact-details-form/company-contact-details-form.component";
+import { ManageEnergyEquipmentComponent } from "../setup-wizard/pre-visit/facility-energy-equipment/manage-energy-equipment/manage-energy-equipment.component";
+import { FacilityEnergyEquipmentFormComponent } from "../setup-wizard/pre-visit/facility-energy-equipment/facility-energy-equipment-form/facility-energy-equipment-form.component";
+import { ManageProcessEquipmentComponent } from "../setup-wizard/pre-visit/facility-process-equipment/manage-process-equipment/manage-process-equipment.component";
+import { FacilityProcessEquipmentFormComponent } from "../setup-wizard/pre-visit/facility-process-equipment/facility-process-equipment-form/facility-process-equipment-form.component";
+import { PreAssessmentFormComponent } from "../setup-wizard/pre-visit/pre-assessments/pre-assessment-form/pre-assessment-form.component";
+import { ManagePreAssessmentsComponent } from "../setup-wizard/pre-visit/pre-assessments/manage-pre-assessments/manage-pre-assessments.component";
 
 
 export const SetupWizardRoutes: Route = {
@@ -44,16 +48,21 @@ export const SetupWizardRoutes: Route = {
                     canDeactivate: [CanDeactivateGuard]
                 },
                 {
-                    path: 'kpi-select',
+                    path: 'facility-kpi-select',
                     component: FacilityKpiSelectComponent
                 },
                 {
-                    path: 'kpi-detail/:id',
+                    path: 'facility-kpi-detail/:id',
                     component: FacilityKpiDetailsComponent
                 },
                 {
                     path: 'company-contacts',
-                    component: CompanyContactsSetupComponent,
+                    component: ManageCompanyContactsComponent,
+                    // canDeactivate: [CanDeactivateGuard]
+                },
+                {
+                    path: 'company-contacts/:id',
+                    component: CompanyContactDetailsFormComponent,
                     canDeactivate: [CanDeactivateGuard]
                 },
                 {
@@ -62,16 +71,31 @@ export const SetupWizardRoutes: Route = {
                     canDeactivate: [CanDeactivateGuard]
                 },
                 {
-                    path: 'energy-equipment',
-                    component: FacilityEnergyEquipmentSetupComponent
+                    path: 'facility-energy-equipment',
+                    component: ManageEnergyEquipmentComponent
+                },
+                {
+                    path: 'facility-energy-equipment/:id',
+                    component: FacilityEnergyEquipmentFormComponent,
+                    canDeactivate: [CanDeactivateGuard]
                 },
                 {
-                    path: 'end-uses',
-                    component: FacilityProcessEquipmentSetupComponent
+                    path: 'facility-end-uses',
+                    component: ManageProcessEquipmentComponent
                 },
                 {
-                    path: 'pre-assessment',
-                    component: PreAssessmentSetupComponent
+                    path: 'facility-end-uses/:id',
+                    component: FacilityProcessEquipmentFormComponent,
+                    canDeactivate: [CanDeactivateGuard]
+                },
+                {
+                    path: 'facility-pre-assessment',
+                    component: ManagePreAssessmentsComponent
+                },
+                {
+                    path: 'facility-pre-assessment/:id',
+                    component: PreAssessmentFormComponent,
+                    canDeactivate: [CanDeactivateGuard]
                 },
                 {
                     path: 'review-pre-visit',

diff --git a/...tion/data-collection-manage-assessments/data-collection-manage-assessments.component.html b/...tion/data-collection-manage-assessments/data-collection-manage-assessments.component.html
@@ -3,7 +3,7 @@
         <div class="col-10 pt-4 pb-4">
             <div class="form-paper shadow">
                 <h5>
-                    <fa-icon [icon]="faToolbox"></fa-icon> Manage Assessments
+                    <fa-icon [icon]="faList"></fa-icon> Manage Assessments
                 </h5>
                 <hr>
                 <div class="d-flex w-100 justify-content-between pb-2">

diff --git a/...ection/data-collection-manage-assessments/data-collection-manage-assessments.component.ts b/...ection/data-collection-manage-assessments/data-collection-manage-assessments.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-import { IconDefinition, faChevronLeft, faChevronRight, faPlus, faScrewdriverWrench, faToolbox, faTrash } from '@fortawesome/free-solid-svg-icons';
+import { IconDefinition, faChevronLeft, faChevronRight, faList, faPlus, faScrewdriverWrench, faToolbox, faTrash } from '@fortawesome/free-solid-svg-icons';
 import { Subscription, firstValueFrom } from 'rxjs';
 import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
 import { DbChangesService } from 'src/app/indexed-db/db-changes.service';
@@ -16,7 +16,7 @@ import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
 })
 export class DataCollectionManageAssessmentsComponent {
 
-  faToolbox: IconDefinition = faToolbox;
+  faList: IconDefinition = faList;
   faChevronRight: IconDefinition = faChevronRight;
   faChevronLeft: IconDefinition = faChevronLeft;
   faPlus: IconDefinition = faPlus;
@@ -69,10 +69,12 @@ export class DataCollectionManageAssessmentsComponent {
       this.facilityIdbService.getByGUID(this.onSiteVisit.facilityId).unitSettings
     );
     assessment.visitDate = this.onSiteVisit.visitDate;
+    assessment.sidebarOpen = true;
     await firstValueFrom(this.assessmentIdbService.addWithObservable(assessment));
     await this.assessmentIdbService.setAssessments();
     this.onSiteVisit.assessmentIds.push(assessment.guid);
     await this.onSiteVisitIdbService.asyncUpdate(this.onSiteVisit);
+    this.goToAssessment(assessment.guid);
   }
 
 

diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.css b/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.css
@@ -8,5 +8,21 @@
 
 .navbar{
     padding-bottom: 0px;
-    border-bottom: 1px #0079c2 solid;
+    border-bottom: 1px var(--portfolio-nav-color) solid;
+}
+
+nav.navbar .nav.nav-tabs .nav-item .nav-link{
+    border-color: var(--portfolio-nav-color);
+    color: var(--portfolio-nav-color);
+}
+
+
+nav.navbar .nav.nav-tabs .nav-item .nav-link.active {
+    background-color: var(--portfolio-nav-color);
+    color: white;
+    border-bottom-color: black;
+}
+nav.navbar .nav.nav-tabs .nav-item .nav-link:hover {
+    background-color: #8DABBE;
+    color: black;
 }
diff --git a/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.html b/src/app/setup-wizard/data-collection/on-site-assessment/on-site-assessment.component.html
@@ -13,6 +13,7 @@ <h5>
                             *ngIf="assessment.assessmentType">{{assessment.assessmentType}}</span>
                     </div>
                 </div>
+                <hr class="my-1">
                 <nav class="navbar">
                     <ul class="nav nav-tabs">
                         <li class="nav-item">

diff --git a/...p/setup-wizard/data-evaluation/assessment-evaluation/assessment-evaluation.component.html b/...p/setup-wizard/data-evaluation/assessment-evaluation/assessment-evaluation.component.html
@@ -3,7 +3,7 @@
         <div [ngClass]="{'col-10 pt-4 pb-4': !print}">
             <div [ngClass]="{'form-paper shadow': !print}">
                 <h5>
-                    <fa-icon [icon]="faScrewdriverWrench"></fa-icon> {{assessment.name}} Report
+                    <fa-icon [icon]="faChartPie"></fa-icon> {{assessment.name}} Report
                 </h5>
                 <app-assessment-report [assessment]="assessment"></app-assessment-report>
             </div>

diff --git a/...app/setup-wizard/data-evaluation/assessment-evaluation/assessment-evaluation.component.ts b/...app/setup-wizard/data-evaluation/assessment-evaluation/assessment-evaluation.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { IconDefinition, faChevronLeft, faChevronRight, faFilePdf, faScrewdriverWrench } from '@fortawesome/free-solid-svg-icons';
+import { IconDefinition, faChevronLeft, faChevronRight, faChartPie, faFilePdf } from '@fortawesome/free-solid-svg-icons';
 import { Subscription } from 'rxjs';
 import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
 import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
@@ -16,8 +16,8 @@ import { SharedDataService } from 'src/app/shared/shared-services/shared-data.se
 export class AssessmentEvaluationComponent {
   faChevronRight: IconDefinition = faChevronRight;
   faChevronLeft: IconDefinition = faChevronLeft;
-  faScrewdriverWrench: IconDefinition = faScrewdriverWrench;
   faFilePdf: IconDefinition = faFilePdf;
+  faChartPie: IconDefinition = faChartPie;
 
   assessmentIndex: number;
   onSiteVisit: IdbOnSiteVisit;

diff --git a/src/app/setup-wizard/data-evaluation/data-follow-up/data-follow-up.component.html b/src/app/setup-wizard/data-evaluation/data-follow-up/data-follow-up.component.html
@@ -3,6 +3,7 @@
         <div class="col-10 pt-4 pb-4">
             <div class="form-paper shadow">
                 <h5>
+                    <fa-icon [icon]="faPersonWalkingArrowLoopLeft"></fa-icon>
                     Review and Follow-up
                 </h5>
                 <hr>

diff --git a/src/app/setup-wizard/data-evaluation/data-follow-up/data-follow-up.component.ts b/src/app/setup-wizard/data-evaluation/data-follow-up/data-follow-up.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-import { IconDefinition, faChevronLeft, faChevronRight } from '@fortawesome/free-solid-svg-icons';
+import { IconDefinition, faChevronLeft, faChevronRight, faPersonWalkingArrowLoopLeft } from '@fortawesome/free-solid-svg-icons';
 import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
 import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
 
@@ -13,6 +13,7 @@ export class DataFollowUpComponent {
 
   faChevronLeft: IconDefinition = faChevronLeft;
   faChevronRight: IconDefinition = faChevronRight;
+  faPersonWalkingArrowLoopLeft: IconDefinition = faPersonWalkingArrowLoopLeft;
 
   onSiteVisit: IdbOnSiteVisit;
   constructor(private router: Router,

diff --git a/src/app/setup-wizard/data-evaluation/visit-report/visit-report.component.html b/src/app/setup-wizard/data-evaluation/visit-report/visit-report.component.html
@@ -3,7 +3,7 @@
         <div [ngClass]="{'col-10 pt-4 pb-4': !print}">
             <div [ngClass]="{'form-paper shadow': !print}">
                 <h5>
-                    <fa-icon [icon]="faChartPie"></fa-icon>
+                    <fa-icon [icon]="faChartColumn"></fa-icon>
                     On Site Visit Report
                 </h5>
                 <app-on-site-visit-report [onSiteVisit]="onSiteVisit"></app-on-site-visit-report>

diff --git a/src/app/setup-wizard/data-evaluation/visit-report/visit-report.component.ts b/src/app/setup-wizard/data-evaluation/visit-report/visit-report.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-import { IconDefinition, faChartPie, faChevronLeft, faFilePdf, faFolderOpen, faScrewdriverWrench } from '@fortawesome/free-solid-svg-icons';
+import { IconDefinition, faChartColumn, faChevronLeft, faFilePdf, faFolderOpen, faScrewdriverWrench } from '@fortawesome/free-solid-svg-icons';
 import { Subscription } from 'rxjs';
 import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
 import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
@@ -18,9 +18,10 @@ export class VisitReportComponent {
   faChevronLeft: IconDefinition = faChevronLeft;
   faFolderOpen: IconDefinition = faFolderOpen;
   faScrewdriverWrench: IconDefinition = faScrewdriverWrench;
-  faChartPie: IconDefinition = faChartPie;
   faFilePdf: IconDefinition = faFilePdf;
 
+  faChartColumn: IconDefinition = faChartColumn;
+
   onSiteVisit: IdbOnSiteVisit;
   assessments: Array<IdbAssessment>;
     print: boolean;

diff --git a/...any-contacts-setup/company-contacts-setup-form/company-contacts-setup-form.component.html b/...any-contacts-setup/company-contacts-setup-form/company-contacts-setup-form.component.html