Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/app/core-components/welcome/welcome.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
Below is a list of the latest visits conducted in JUSTIFI so you can jump back in.
Just click the "<fa-icon [icon]="faWandMagicSparkles"></fa-icon>" button.
</p>
<ng-template [ngIf]="onSiteVisits.length > 0" [ngIfElse]="noVisitsBlock">
<ng-template [ngIf]="(onSiteVisits | filterArchivedVisits: facilities)?.length > 0" [ngIfElse]="noVisitsBlock">
<table class="table table-bordered">
<thead>
<tr>
Expand All @@ -85,7 +85,7 @@
</tr>
</thead>
<tbody>
<tr *ngFor="let visit of onSiteVisits">
<tr *ngFor="let visit of onSiteVisits | filterArchivedVisits: facilities">
<td>
<a [routerLink]="'/portfolio/facility/'+visit.facilityId">
{{visit.facilityId | facilityName: facilities}}
Expand Down
3 changes: 2 additions & 1 deletion src/app/models/contact.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ export interface IdbContact extends IdbEntry {
energyEquipmentIds: Array<string>,
kpiIds: Array<string>,
userId: string,
notes: string
notes: string,
archivedFacilityId?: string
}

export function getNewIdbContact(userId: string, companyId: string): IdbContact {
Expand Down
5 changes: 4 additions & 1 deletion src/app/models/facility.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ export interface IdbFacility extends IdbEntry {
financialMetricsUsed: string,
efficiencyIncentives: string,
dependentFunding: string,
isExample?: boolean
isExample?: boolean,
isArchived?: boolean,
archivedDate?: Date,
originalFacilityId?: string
}

export function getNewIdbFacility(userId: string, companyId: string): IdbFacility {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h5>
</button>
</div>
</div>
<ng-template [ngIf]="companyContacts.length > 0" [ngIfElse]="noContactsBlock">
<ng-template [ngIf]="selectedFacility && (companyContacts | filterArchivedContacts: selectedFacility).length > 0" [ngIfElse]="noContactsBlock">
<table class="table table-bordered table-hover table-sm">
<thead>
<tr>
Expand All @@ -33,7 +33,7 @@ <h5>
</tr>
</thead>
<tbody>
<tr *ngFor="let contact of companyContacts">
<tr *ngFor="let contact of companyContacts | filterArchivedContacts: selectedFacility">
<td>
<a class="click-link" (click)="goToContact(contact)">
{{contact | contactNameDisplay}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import * as _ from 'lodash';

import { FormGroup } from '@angular/forms';
import { CompanyContactsFormService } from 'src/app/shared/shared-company-forms/company-contacts-form/company-contacts-form.service';
import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
import { IdbFacility } from 'src/app/models/facility';

@Component({
selector: 'app-manage-company-contacts',
Expand All @@ -27,6 +29,9 @@ export class ManageCompanyContactsComponent {
selectedCompany: IdbCompany;
selectedCompanySub: Subscription;

selectedFacility: IdbFacility;
selectedFacilitySub: Subscription;

faChevronRight: IconDefinition = faChevronRight;
faChevronLeft: IconDefinition = faChevronLeft;
faAddressBook: IconDefinition = faAddressBook;
Expand All @@ -36,10 +41,12 @@ export class ManageCompanyContactsComponent {

onSiteVisit: IdbOnSiteVisit;
onSiteVisitSub: Subscription;

constructor(private router: Router,
private companyIdbService: CompanyIdbService,
private contactIdbService: ContactIdbService,
private onSiteVisitIdbService: OnSiteVisitIdbService
private onSiteVisitIdbService: OnSiteVisitIdbService,
private facilityIdbService: FacilityIdbService
) {
}

Expand All @@ -48,18 +55,26 @@ export class ManageCompanyContactsComponent {
this.selectedCompany = _company;
});

this.selectedFacilitySub = this.facilityIdbService.selectedFacility.subscribe(facility => {
this.selectedFacility = facility;
});

this.contactsSub = this.contactIdbService.contacts.subscribe(_contacts => {
this.companyContacts = _contacts.filter(c => { return c.companyId == this.selectedCompany.guid });
});

this.onSiteVisitSub = this.onSiteVisitIdbService.selectedVisit.subscribe(visit => {
this.onSiteVisit = visit;
})
});
}

ngOnDestroy() {
if (this.selectedCompanySub) {
this.selectedCompanySub.unsubscribe();
}
if (this.selectedFacilitySub) {
this.selectedFacilitySub.unsubscribe();
}
if (this.contactsSub) {
this.contactsSub.unsubscribe();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</a>
</div>
<div class="nav-item"
*ngFor="let contact of company.guid | associatedContacts:'company':contacts">
*ngFor="let contact of (company.guid | associatedContacts:'company':contacts) | filterArchivedContacts: facility">
<a class="nav-link"
[routerLink]="'pre-visit/'+onSiteVisit.guid+'/company-contacts/'+contact.guid"
[routerLinkActive]="['active']">
Expand Down Expand Up @@ -351,6 +351,17 @@
</a>
</div>

<div class="w-100">
<hr class="spacer">
</div>

<div class="nav-item">
<a class="nav-link bold" (click)="openArchiveFacilityModal()">
<fa-icon [icon]="faBoxArchive"></fa-icon>
Archive Facility
</a>
</div>

<div class="w-100">
<hr class="spacer">
</div>
Expand Down Expand Up @@ -383,4 +394,29 @@
<button class="btn nav-btn btn-sm" (click)="goToPortfolio()"><fa-icon [icon]="faFolderOpen"></fa-icon>
Go to Portfolio</button>
</div>
</div>

<div [ngClass]="{'window-overlay': displayArchiveModal}"></div>
<div class="popup" [ngClass]="{'open': displayArchiveModal }">
<div class="popup-header">Archive Facility
<button type="button" class="btn-close float-end" aria-label="Close" (click)="closeArchiveModal()"></button>
</div>
<div class="popup-body">
<div class="alert alert-warning p-2">
<strong>Create Historical Snapshot</strong><br>
This will create a complete copy of <strong>{{facility?.generalInformation?.name}}</strong> and all its associated data (KPIs, equipment, assessments, contacts, etc.) as a historical snapshot.
</div>
<div class="form-group mt-3">
<label for="archiveName" class="form-label"><strong>Archive Name:</strong></label>
<input type="text" class="form-control" id="archiveName" [(ngModel)]="archiveFacilityName"
[placeholder]="facility?.generalInformation?.name + ' (Archived ' + currentDate + ')'" />
<hr>
</div>
<div class="popup-footer d-flex justify-content-end">
<button class="btn btn-secondary btn-sm me-2" (click)="closeArchiveModal()">Cancel</button>
<button class="btn btn-primary btn-sm" (click)="confirmArchive()">
<fa-icon [icon]="faBoxArchive"></fa-icon>
Create Archive
</button>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
import { NavItemActivePipe } from './nav-item-active.pipe';
import { FormsModule } from '@angular/forms';

describe('SetupWizardSidebarComponent', () => {
let component: SetupWizardSidebarComponent;
let fixture: ComponentFixture<SetupWizardSidebarComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [RouterTestingModule, FontAwesomeModule, HelperPipesModule],
imports: [RouterTestingModule, FontAwesomeModule, HelperPipesModule, FormsModule],
declarations: [SetupWizardSidebarComponent, NavItemActivePipe],
providers: stubServiceProviders
})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChangeDetectorRef, Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
import { NavigationEnd, Router } from '@angular/router';
import { IconDefinition, faChevronDown, faFolderOpen, faCircleExclamation, faChevronCircleRight, faChevronCircleLeft, faGear, faChevronRight, faUser, faAddressBook, faMagnifyingGlassPlus, faBullseye, faList, faSplotch, faCube, faFileCircleCheck, faScrewdriverWrench, faFileLines, faWeightHanging, faChartPie, faPersonWalkingArrowLoopLeft, faChartColumn, faClipboardQuestion, faFilePen, faSackDollar, faUpload, faWandMagicSparkles } from '@fortawesome/free-solid-svg-icons';
import { IconDefinition, faChevronDown, faFolderOpen, faCircleExclamation, faChevronCircleRight, faChevronCircleLeft, faGear, faChevronRight, faUser, faAddressBook, faMagnifyingGlassPlus, faBullseye, faList, faSplotch, faCube, faFileCircleCheck, faScrewdriverWrench, faFileLines, faWeightHanging, faChartPie, faPersonWalkingArrowLoopLeft, faChartColumn, faClipboardQuestion, faFilePen, faSackDollar, faUpload, faWandMagicSparkles, faBoxArchive } from '@fortawesome/free-solid-svg-icons';
import { SetupWizardService } from '../setup-wizard.service';
import { firstValueFrom, Subscription } from 'rxjs';
import { IdbAssessment } from 'src/app/models/assessment';
Expand All @@ -23,6 +23,8 @@ import { IdbEnergyOpportunity } from 'src/app/models/energyOpportunity';
import { EnergyOpportunityIdbService } from 'src/app/indexed-db/energy-opportunity-idb.service';
import { IdbReport } from 'src/app/models/report';
import { ReportIdbService } from 'src/app/indexed-db/report-idb.service';
import { BackupDataService } from 'src/app/shared/shared-services/backup-data.service';
import { ToastNotificationsService } from 'src/app/core-components/toast-notifications/toast-notifications.service';

@Component({
selector: 'app-setup-wizard-sidebar',
Expand Down Expand Up @@ -61,8 +63,12 @@ export class SetupWizardSidebarComponent implements OnInit, OnDestroy {
faSackDollar: IconDefinition = faSackDollar;
faUpload: IconDefinition = faUpload;
faWandMagicSparkles: IconDefinition = faWandMagicSparkles;
faBoxArchive: IconDefinition = faBoxArchive;

displayPortfolioModal: boolean;
displayArchiveModal: boolean = false;
archiveFacilityName: string = '';
currentDate: string = new Date().toISOString().split('T')[0];

assessmentsSub: Subscription;
assessments: Array<IdbAssessment>;
Expand Down Expand Up @@ -114,7 +120,9 @@ export class SetupWizardSidebarComponent implements OnInit, OnDestroy {
private energyEquipmentIdbService: EnergyEquipmentIdbService,
private processEquipmentIdbService: ProcessEquipmentIdbService,
private energyOpportunityIdbService: EnergyOpportunityIdbService,
private reportIdbService: ReportIdbService
private reportIdbService: ReportIdbService,
private backupDataService: BackupDataService,
private toastNotificationsService: ToastNotificationsService
) {

}
Expand Down Expand Up @@ -169,7 +177,7 @@ export class SetupWizardSidebarComponent implements OnInit, OnDestroy {
});
this.reportsSub = this.reportIdbService.reports.subscribe(reports => {
this.reports = reports;
})
});
}

ngOnDestroy() {
Expand Down Expand Up @@ -309,4 +317,29 @@ export class SetupWizardSidebarComponent implements OnInit, OnDestroy {
this.onSiteVisit.sidebarReportsOpen = !this.onSiteVisit.sidebarReportsOpen;
await this.onSiteVisitIdbService.asyncUpdate(this.onSiteVisit);
}

openArchiveFacilityModal() {
this.archiveFacilityName = ''; // Reset to use default naming
this.displayArchiveModal = true;
}

closeArchiveModal() {
this.displayArchiveModal = false;
this.archiveFacilityName = '';
}

async confirmArchive() {
try {
const archiveName = this.archiveFacilityName.trim() || undefined;
const archivedFacility = await this.backupDataService.createFacilityArchive(
this.facility.guid,
archiveName
);
this.toastNotificationsService.showToast('Facility Archived', undefined, 'bg-success', true, false);
this.closeArchiveModal();
} catch (error) {
console.error('Error archiving facility:', error);
this.toastNotificationsService.showToast('Archive Failed', undefined, 'bg-danger', true, false);
}
}
}
3 changes: 2 additions & 1 deletion src/app/setup-wizard/setup-wizard.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { HelperPipesModule } from '../shared/helper-pipes/_helper-pipes.module';
import { NavItemActivePipe } from './setup-wizard-sidebar/nav-item-active.pipe';
import { AssociatedContactsModule } from '../shared/associated-contacts/associated-contacts.module';
import { SetupWizardSidePanelModule } from './setup-wizard-side-panel/setup-wizard-side-panel.module';
import { FormsModule } from '@angular/forms';

describe('SetupWizardComponent', () => {
let component: SetupWizardComponent;
Expand All @@ -17,7 +18,7 @@ describe('SetupWizardComponent', () => {


await TestBed.configureTestingModule({
imports: [RouterTestingModule, AssociatedContactsModule, FontAwesomeModule, HelperPipesModule, SetupWizardSidePanelModule],
imports: [RouterTestingModule, AssociatedContactsModule, FontAwesomeModule, HelperPipesModule, SetupWizardSidePanelModule, FormsModule],
declarations: [SetupWizardComponent, SetupWizardSidebarComponent, NavItemActivePipe],
providers: stubServiceProviders
})
Expand Down
11 changes: 10 additions & 1 deletion src/app/shared/helper-pipes/_helper-pipes.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ import { ReportTypeDisplayPipe } from './report-type-display.pipe';
import { IsUtilityTrackedPipe } from './is-utility-tracked.pipe';
import { KeywordHighlightPipe } from './keyword-highlight.pipe';
import { DisplayRoundedValuesPipe } from './display-rounded-values.pipe';
import { FacilityArchivedPipe } from './facility-archived.pipe';
import { FilterArchivedVisitsPipe } from './filter-archived-visits.pipe';
import { FilterArchivedContactsPipe } from './filter-archived-contacts.pipe';

@NgModule({
declarations: [
Expand Down Expand Up @@ -110,6 +113,9 @@ import { DisplayRoundedValuesPipe } from './display-rounded-values.pipe';
IsUtilityTrackedPipe,
KeywordHighlightPipe,
DisplayRoundedValuesPipe,
FacilityArchivedPipe,
FilterArchivedVisitsPipe,
FilterArchivedContactsPipe,
],
imports: [
CommonModule
Expand Down Expand Up @@ -171,7 +177,10 @@ import { DisplayRoundedValuesPipe } from './display-rounded-values.pipe';
ReportTypeDisplayPipe,
IsUtilityTrackedPipe,
KeywordHighlightPipe,
DisplayRoundedValuesPipe
DisplayRoundedValuesPipe,
FacilityArchivedPipe,
FilterArchivedVisitsPipe,
FilterArchivedContactsPipe
]
})
export class HelperPipesModule { }
8 changes: 8 additions & 0 deletions src/app/shared/helper-pipes/facility-archived.pipe.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { FacilityArchivedPipe } from './facility-archived.pipe';

describe('FacilityArchivedPipe', () => {
it('create an instance', () => {
const pipe = new FacilityArchivedPipe();
expect(pipe).toBeTruthy();
});
});
18 changes: 18 additions & 0 deletions src/app/shared/helper-pipes/facility-archived.pipe.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { Pipe, PipeTransform } from '@angular/core';
import { IdbFacility } from 'src/app/models/facility';

@Pipe({
name: 'facilityArchived',
standalone: false
})
export class FacilityArchivedPipe implements PipeTransform {

transform(facilityId: string, facilities: Array<IdbFacility>): boolean {
if (!facilities || !facilityId) {
return false;
}
const facility = facilities.find(f => f.guid === facilityId);
return facility?.isArchived || false;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { FilterArchivedContactsPipe } from './filter-archived-contacts.pipe';

describe('FilterArchivedContactsPipe', () => {
it('create an instance', () => {
const pipe = new FilterArchivedContactsPipe();
expect(pipe).toBeTruthy();
});
});
23 changes: 23 additions & 0 deletions src/app/shared/helper-pipes/filter-archived-contacts.pipe.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { Pipe, PipeTransform } from '@angular/core';
import { IdbContact } from 'src/app/models/contact';
import { IdbFacility } from 'src/app/models/facility';

@Pipe({
name: 'filterArchivedContacts',
standalone: false
})
export class FilterArchivedContactsPipe implements PipeTransform {

transform(contacts: Array<IdbContact>, facility: IdbFacility): Array<IdbContact> {
if (!contacts || !facility) {
return contacts || [];
}

if (facility.isArchived) {
return contacts.filter(contact => contact.archivedFacilityId === facility.guid);
} else {
return contacts.filter(contact => !contact.archivedFacilityId);
}
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

import { FilterArchivedVisitsPipe } from './filter-archived-visits.pipe';

describe('FilterArchivedVisitsPipe', () => {
it('create an instance', () => {
const pipe = new FilterArchivedVisitsPipe();
expect(pipe).toBeTruthy();
});
});
Loading
Loading