From 1eb1e1df7679d2dfc5772c9004d2ccb55032d676 Mon Sep 17 00:00:00 2001 From: Peter Rossa Date: Fri, 2 Jun 2023 07:19:14 +0200 Subject: [PATCH] Rename variable --- .../consumption-last-year.component.ts | 2 +- rossa-tech-cli/src/app/constants.ts | 2 +- rossa-tech-cli/src/app/core/dataModels/Meter.ts | 6 +++--- .../meter-data-add-dialog.component.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rossa-tech-cli/src/app/components/subcomponents/consumption-last-year/consumption-last-year.component.ts b/rossa-tech-cli/src/app/components/subcomponents/consumption-last-year/consumption-last-year.component.ts index bff1b6c..77f0b1a 100644 --- a/rossa-tech-cli/src/app/components/subcomponents/consumption-last-year/consumption-last-year.component.ts +++ b/rossa-tech-cli/src/app/components/subcomponents/consumption-last-year/consumption-last-year.component.ts @@ -68,7 +68,7 @@ export class ConsumptionLastYearComponent implements OnChanges { if (this.meterData) { this.meterData.forEach((data) => { - if (data.meter.name === this.meters['WASSER']) { + if (data.meter.name === this.meters['WATER']) { this.meterDataWasser.push(data); } else if (data.meter.name === this.meters['GARDEN']) { this.meterDataAbwasser.push(data); diff --git a/rossa-tech-cli/src/app/constants.ts b/rossa-tech-cli/src/app/constants.ts index dd6963b..4bdd695 100644 --- a/rossa-tech-cli/src/app/constants.ts +++ b/rossa-tech-cli/src/app/constants.ts @@ -1 +1 @@ -export const METERS = ['1LOG', '1HEM', 'WASSER', 'GARDEN']; +export const METERS = ['1LOG', '1HEM', 'WATER', 'GARDEN']; diff --git a/rossa-tech-cli/src/app/core/dataModels/Meter.ts b/rossa-tech-cli/src/app/core/dataModels/Meter.ts index d3f7043..8139b18 100644 --- a/rossa-tech-cli/src/app/core/dataModels/Meter.ts +++ b/rossa-tech-cli/src/app/core/dataModels/Meter.ts @@ -1,8 +1,8 @@ export class Meter { id: number; - name: '1LOG' | '1HEM' | 'WASSER' | 'GARDEN'; + name: '1LOG' | '1HEM' | 'WATER' | 'GARDEN'; - constructor(id: number, name: '1LOG' | '1HEM' | 'WASSER' | 'GARDEN') { + constructor(id: number, name: '1LOG' | '1HEM' | 'WATER' | 'GARDEN') { this.id = id; this.name = name; } @@ -11,6 +11,6 @@ export class Meter { export enum Meters { '1LOG' = '1LOG', '1HEM' = '1HEM', - 'WASSER' = 'WASSER', + 'WATER' = 'WATER', 'GARDEN' = 'GARDEN', } diff --git a/rossa-tech-cli/src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component.ts b/rossa-tech-cli/src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component.ts index 60f5f01..d070044 100644 --- a/rossa-tech-cli/src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component.ts +++ b/rossa-tech-cli/src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component.ts @@ -57,7 +57,7 @@ export class MeterDataAddDialogComponent implements OnInit { setUsageType(meterName: string): void { if (meterName === Meters['1HEM'] || meterName === Meters['1LOG']) { this.usageType = this.usageTypes.ENERGY; - } else if (meterName === Meters.GARDEN || meterName === Meters.WASSER) { + } else if (meterName === Meters.GARDEN || meterName === Meters.WATER) { this.usageType = this.usageTypes.WATER; } }