pezi_gi/rossa-tech
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor variables and add count for water

Browse Source
This commit is contained in:
Peter Rossa
2023-05-24 08:56:10 +02:00
parent 9574a7c277
commit b7ed293a98
6 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/rossa/api/config/data.sql
View File

@@ -1,7 +1,7 @@
INSERT INTO meters (name) VALUES ('1LOG');
INSERT INTO meters (name) VALUES ('1HEM');
INSERT INTO meters (name) VALUES ('WASSER');
INSERT INTO meters (name) VALUES ('ABWASSER');
INSERT INTO meters (name) VALUES ('GARDEN');
INSERT INTO meter_data (type, date, amount, meter_id) VALUES ('ENERGY', '2022-12-31 00:00:00', 11546.00, 1);
INSERT INTO meter_data (type, date, amount, meter_id) VALUES ('ENERGY', '2022-09-30 00:00:00', 10504.00, 1);

18
rossa-tech-cli/src/app/components/subcomponents/consumption-last-year/consumption-last-year.component.html
View File

@@ -1,7 +1,7 @@
<ng-container *ngIf="type == usageTypes.ENERGY; else water">
<div style="display: flex; flex-direction: column">
<h2>{{type}}</h2>
<h2 class="text-center">{{type}}</h2>
<mat-grid-list cols="2" rowHeight="50px">
<mat-grid-tile>
@@ -23,20 +23,26 @@
<ng-template #water>
<div style="display: flex; flex-direction: column">
<h2>{{type}}</h2>
<h2 class="text-center">{{type}}</h2>
<mat-grid-list cols="2" rowHeight="50px">
<mat-grid-list cols="3" rowHeight="50px">
<mat-grid-tile>
Wasser
</mat-grid-tile>
<mat-grid-tile>
Abwasser
Gartenwasser
</mat-grid-tile>
<mat-grid-tile>
<div>xxxxx</div>
Summe
</mat-grid-tile>
<mat-grid-tile>
<div>xxxxx</div>
<div>{{averageWater}} m³</div>
</mat-grid-tile>
<mat-grid-tile>
<div>{{averageGarden}} m³</div>
</mat-grid-tile>
<mat-grid-tile>
<div>{{averageWater - averageGarden}} m³</div>
</mat-grid-tile>
</mat-grid-list>
</div>

29
rossa-tech-cli/src/app/components/subcomponents/consumption-last-year/consumption-last-year.component.ts
View File

@@ -25,10 +25,12 @@ export class ConsumptionLastYearComponent implements OnChanges {
averageEnergy1Log!: number;
meterDataWasser: MeterData[] = [];
averageWasser!: number;
averageWater!: number;
meterDataAbwasser: MeterData[] = [];
averageDirtyAbwasser!: number;
averageGarden!: number;
currentYear = new Date().getFullYear();
constructor(private globalService: GlobalService) {}
@@ -44,14 +46,13 @@ export class ConsumptionLastYearComponent implements OnChanges {
this.meterDataEnergy1Hem.push(data);
}
});
const currentYear = new Date().getFullYear();
this.meterDataEnergy1Log = this.globalService.sortMeterData(
this.meterDataEnergy1Log
);
this.averageEnergy1Log = this.countAverageAmountForYear(
this.meterDataEnergy1Log,
currentYear - 1
this.currentYear - 1
);
this.meterDataEnergy1Hem = this.globalService.sortMeterData(
@@ -59,7 +60,7 @@ export class ConsumptionLastYearComponent implements OnChanges {
);
this.averageEnergy1Hem = this.countAverageAmountForYear(
this.meterDataEnergy1Hem,
currentYear - 1
this.currentYear - 1
);
}
} else if (this.type && this.type === this.usageTypes.WATER) {
@@ -69,10 +70,26 @@ export class ConsumptionLastYearComponent implements OnChanges {
this.meterData.forEach((data) => {
if (data.meter.name === this.meters['WASSER']) {
this.meterDataWasser.push(data);
} else if (data.meter.name === this.meters['ABWASSER']) {
} else if (data.meter.name === this.meters['GARDEN']) {
this.meterDataAbwasser.push(data);
}
});
this.meterDataWasser = this.globalService.sortMeterData(
this.meterDataWasser
);
this.averageWater = this.countAverageAmountForYear(
this.meterDataWasser,
this.currentYear - 1
);
this.meterDataAbwasser = this.globalService.sortMeterData(
this.meterDataAbwasser
);
this.averageGarden = this.countAverageAmountForYear(
this.meterDataAbwasser,
this.currentYear - 1
);
}
}
}

2
rossa-tech-cli/src/app/constants.ts
View File

@@ -1 +1 @@
export const METERS = ['1LOG', '1HEM', 'WASSER', 'ABWASSER'];
export const METERS = ['1LOG', '1HEM', 'WASSER', 'GARDEN'];

6
rossa-tech-cli/src/app/core/dataModels/Meter.ts
View File

@@ -1,8 +1,8 @@
export class Meter {
id: number;
name: '1LOG' | '1HEM' | 'WASSER' | 'ABWASSER';
name: '1LOG' | '1HEM' | 'WASSER' | 'GARDEN';
constructor(id: number, name: '1LOG' | '1HEM' | 'WASSER' | 'ABWASSER') {
constructor(id: number, name: '1LOG' | '1HEM' | 'WASSER' | 'GARDEN') {
this.id = id;
this.name = name;
}
@@ -12,5 +12,5 @@ export enum Meters {
'1LOG' = '1LOG',
'1HEM' = '1HEM',
'WASSER' = 'WASSER',
'ABWASSER' = 'ABWASSER',
'GARDEN' = 'GARDEN',
}

2
rossa-tech-cli/src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component.ts
View File

@@ -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.ABWASSER || meterName === Meters.WASSER) {
} else if (meterName === Meters.GARDEN || meterName === Meters.WASSER) {
this.usageType = this.usageTypes.WATER;
}
}