diff --git a/src/main/angular/src/app/app.html b/src/main/angular/src/app/app.html index fd6fdf9..84cf053 100644 --- a/src/main/angular/src/app/app.html +++ b/src/main/angular/src/app/app.html @@ -6,7 +6,7 @@ - @if(!ws.connected){ + @if (!ws.connected) { } @@ -14,7 +14,7 @@ diff --git a/src/main/angular/src/app/app.routes.ts b/src/main/angular/src/app/app.routes.ts index ef84a51..41dbeba 100644 --- a/src/main/angular/src/app/app.routes.ts +++ b/src/main/angular/src/app/app.routes.ts @@ -5,6 +5,5 @@ import {LocationDetail} from './location/detail/location-detail'; export const routes: Routes = [ {path: 'Location/:id', component: LocationDetail}, {path: 'Location', component: LocationList}, - {path: '**', redirectTo: 'Location'}, - {path: '**', redirectTo: 'Location'}, + {path: '**', redirectTo: '/Location'}, ]; diff --git a/src/main/angular/src/app/location/detail/history/series-history.less b/src/main/angular/src/app/location/detail/history/series-history.less deleted file mode 100644 index de6aeea..0000000 --- a/src/main/angular/src/app/location/detail/history/series-history.less +++ /dev/null @@ -1 +0,0 @@ -@import "../../../../colors"; diff --git a/src/main/angular/src/app/location/detail/location-detail.ts b/src/main/angular/src/app/location/detail/location-detail.ts index 634eb45..e6913f6 100644 --- a/src/main/angular/src/app/location/detail/location-detail.ts +++ b/src/main/angular/src/app/location/detail/location-detail.ts @@ -9,7 +9,7 @@ import {Series} from '../../series/Series'; import {SeriesService} from '../../series/series-service'; import {SeriesType} from '../../series/SeriesType'; import {Subscription, timer} from 'rxjs'; -import {SeriesHistory} from './history/series-history'; +import {LocationElectricity} from '../electricity/location-electricity'; import {Interval} from '../../series/Interval'; import {MenuService} from '../../menu-service'; import {DatePipe} from '@angular/common'; @@ -27,7 +27,7 @@ function yesterday(now: any) { Text, Number, SeriesSelect, - SeriesHistory + LocationElectricity ], templateUrl: './location-detail.html', styleUrl: './location-detail.less', diff --git a/src/main/angular/src/app/location/detail/history/graph/simple-plot.component.html b/src/main/angular/src/app/location/electricity/graph/simple-plot.html similarity index 100% rename from src/main/angular/src/app/location/detail/history/graph/simple-plot.component.html rename to src/main/angular/src/app/location/electricity/graph/simple-plot.html diff --git a/src/main/angular/src/app/location/detail/history/graph/simple-plot.component.less b/src/main/angular/src/app/location/electricity/graph/simple-plot.less similarity index 100% rename from src/main/angular/src/app/location/detail/history/graph/simple-plot.component.less rename to src/main/angular/src/app/location/electricity/graph/simple-plot.less diff --git a/src/main/angular/src/app/location/detail/history/graph/simple-plot.component.ts b/src/main/angular/src/app/location/electricity/graph/simple-plot.ts similarity index 88% rename from src/main/angular/src/app/location/detail/history/graph/simple-plot.component.ts rename to src/main/angular/src/app/location/electricity/graph/simple-plot.ts index 4e3e7db..e31a8f2 100644 --- a/src/main/angular/src/app/location/detail/history/graph/simple-plot.component.ts +++ b/src/main/angular/src/app/location/electricity/graph/simple-plot.ts @@ -1,13 +1,13 @@ import {AfterViewInit, Component, Input} from '@angular/core'; -import {Location} from '../../../Location'; -import {Interval} from '../../../../series/Interval'; -import {PointService} from '../../../../point/point-service'; +import {Location} from '../../Location'; +import {Interval} from '../../../series/Interval'; +import {PointService} from '../../../point/point-service'; @Component({ selector: 'app-series-history-graph', imports: [], - templateUrl: './simple-plot.component.html', - styleUrl: './simple-plot.component.less', + templateUrl: './simple-plot.html', + styleUrl: './simple-plot.less', }) export class SeriesHistoryGraph implements AfterViewInit { diff --git a/src/main/angular/src/app/location/detail/history/series-history.html b/src/main/angular/src/app/location/electricity/location-electricity.html similarity index 100% rename from src/main/angular/src/app/location/detail/history/series-history.html rename to src/main/angular/src/app/location/electricity/location-electricity.html diff --git a/src/main/angular/src/app/location/electricity/location-electricity.less b/src/main/angular/src/app/location/electricity/location-electricity.less new file mode 100644 index 0000000..876e2a5 --- /dev/null +++ b/src/main/angular/src/app/location/electricity/location-electricity.less @@ -0,0 +1 @@ +@import "../../../colors"; diff --git a/src/main/angular/src/app/location/detail/history/series-history.ts b/src/main/angular/src/app/location/electricity/location-electricity.ts similarity index 86% rename from src/main/angular/src/app/location/detail/history/series-history.ts rename to src/main/angular/src/app/location/electricity/location-electricity.ts index 1567646..907af62 100644 --- a/src/main/angular/src/app/location/detail/history/series-history.ts +++ b/src/main/angular/src/app/location/electricity/location-electricity.ts @@ -1,20 +1,20 @@ import {AfterViewInit, Component, Input, OnDestroy, OnInit} from '@angular/core'; -import {Location} from '../../Location'; -import {Series} from '../../../series/Series'; -import {Next} from '../../../common'; -import {Interval} from '../../../series/Interval'; -import {PointService} from '../../../point/point-service'; -import {SeriesService} from '../../../series/series-service'; +import {Location} from '../Location'; +import {Series} from '../../series/Series'; +import {Next} from '../../common'; +import {Interval} from '../../series/Interval'; +import {PointService} from '../../point/point-service'; +import {SeriesService} from '../../series/series-service'; import {Subscription} from 'rxjs'; -import {Value} from '../../../series/Value'; +import {Value} from '../../series/Value'; @Component({ selector: 'app-series-history', imports: [], - templateUrl: './series-history.html', - styleUrl: './series-history.less', + templateUrl: './location-electricity.html', + styleUrl: './location-electricity.less', }) -export class SeriesHistory implements OnInit, AfterViewInit, OnDestroy { +export class LocationElectricity implements OnInit, AfterViewInit, OnDestroy { protected readonly Interval = Interval; diff --git a/src/main/java/de/ph87/data/series/SeriesController.java b/src/main/java/de/ph87/data/series/SeriesController.java index bcaf290..2f4cdcd 100644 --- a/src/main/java/de/ph87/data/series/SeriesController.java +++ b/src/main/java/de/ph87/data/series/SeriesController.java @@ -40,9 +40,9 @@ public class SeriesController { } @NonNull - @PostMapping("{id}/decimals") - public SeriesDto decimals(@PathVariable final long id, @RequestBody final int decimals) { - return seriesService.modify(id, series -> series.setPrecision(decimals)); + @PostMapping("{id}/precision") + public SeriesDto precision(@PathVariable final long id, @RequestBody final int precision) { + return seriesService.modify(id, series -> series.setPrecision(precision)); } @NonNull