diff --git a/src/app/dashboard/assessment.service.ts b/src/app/dashboard/assessment.service.ts index 194fa16df4..1cc0774370 100644 --- a/src/app/dashboard/assessment.service.ts +++ b/src/app/dashboard/assessment.service.ts @@ -195,7 +195,7 @@ export class AssessmentService { }, fsatOperations: { operatingHours: 8760, - cost: 0.06, + cost: settings.electricityCost || .06, }, fanMotor: { lineFrequency: 60, @@ -237,7 +237,7 @@ export class AssessmentService { return newFsat; } - getNewSsmt(): SSMT { + getNewSsmt(settings: Settings): SSMT { return { name: '', setupDone: false, @@ -250,9 +250,9 @@ export class AssessmentService { hoursPerYear: 8760 }, operatingCosts: { - fuelCost: 5.78, + fuelCost: settings.fuelCost || 5.78, makeUpWaterCost: 0.03, - electricityCost: .05, + electricityCost: settings.electricityCost || .05, implementationCosts: 0.0 }, generalSteamOperations: { diff --git a/src/app/shared/create-assessment-modal/create-assessment-modal.component.ts b/src/app/shared/create-assessment-modal/create-assessment-modal.component.ts index 1ccf072b6c..fd0e311d7a 100644 --- a/src/app/shared/create-assessment-modal/create-assessment-modal.component.ts +++ b/src/app/shared/create-assessment-modal/create-assessment-modal.component.ts @@ -163,7 +163,7 @@ export class CreateAssessmentModalComponent { let tmpAssessment: Assessment = this.assessmentService.getNewAssessment('SSMT'); tmpAssessment.name = this.newAssessmentForm.controls.assessmentName.value; tmpAssessment.directoryId = this.newAssessmentForm.controls.directoryId.value; - tmpAssessment.ssmt = this.assessmentService.getNewSsmt(); + tmpAssessment.ssmt = this.assessmentService.getNewSsmt(this.settings); let createdAssessment: Assessment = await firstValueFrom(this.assessmentDbService.addWithObservable(tmpAssessment)); this.finishAndNavigate(createdAssessment, '/ssmt/' + createdAssessment.id); }