Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update review pre-visit with energy use totals #363

Merged
merged 2 commits into from
Jan 22, 2025
Merged

update review pre-visit with energy use totals #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab3f722
update review pre-visit with energy use totals
rmroot Jan 21, 2025
50cad3e
all tests passing
rmroot Jan 21, 2025
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
68 changes: 45 additions & 23 deletions ...t/review-pre-visit-setup/facility-details-summary/facility-details-summary.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ <h6 class="bold">Tracked Utilities</h6>
Utility
</th>
<th>
Unit
Unit Price
</th>
<th>
Unit Price
Energy/Utility Use
</th>
</tr>
</thead>
Expand All @@ -61,91 +61,113 @@ <h6 class="bold">Tracked Utilities</h6>
<td>
Electricity
</td>
<td>
<span [innerHTML]="facility.unitSettings.electricityUnit | unitsDisplay"></span>
</td>
<td>
{{facility.unitSettings.electricityPrice}} &dollar;/<span
[innerHTML]="facility.unitSettings.electricityUnit | unitsDisplay"></span>
</td>
<td>
<app-single-cell-item [numValue]="facility.unitSettings.electricityUse"></app-single-cell-item>
<span [innerHTML]="facility.unitSettings.electricityUnit | unitsDisplay"></span>
</td>
</tr>
<tr *ngIf="facility.unitSettings.includeNaturalGas">
<td>
Natural Gas
</td>
<td>
<span [innerHTML]="facility.unitSettings.naturalGasUnit | unitsDisplay"></span>
</td>
<td>
{{facility.unitSettings.naturalGasPrice}} &dollar;/<span
[innerHTML]="facility.unitSettings.naturalGasUnit | unitsDisplay"></span>
</td>
<td>
<app-single-cell-item [numValue]="facility.unitSettings.naturalGasUse"></app-single-cell-item>
<span [innerHTML]="facility.unitSettings.naturalGasUnit | unitsDisplay"></span>
</td>
</tr>

<tr *ngIf="facility.unitSettings.includeOtherFuels">
<td>
Other Fuel
</td>
<td>
<span [innerHTML]="facility.unitSettings.otherFuelsUnit | unitsDisplay"></span>
</td>
<td>
{{facility.unitSettings.otherFuelsPrice}} &dollar;/<span
[innerHTML]="facility.unitSettings.otherFuelsUnit | unitsDisplay"></span>
</td>
<td>
<app-single-cell-item [numValue]="facility.unitSettings.otherFuelsUse"></app-single-cell-item>
<span [innerHTML]="facility.unitSettings.otherFuelsUnit | unitsDisplay"></span>
</td>
</tr>

<tr *ngIf="facility.unitSettings.includeWater">
<td>
Water
</td>
<td>
<span [innerHTML]="facility.unitSettings.waterUnit | unitsDisplay"></span>
</td>
<td>
{{facility.unitSettings.waterPrice}} &dollar;/<span
[innerHTML]="facility.unitSettings.waterUnit | unitsDisplay"></span>
</td>
<td>
<app-single-cell-item [numValue]="facility.unitSettings.waterUse"></app-single-cell-item>
<span [innerHTML]="facility.unitSettings.waterUnit | unitsDisplay"></span>
</td>
</tr>

<tr *ngIf="facility.unitSettings.includeWasteWater">
<td>
Waste Water
</td>
<td>
<span [innerHTML]="facility.unitSettings.wasteWaterUnit | unitsDisplay"></span>
</td>
<td>
{{facility.unitSettings.wasteWaterPrice}} &dollar;/<span
[innerHTML]="facility.unitSettings.wasteWaterUnit | unitsDisplay"></span>
</td>
<td>
<app-single-cell-item [numValue]="facility.unitSettings.wasteWaterUse"></app-single-cell-item>
<span [innerHTML]="facility.unitSettings.wasteWaterUnit | unitsDisplay"></span>
</td>
</tr>

<tr *ngIf="facility.unitSettings.includeSteam">
<td>
Steam (as Utility)
</td>
<td>
<span [innerHTML]="facility.unitSettings.steamUnit | unitsDisplay"></span>
</td>
<td>
{{facility.unitSettings.steamPrice}} &dollar;/<span
[innerHTML]="facility.unitSettings.steamUnit | unitsDisplay"></span>
</td>
<td>
<app-single-cell-item [numValue]="facility.unitSettings.steamUse"></app-single-cell-item>
<span [innerHTML]="facility.unitSettings.steamUnit | unitsDisplay"></span>
</td>
</tr>

<tr *ngIf="facility.unitSettings.includeCompressedAir">
<td>
Compressed Air (as Utility)
</td>
<td>
<span [innerHTML]="facility.unitSettings.compressedAirUnit | unitsDisplay"></span>
</td>
<td>
{{facility.unitSettings.compressedAirPrice}} &dollar;/<span
[innerHTML]="facility.unitSettings.compressedAirUnit | unitsDisplay"></span>
</td>
<td>
<app-single-cell-item [numValue]="facility.unitSettings.compressedAirUse"></app-single-cell-item>
<span [innerHTML]="facility.unitSettings.compressedAirUnit | unitsDisplay"></span>
</td>
</tr>
</tbody>
</table>
<div class="d-flex flex-column">
<div>
<label class="bold">
Total Energy Use:
</label>
{{ facility.energyUse | number: '1.0-2' }}
<span [innerHTML]="companyEnergyUnit | unitsDisplay"></span>
</div>
<div>
<label class="bold">
Annual Utility Cost:
</label>
{{ facility.cost | currency:'USD':'symbol':'1.0-2' }}
</div>
</div>
</div>
13 changes: 4 additions & 9 deletions ...eview-pre-visit-setup/facility-details-summary/facility-details-summary.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,18 @@ import { FacilityDetailsSummaryComponent } from './facility-details-summary.comp
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
import { BehaviorSubject } from 'rxjs';
import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
import { TableEntriesModule } from 'src/app/shared/table-entries/table-entries.module';

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

let facilityIdbService: Partial<FacilityIdbService> = {
selectedFacility: new BehaviorSubject<IdbFacility>(getNewIdbFacility('', ''))
};
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [FontAwesomeModule, HelperPipesModule],
imports: [FontAwesomeModule, HelperPipesModule, TableEntriesModule],
declarations: [FacilityDetailsSummaryComponent],
providers: [
{ provide: FacilityIdbService, useValue: facilityIdbService }
]
providers: stubServiceProviders
})
.compileComponents();

Expand Down
9 changes: 8 additions & 1 deletion ...sit/review-pre-visit-setup/facility-details-summary/facility-details-summary.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { Component } from '@angular/core';
import { IconDefinition, faIndustry } from '@fortawesome/free-solid-svg-icons';
import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
import { IdbCompany } from 'src/app/models/company';
import { IdbFacility } from 'src/app/models/facility';

@Component({
Expand All @@ -12,11 +14,16 @@ export class FacilityDetailsSummaryComponent {

facility: IdbFacility;
faIndustry: IconDefinition = faIndustry;
constructor(private facilityIdbService: FacilityIdbService){
companyEnergyUnit: string;
constructor(private facilityIdbService: FacilityIdbService,
private companyIdbService: CompanyIdbService
){

}

ngOnInit(){
this.facility = this.facilityIdbService.selectedFacility.getValue();
let company: IdbCompany = this.companyIdbService.selectedCompany.getValue();
this.companyEnergyUnit = company.companyEnergyUnit;
}
}
Loading