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

FIX: alignment + offset text display

Browse Source
This commit is contained in:
Patrick Haßel 2025-02-28 13:39:41 +01:00
parent f0f68f3285
commit 0561940861
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/angular/src/app/electro/energy/electro-energy.component.html
View File

@ -6,7 +6,7 @@
<div class="option"> <div class="option">
<button class="arrowLeft" (click)="shiftAlignment(+1)">&larr;</button> <button class="arrowLeft" (click)="shiftAlignment(+1)">&larr;</button>
{{ alignment.display }} {{ offset > 0 ? -offset : '' }} {{ offset > 0 ? -offset : '' }}{{ alignment === Alignment.FIVE && offset > 0 ? 'x' : '' }} {{ alignment.display }}{{ offset > 1 ? alignment.plural : '' }}
<button class="arrowRight" (click)="shiftAlignment(-1)">&rarr;</button> <button class="arrowRight" (click)="shiftAlignment(-1)">&rarr;</button>
</div> </div>

2
src/main/angular/src/app/electro/energy/electro-energy.component.ts
View File

@ -15,6 +15,8 @@ import {SeriesService} from '../../series/series.service';
}) })
export class ElectroEnergyComponent implements OnInit, OnDestroy { export class ElectroEnergyComponent implements OnInit, OnDestroy {
protected readonly Alignment = Alignment;
protected aggregations: AggregationWrapperDto = AggregationWrapperDto.EMPTY; protected aggregations: AggregationWrapperDto = AggregationWrapperDto.EMPTY;
protected alignment: Alignment = Alignment.DAY; protected alignment: Alignment = Alignment.DAY;

13
src/main/angular/src/app/series/Alignment.ts
View File

@ -4,21 +4,22 @@ export class Alignment {
private static readonly values: 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( constructor(
readonly name: string, readonly name: string,
readonly display: string, readonly display: string,
readonly plural: string,
readonly offsetTitle: (offset: number, locale: string) => string readonly offsetTitle: (offset: number, locale: string) => string
) { ) {
Alignment.values.push(this); Alignment.values.push(this);