From 4b857b9338c50fd6d248ad8dfbca8cefb0f4d6c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Mon, 21 Oct 2024 13:51:23 +0200 Subject: [PATCH] Display headings for DashboardAir + DashboardHeating --- .../air/dashboard-air-tile.component.ts | 23 ++++++++++--------- .../dashboard-heating-tile.component.ts | 21 ++++++++--------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/angular/src/app/pages/dashboard/air/dashboard-air-tile.component.ts b/src/main/angular/src/app/pages/dashboard/air/dashboard-air-tile.component.ts index 166c6b0..0e719f9 100644 --- a/src/main/angular/src/app/pages/dashboard/air/dashboard-air-tile.component.ts +++ b/src/main/angular/src/app/pages/dashboard/air/dashboard-air-tile.component.ts @@ -31,17 +31,18 @@ export class DashboardAirTileComponent { const heatingRoomVentColor = heatingRoomVent ? 'red' : ''; return [ - new DisplayValue('Garten Temperatur', this.seriesCacheService.outdoorTemperature, ''), - new DisplayValue('Garten Feucht. Relativ', this.seriesCacheService.outdoorHumidityRelative, ''), - new DisplayValue('Garten Feucht. Absolut', this.seriesCacheService.outdoorHumidityAbsolute, ''), - null, - new DisplayValue('Schlaf. Temperatur', this.seriesCacheService.schlafzimmerTemperature, ''), - new DisplayValue('Schlaf. Feucht. Relativ', this.seriesCacheService.schlafzimmerHumidityRelative, ''), - new DisplayValue('Schlaf. Feucht. Absolut', this.seriesCacheService.schlafzimmerHumidityAbsolute, bedroomVentColor), - null, - new DisplayValue('Heiz. Temperatur', this.seriesCacheService.heatingRoomTemperature, ''), - new DisplayValue('Heiz. Feucht. Relativ', this.seriesCacheService.heatingRoomHumidityRelative, ''), - new DisplayValue('Heiz. Feucht. Absolut', this.seriesCacheService.heatingRoomHumidityAbsolute, heatingRoomVentColor), + 'Garten', + new DisplayValue('Temperatur', this.seriesCacheService.outdoorTemperature, ''), + new DisplayValue('Luftfeuchte Relativ', this.seriesCacheService.outdoorHumidityRelative, ''), + new DisplayValue('Luftfeuchte Absolut', this.seriesCacheService.outdoorHumidityAbsolute, ''), + 'Schlafzimmer', + new DisplayValue('Temperatur', this.seriesCacheService.schlafzimmerTemperature, ''), + new DisplayValue('Luftfeuchte Relativ', this.seriesCacheService.schlafzimmerHumidityRelative, ''), + new DisplayValue('Luftfeuchte Absolut', this.seriesCacheService.schlafzimmerHumidityAbsolute, bedroomVentColor), + 'Heizungskeller', + new DisplayValue('Temperatur', this.seriesCacheService.heatingRoomTemperature, ''), + new DisplayValue('Luftfeuchte Relativ', this.seriesCacheService.heatingRoomHumidityRelative, ''), + new DisplayValue('Luftfeuchte Absolut', this.seriesCacheService.heatingRoomHumidityAbsolute, heatingRoomVentColor), ]; } diff --git a/src/main/angular/src/app/pages/dashboard/heating/dashboard-heating-tile.component.ts b/src/main/angular/src/app/pages/dashboard/heating/dashboard-heating-tile.component.ts index b35bf41..3cb6102 100644 --- a/src/main/angular/src/app/pages/dashboard/heating/dashboard-heating-tile.component.ts +++ b/src/main/angular/src/app/pages/dashboard/heating/dashboard-heating-tile.component.ts @@ -30,17 +30,16 @@ export class DashboardHeatingTileComponent { getDisplayList(): Display[] { return [ new DisplayValue('Abgas', this.seriesCacheService.heatingExhaustTemperature, this.seriesCacheService.heatingExhaustTemperature.color(WARM, HOT, '')), - null, - new DisplayValue('Heizkreis Vorlauf', this.seriesCacheService.heatingLoopSupplyTemperature, this.seriesCacheService.heatingLoopSupplyTemperature.color(WARM, HOT)), - new DisplayValue('Heizkreis Rücklauf', this.seriesCacheService.heatingLoopReturnTemperature, this.seriesCacheService.heatingLoopReturnTemperature.color(WARM, HOT)), - null, - new DisplayValue('Puffer Vorlauf', this.seriesCacheService.heatingBufferSupplyTemperature, this.seriesCacheService.heatingBufferSupplyTemperature.color(WARM, HOT)), - new DisplayValue('Puffer Rücklauf', this.seriesCacheService.heatingBufferReturnTemperature, this.seriesCacheService.heatingBufferReturnTemperature.color(WARM, HOT)), - null, - new DisplayValue('Puffer Kalt', this.seriesCacheService.heatingBufferColdTemperature, this.seriesCacheService.heatingBufferColdTemperature.color(WARM, HOT)), - new DisplayValue('Puffer Speicher', this.seriesCacheService.heatingBufferInnerTemperature, this.seriesCacheService.heatingBufferInnerTemperature.color(WARM, HOT)), - new DisplayValue('Puffer Warm', this.seriesCacheService.heatingBufferHotTemperature, this.seriesCacheService.heatingBufferHotTemperature.color(WARM, HOT)), - new DisplayValue('Puffer Zirkulation', this.seriesCacheService.heatingBufferCirculationTemperature, this.seriesCacheService.heatingBufferCirculationTemperature.color(WARM, HOT)), + 'Heizkreis', + new DisplayValue('Vorlauf', this.seriesCacheService.heatingLoopSupplyTemperature, this.seriesCacheService.heatingLoopSupplyTemperature.color(WARM, HOT)), + new DisplayValue('Rücklauf', this.seriesCacheService.heatingLoopReturnTemperature, this.seriesCacheService.heatingLoopReturnTemperature.color(WARM, HOT)), + 'Puffer', + new DisplayValue('Vorlauf', this.seriesCacheService.heatingBufferSupplyTemperature, this.seriesCacheService.heatingBufferSupplyTemperature.color(WARM, HOT)), + new DisplayValue('Rücklauf', this.seriesCacheService.heatingBufferReturnTemperature, this.seriesCacheService.heatingBufferReturnTemperature.color(WARM, HOT)), + new DisplayValue('Speicher', this.seriesCacheService.heatingBufferInnerTemperature, this.seriesCacheService.heatingBufferInnerTemperature.color(WARM, HOT)), + new DisplayValue('Eingang', this.seriesCacheService.heatingBufferColdTemperature, this.seriesCacheService.heatingBufferColdTemperature.color(WARM, HOT)), + new DisplayValue('Ausgang', this.seriesCacheService.heatingBufferHotTemperature, this.seriesCacheService.heatingBufferHotTemperature.color(WARM, HOT)), + new DisplayValue('Zirkulation', this.seriesCacheService.heatingBufferCirculationTemperature, this.seriesCacheService.heatingBufferCirculationTemperature.color(WARM, HOT)), ]; }