From 0561940861da0bea36b09597fd76e86c7ad8dc30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Fri, 28 Feb 2025 13:39:41 +0100 Subject: [PATCH] FIX: alignment + offset text display --- .../electro/energy/electro-energy.component.html | 2 +- .../app/electro/energy/electro-energy.component.ts | 2 ++ src/main/angular/src/app/series/Alignment.ts | 13 +++++++------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/angular/src/app/electro/energy/electro-energy.component.html b/src/main/angular/src/app/electro/energy/electro-energy.component.html index c9dfb6a..6cfa3fd 100644 --- a/src/main/angular/src/app/electro/energy/electro-energy.component.html +++ b/src/main/angular/src/app/electro/energy/electro-energy.component.html @@ -6,7 +6,7 @@
- {{ alignment.display }} {{ offset > 0 ? -offset : '' }} + {{ offset > 0 ? -offset : '' }}{{ alignment === Alignment.FIVE && offset > 0 ? 'x' : '' }} {{ alignment.display }}{{ offset > 1 ? alignment.plural : '' }}
diff --git a/src/main/angular/src/app/electro/energy/electro-energy.component.ts b/src/main/angular/src/app/electro/energy/electro-energy.component.ts index b24c1e2..17713ac 100644 --- a/src/main/angular/src/app/electro/energy/electro-energy.component.ts +++ b/src/main/angular/src/app/electro/energy/electro-energy.component.ts @@ -15,6 +15,8 @@ import {SeriesService} from '../../series/series.service'; }) export class ElectroEnergyComponent implements OnInit, OnDestroy { + protected readonly Alignment = Alignment; + protected aggregations: AggregationWrapperDto = AggregationWrapperDto.EMPTY; protected alignment: Alignment = Alignment.DAY; diff --git a/src/main/angular/src/app/series/Alignment.ts b/src/main/angular/src/app/series/Alignment.ts index dcb7b2b..a9a330d 100644 --- a/src/main/angular/src/app/series/Alignment.ts +++ b/src/main/angular/src/app/series/Alignment.ts @@ -4,21 +4,22 @@ export class Alignment { private static readonly values: Alignment[] = []; - static readonly FIVE = new Alignment('FIVE', '5 Minuten', Alignment.offsetTitleFive); + static readonly FIVE = new Alignment('FIVE', '5 Minuten', '', Alignment.offsetTitleFive); - static readonly HOUR = new Alignment('HOUR', 'Stunde', Alignment.offsetTitleHour); + static readonly HOUR = new Alignment('HOUR', 'Stunde', 'n', Alignment.offsetTitleHour); - static readonly DAY = new Alignment('DAY', 'Tag', Alignment.offsetTitleDay); + static readonly DAY = new Alignment('DAY', 'Tag', 'e', Alignment.offsetTitleDay); - static readonly WEEK = new Alignment('WEEK', 'Woche', Alignment.offsetTitleWeek); + static readonly WEEK = new Alignment('WEEK', 'Woche', 'n', Alignment.offsetTitleWeek); - static readonly MONTH = new Alignment('MONTH', 'Monat', Alignment.offsetTitleMonth); + static readonly MONTH = new Alignment('MONTH', 'Monat', 'e', Alignment.offsetTitleMonth); - static readonly YEAR = new Alignment('YEAR', 'Jahr', Alignment.offsetTitleYear); + static readonly YEAR = new Alignment('YEAR', 'Jahr', 'e', Alignment.offsetTitleYear); constructor( readonly name: string, readonly display: string, + readonly plural: string, readonly offsetTitle: (offset: number, locale: string) => string ) { Alignment.values.push(this);