diff --git a/src/main/angular/public/air.svg b/src/main/angular/public/air.svg index a27837a..78f58ce 100644 --- a/src/main/angular/public/air.svg +++ b/src/main/angular/public/air.svg @@ -1,2 +1,5 @@ - \ No newline at end of file + + + + 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 c809470..0a5ec55 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 @@ -24,10 +24,20 @@ export class DashboardAirTileComponent { } getDisplayList(): DisplayOrSeparator[] { + const bedroomVent = this.seriesService.schlafzimmerHumidityAbsolute !== null && this.seriesService.schlafzimmerHumidityAbsolute.value !== null + && this.seriesService.outdoorHumidityAbsolute !== null && this.seriesService.outdoorHumidityAbsolute.value !== null + && this.seriesService.schlafzimmerHumidityAbsolute.value > this.seriesService.outdoorHumidityAbsolute.value; + const bedroomVentColor = bedroomVent ? 'red' : ''; + + const heatingRoomVent = this.seriesService.heatingRoomHumidityAbsolute !== null && this.seriesService.heatingRoomHumidityAbsolute.value !== null + && this.seriesService.outdoorHumidityAbsolute !== null && this.seriesService.outdoorHumidityAbsolute.value !== null + && this.seriesService.heatingRoomHumidityAbsolute.value > this.seriesService.outdoorHumidityAbsolute.value; + const heatingRoomVentColor = heatingRoomVent ? 'red' : ''; + return [ new Display('Schlaf. Temperatur', '', this.seriesService.schlafzimmerTemperature), new Display('Schlaf. Feucht. Relativ', '', this.seriesService.schlafzimmerHumidityRelative), - new Display('Schlaf. Feucht. Absolut', '', this.seriesService.schlafzimmerHumidityAbsolute), + new Display('Schlaf. Feucht. Absolut', bedroomVentColor, this.seriesService.schlafzimmerHumidityAbsolute), null, new Display('Garten Temperatur', '', this.seriesService.outdoorTemperature), new Display('Garten Feucht. Relativ', '', this.seriesService.outdoorHumidityRelative), @@ -35,7 +45,7 @@ export class DashboardAirTileComponent { null, new Display('Heiz. Temperatur', '', this.seriesService.heatingRoomTemperature), new Display('Heiz. Feucht. Relativ', '', this.seriesService.heatingRoomHumidityRelative), - new Display('Heiz. Feucht. Absolut', '', this.seriesService.heatingRoomHumidityAbsolute), + new Display('Heiz. Feucht. Absolut', heatingRoomVentColor, this.seriesService.heatingRoomHumidityAbsolute), ]; }