patrick/Data-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

heating colors 2

Browse Source
This commit is contained in:
Patrick Haßel 2024-10-18 14:15:07 +02:00
parent 86735ba867
commit 91837cbc34
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/angular/src/app/pages/dashboard/air/dashboard-air-tile.component.ts
View File

@ -35,14 +35,14 @@ export class DashboardAirTileComponent {
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', bedroomVentColor, this.seriesService.schlafzimmerHumidityAbsolute),
null,
new Display('Garten Temperatur', '', this.seriesService.outdoorTemperature),
new Display('Garten Feucht. Relativ', '', this.seriesService.outdoorHumidityRelative),
new Display('Garten Feucht. Absolut', '', this.seriesService.outdoorHumidityAbsolute),
null,
new Display('Schlaf. Temperatur', '', this.seriesService.schlafzimmerTemperature),
new Display('Schlaf. Feucht. Relativ', '', this.seriesService.schlafzimmerHumidityRelative),
new Display('Schlaf. Feucht. Absolut', bedroomVentColor, this.seriesService.schlafzimmerHumidityAbsolute),
null,
new Display('Heiz. Temperatur', '', this.seriesService.heatingRoomTemperature),
new Display('Heiz. Feucht. Relativ', '', this.seriesService.heatingRoomHumidityRelative),
new Display('Heiz. Feucht. Absolut', heatingRoomVentColor, this.seriesService.heatingRoomHumidityAbsolute),

36
src/main/angular/src/app/pages/dashboard/heating/dashboard-heating-tile.component.ts
View File

@ -3,6 +3,14 @@ import {ValuesTileComponent} from "../../../shared/values-tile/values-tile.compo
import {Display, DisplayOrSeparator, IValue} from "../../../api/series/IValue";
import {SeriesService} from "../../../api/series/series.service";
const EXHAUST_WARM = 40;
const EXHAUST_HOT = 90;
const WATER_WARM = 22;
const WATER_HOT = 60;
@Component({
selector: 'app-dashboard-heating-tile',
standalone: true,
@ -25,31 +33,31 @@ export class DashboardHeatingTileComponent {
getDisplayList(): DisplayOrSeparator[] {
return [
new Display('Abgas', this.color(50, 100, this.seriesService.heatingExhaustTemperature), this.seriesService.heatingExhaustTemperature),
new Display('Abgas', this.color(EXHAUST_WARM, EXHAUST_HOT, this.seriesService.heatingExhaustTemperature, ''), this.seriesService.heatingExhaustTemperature),
null,
new Display('Heizkreis Vorlauf', this.color(22, 40, this.seriesService.heatingLoopSupplyTemperature), this.seriesService.heatingLoopSupplyTemperature),
new Display('Heizkreis Rücklauf', this.color(22, 40, this.seriesService.heatingLoopReturnTemperature), this.seriesService.heatingLoopReturnTemperature),
new Display('Heizkreis Vorlauf', this.color(WATER_WARM, WATER_HOT, this.seriesService.heatingLoopSupplyTemperature), this.seriesService.heatingLoopSupplyTemperature),
new Display('Heizkreis Rücklauf', this.color(WATER_WARM, WATER_HOT, this.seriesService.heatingLoopReturnTemperature), this.seriesService.heatingLoopReturnTemperature),
null,
new Display('Puffer Vorlauf', this.color(22, 40, this.seriesService.heatingBufferSupplyTemperature), this.seriesService.heatingBufferSupplyTemperature),
new Display('Puffer Rücklauf', this.color(22, 40, this.seriesService.heatingBufferReturnTemperature), this.seriesService.heatingBufferReturnTemperature),
new Display('Puffer Vorlauf', this.color(WATER_WARM, WATER_HOT, this.seriesService.heatingBufferSupplyTemperature), this.seriesService.heatingBufferSupplyTemperature),
new Display('Puffer Rücklauf', this.color(WATER_WARM, WATER_HOT, this.seriesService.heatingBufferReturnTemperature), this.seriesService.heatingBufferReturnTemperature),
null,
new Display('Puffer Kalt', this.color(22, 40, this.seriesService.heatingBufferColdTemperature), this.seriesService.heatingBufferColdTemperature),
new Display('Puffer Speicher', this.color(22, 40, this.seriesService.heatingBufferInnerTemperature), this.seriesService.heatingBufferInnerTemperature),
new Display('Puffer Warm', this.color(22, 40, this.seriesService.heatingBufferHotTemperature), this.seriesService.heatingBufferHotTemperature),
new Display('Puffer Zirkulation', this.color(22, 40, this.seriesService.heatingBufferCirculationTemperature), this.seriesService.heatingBufferCirculationTemperature),
new Display('Puffer Kalt', this.color(WATER_WARM, WATER_HOT, this.seriesService.heatingBufferColdTemperature), this.seriesService.heatingBufferColdTemperature),
new Display('Puffer Speicher', this.color(WATER_WARM, WATER_HOT, this.seriesService.heatingBufferInnerTemperature), this.seriesService.heatingBufferInnerTemperature),
new Display('Puffer Warm', this.color(WATER_WARM, WATER_HOT, this.seriesService.heatingBufferHotTemperature), this.seriesService.heatingBufferHotTemperature),
new Display('Puffer Zirkulation', this.color(WATER_WARM, WATER_HOT, this.seriesService.heatingBufferCirculationTemperature), this.seriesService.heatingBufferCirculationTemperature),
];
}
private color(middle: number, height: number, value: IValue | null): string {
private color(middle: number, high: number, value: IValue | null, smallColor: string = '#23F', middleColor: string = 'orange', highColor: string = 'red'): string {
if (value === null || value.value === null) {
return "";
}
if (value.value < middle) {
return 'blue';
} else if (value.value < height) {
return 'orange';
return smallColor;
} else if (value.value < high) {
return middleColor;
}
return 'red';
return highColor;
}
}