+
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 31ae2c1..1f5b489 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,8 +1,9 @@
import { Component, OnInit } from '@angular/core';
import { RouterOutlet } from '@angular/router';
import { TestComponent } from "./test/test.component";
+import { RestService } from './rest.service';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { Chart, ChartConfiguration, ChartData, ChartDataset, ChartEvent } from 'chart.js/auto';
+import { Chart } from 'chart.js/auto';
import 'chartjs-adapter-date-fns';
import { de } from 'date-fns/locale';
import { Aggregate } from './aggregate';
@@ -15,92 +16,61 @@ import { Aggregate } from './aggregate';
styleUrl: './app.component.css'
})
export class AppComponent implements OnInit {
+
+ constructor(private rest: RestService) {
+ }
+
ngOnInit(): void {
- const data2 = [
- { year: 2010, count: 10 },
- { year: 2011, count: 20 },
- { year: 2012, count: 15 },
- { year: 2013, count: 25 },
- { year: 2014, count: 22 },
- { year: 2015, count: 30 },
- { year: 2016, count: 28 },
- ];
- const data = this.vzData;
- this.chart = new Chart('canvas', {
- type: 'line',
- options: {
- scales: {
- x: {
- type: 'time',
- time: {
- tooltipFormat: 'HH:mm',
- displayFormats: {
- hour: 'HH:mm',
- minute: 'HH:mm'
+ this.rest.getLatestData().subscribe((data: Aggregate[]) => {
+ this.chart = new Chart('canvas', {
+ type: 'line',
+ options: {
+ scales: {
+ x: {
+ type: 'time',
+ time: {
+ tooltipFormat: 'HH:mm',
+ displayFormats: {
+ hour: 'HH:mm',
+ minute: 'HH:mm'
+ }
+ },
+ title: {
+ display: true,
+ text: 'Zeitpunkt'
+ },
+ adapters: {
+ date: {
+ locale: de
+ }
}
},
- title: {
- display: true,
- text: 'Zeitpunkt'
- },
- adapters: {
- date: {
- locale: de
- }
+ y: {
+ //stacked: true,
}
- },
- y: {
- //stacked: true,
}
+ },
+ data: {
+ labels: data.map(row => row.timestampStart),
+ datasets: [
+ {
+ label: 'Bezug',
+ pointRadius: 0,
+ data: data.map(row => row.obtainedEnergy/60000)
+ }, {
+ label: 'Erzeugt',
+ pointRadius: 0,
+ data: data.map(row => row.producedEnergy/60000)
+ }, {
+ label: 'Eingespeist',
+ pointRadius: 0,
+ data: data.map(row => row.injectedEnergy/60000)
+ }
+ ]
}
- },
- data: {
- labels: data.map(row => row.timestampStart),
- datasets: [
- {
- label: 'Bezug',
- pointRadius: 0,
- data: data.map(row => row.obtainedEnergy/60000)
- }, {
- label: 'Erzeugt',
- pointRadius: 0,
- data: data.map(row => row.producedEnergy/60000)
- }, {
- label: 'Eingespeist',
- pointRadius: 0,
- data: data.map(row => row.injectedEnergy/60000)
- }
- ]
- }
- })
+ })
+ })
}
title = 'test1';
chart: Chart | null = null;
-
- vzData: Aggregate[] = [{"houseId":1,"timestampStart":1743018240000,"timestampEnd":1743018300000,"producedEnergy":10000000,"obtainedEnergy":35596864,"injectedEnergy":20000000},{"houseId":1,"timestampStart":1743018180000,"timestampEnd":1743018240000,"producedEnergy":0,"obtainedEnergy":28644022,"injectedEnergy":0},{"houseId":1,"timestampStart":1743018120000,"timestampEnd":1743018180000,"producedEnergy":0,"obtainedEnergy":30955710,"injectedEnergy":0},{"houseId":1,"timestampStart":1743018060000,"timestampEnd":1743018120000,"producedEnergy":0,"obtainedEnergy":33388764,"injectedEnergy":0},{"houseId":1,"timestampStart":1743018000000,"timestampEnd":1743018060000,"producedEnergy":0,"obtainedEnergy":32970299,"injectedEnergy":0},{"houseId":1,"timestampStart":1743017940000,"timestampEnd":1743018000000,"producedEnergy":0,"obtainedEnergy":34364178,"injectedEnergy":0},{"houseId":1,"timestampStart":1743017880000,"timestampEnd":1743017940000,"producedEnergy":0,"obtainedEnergy":32057195,"injectedEnergy":0},{"houseId":1,"timestampStart":1743017820000,"timestampEnd":1743017880000,"producedEnergy":0,"obtainedEnergy":26401739,"injectedEnergy":0},{"houseId":1,"timestampStart":1743017760000,"timestampEnd":1743017820000,"producedEnergy":0,"obtainedEnergy":34528087,"injectedEnergy":0},{"houseId":1,"timestampStart":1743017700000,"timestampEnd":1743017760000,"producedEnergy":0,"obtainedEnergy":36059839,"injectedEnergy":0},{"houseId":1,"timestampStart":1743017640000,"timestampEnd":1743017700000,"producedEnergy":0,"obtainedEnergy":37514851,"injectedEnergy":0},{"houseId":1,"timestampStart":1743017580000,"timestampEnd":1743017640000,"producedEnergy":0,"obtainedEnergy":39723830,"injectedEnergy":0},{"houseId":1,"timestampStart":1743017520000,"timestampEnd":1743017580000,"producedEnergy":0,"obtainedEnergy":42957525,"injectedEnergy":0},{"houseId":1,"timestampStart":1743017460000,"timestampEnd":1743017520000,"producedEnergy":0,"obtainedEnergy":40778517,"injectedEnergy":0},{"houseId":1,"timestampStart":1743017400000,"timestampEnd":1743017460000,"producedEnergy":0,"obtainedEnergy":43489184,"injectedEnergy":0},{"houseId":1,"timestampStart":1743017340000,"timestampEnd":1743017400000,"producedEnergy":0,"obtainedEnergy":41086765,"injectedEnergy":0},{"houseId":1,"timestampStart":1743017280000,"timestampEnd":1743017340000,"producedEnergy":0,"obtainedEnergy":35299718,"injectedEnergy":0},{"houseId":1,"timestampStart":1743017220000,"timestampEnd":1743017280000,"producedEnergy":0,"obtainedEnergy":38560096,"injectedEnergy":0},{"houseId":1,"timestampStart":1743017160000,"timestampEnd":1743017220000,"producedEnergy":0,"obtainedEnergy":40057496,"injectedEnergy":0},{"houseId":1,"timestampStart":1743017100000,"timestampEnd":1743017160000,"producedEnergy":0,"obtainedEnergy":40421953,"injectedEnergy":0},{"houseId":1,"timestampStart":1743017040000,"timestampEnd":1743017100000,"producedEnergy":0,"obtainedEnergy":40493580,"injectedEnergy":0},{"houseId":1,"timestampStart":1743016980000,"timestampEnd":1743017040000,"producedEnergy":0,"obtainedEnergy":37171429,"injectedEnergy":0},{"houseId":1,"timestampStart":1743016920000,"timestampEnd":1743016980000,"producedEnergy":0,"obtainedEnergy":40344258,"injectedEnergy":0},{"houseId":1,"timestampStart":1743016860000,"timestampEnd":1743016920000,"producedEnergy":0,"obtainedEnergy":41331159,"injectedEnergy":0},{"houseId":1,"timestampStart":1743016800000,"timestampEnd":1743016860000,"producedEnergy":0,"obtainedEnergy":36214319,"injectedEnergy":0},{"houseId":1,"timestampStart":1743016740000,"timestampEnd":1743016800000,"producedEnergy":0,"obtainedEnergy":38604981,"injectedEnergy":0},{"houseId":1,"timestampStart":1743016680000,"timestampEnd":1743016740000,"producedEnergy":0,"obtainedEnergy":37715998,"injectedEnergy":0},{"houseId":1,"timestampStart":1743016620000,"timestampEnd":1743016680000,"producedEnergy":0,"obtainedEnergy":37609841,"injectedEnergy":0},{"houseId":1,"timestampStart":1743016560000,"timestampEnd":1743016620000,"producedEnergy":0,"obtainedEnergy":36472172,"injectedEnergy":0},{"houseId":1,"timestampStart":1743016500000,"timestampEnd":1743016560000,"producedEnergy":0,"obtainedEnergy":37707946,"injectedEnergy":0},{"houseId":1,"timestampStart":1743016440000,"timestampEnd":1743016500000,"producedEnergy":0,"obtainedEnergy":37425703,"injectedEnergy":0},{"houseId":1,"timestampStart":1743016380000,"timestampEnd":1743016440000,"producedEnergy":0,"obtainedEnergy":38645757,"injectedEnergy":0},{"houseId":1,"timestampStart":1743016320000,"timestampEnd":1743016380000,"producedEnergy":0,"obtainedEnergy":39216922,"injectedEnergy":0},{"houseId":1,"timestampStart":1743016260000,"timestampEnd":1743016320000,"producedEnergy":0,"obtainedEnergy":39007963,"injectedEnergy":0},{"houseId":1,"timestampStart":1743016200000,"timestampEnd":1743016260000,"producedEnergy":0,"obtainedEnergy":36233098,"injectedEnergy":0},{"houseId":1,"timestampStart":1743016140000,"timestampEnd":1743016200000,"producedEnergy":0,"obtainedEnergy":39246012,"injectedEnergy":0},{"houseId":1,"timestampStart":1743016080000,"timestampEnd":1743016140000,"producedEnergy":0,"obtainedEnergy":38696660,"injectedEnergy":0},{"houseId":1,"timestampStart":1743016020000,"timestampEnd":1743016080000,"producedEnergy":0,"obtainedEnergy":31520768,"injectedEnergy":0},{"houseId":1,"timestampStart":1743015960000,"timestampEnd":1743016020000,"producedEnergy":0,"obtainedEnergy":157463165,"injectedEnergy":0},{"houseId":1,"timestampStart":1743015900000,"timestampEnd":1743015960000,"producedEnergy":0,"obtainedEnergy":156144765,"injectedEnergy":0},{"houseId":1,"timestampStart":1743015840000,"timestampEnd":1743015900000,"producedEnergy":0,"obtainedEnergy":59159738,"injectedEnergy":0},{"houseId":1,"timestampStart":1743015780000,"timestampEnd":1743015840000,"producedEnergy":0,"obtainedEnergy":32706916,"injectedEnergy":0},{"houseId":1,"timestampStart":1743015720000,"timestampEnd":1743015780000,"producedEnergy":0,"obtainedEnergy":32468841,"injectedEnergy":0},{"houseId":1,"timestampStart":1743015660000,"timestampEnd":1743015720000,"producedEnergy":0,"obtainedEnergy":34533356,"injectedEnergy":0},{"houseId":1,"timestampStart":1743015600000,"timestampEnd":1743015660000,"producedEnergy":0,"obtainedEnergy":32905216,"injectedEnergy":0},{"houseId":1,"timestampStart":1743015540000,"timestampEnd":1743015600000,"producedEnergy":0,"obtainedEnergy":33749177,"injectedEnergy":0},{"houseId":1,"timestampStart":1743015480000,"timestampEnd":1743015540000,"producedEnergy":0,"obtainedEnergy":33272240,"injectedEnergy":0},{"houseId":1,"timestampStart":1743015420000,"timestampEnd":1743015480000,"producedEnergy":0,"obtainedEnergy":33879669,"injectedEnergy":0},{"houseId":1,"timestampStart":1743015360000,"timestampEnd":1743015420000,"producedEnergy":0,"obtainedEnergy":34336914,"injectedEnergy":0},{"houseId":1,"timestampStart":1743015300000,"timestampEnd":1743015360000,"producedEnergy":0,"obtainedEnergy":34495700,"injectedEnergy":0},{"houseId":1,"timestampStart":1743015240000,"timestampEnd":1743015300000,"producedEnergy":0,"obtainedEnergy":34101393,"injectedEnergy":0},{"houseId":1,"timestampStart":1743015180000,"timestampEnd":1743015240000,"producedEnergy":0,"obtainedEnergy":34060256,"injectedEnergy":0},{"houseId":1,"timestampStart":1743015120000,"timestampEnd":1743015180000,"producedEnergy":0,"obtainedEnergy":33388394,"injectedEnergy":0},{"houseId":1,"timestampStart":1743015060000,"timestampEnd":1743015120000,"producedEnergy":0,"obtainedEnergy":33315630,"injectedEnergy":0},{"houseId":1,"timestampStart":1743015000000,"timestampEnd":1743015060000,"producedEnergy":0,"obtainedEnergy":34396372,"injectedEnergy":0},{"houseId":1,"timestampStart":1743014940000,"timestampEnd":1743015000000,"producedEnergy":0,"obtainedEnergy":32704459,"injectedEnergy":0},{"houseId":1,"timestampStart":1743014880000,"timestampEnd":1743014940000,"producedEnergy":0,"obtainedEnergy":36201925,"injectedEnergy":0},{"houseId":1,"timestampStart":1743014820000,"timestampEnd":1743014880000,"producedEnergy":0,"obtainedEnergy":36757914,"injectedEnergy":0},{"houseId":1,"timestampStart":1743014760000,"timestampEnd":1743014820000,"producedEnergy":0,"obtainedEnergy":30144457,"injectedEnergy":0},{"houseId":1,"timestampStart":1743014700000,"timestampEnd":1743014760000,"producedEnergy":0,"obtainedEnergy":39527992,"injectedEnergy":0},{"houseId":1,"timestampStart":1743014640000,"timestampEnd":1743014700000,"producedEnergy":0,"obtainedEnergy":44881539,"injectedEnergy":0},{"houseId":1,"timestampStart":1743014580000,"timestampEnd":1743014640000,"producedEnergy":0,"obtainedEnergy":45321951,"injectedEnergy":0},{"houseId":1,"timestampStart":1743014520000,"timestampEnd":1743014580000,"producedEnergy":0,"obtainedEnergy":45527199,"injectedEnergy":0},{"houseId":1,"timestampStart":1743014460000,"timestampEnd":1743014520000,"producedEnergy":0,"obtainedEnergy":45644518,"injectedEnergy":0},{"houseId":1,"timestampStart":1743014400000,"timestampEnd":1743014460000,"producedEnergy":0,"obtainedEnergy":46706245,"injectedEnergy":0},{"houseId":1,"timestampStart":1743014340000,"timestampEnd":1743014400000,"producedEnergy":0,"obtainedEnergy":45659835,"injectedEnergy":0},{"houseId":1,"timestampStart":1743014280000,"timestampEnd":1743014340000,"producedEnergy":0,"obtainedEnergy":45969811,"injectedEnergy":0},{"houseId":1,"timestampStart":1743014220000,"timestampEnd":1743014280000,"producedEnergy":0,"obtainedEnergy":46232352,"injectedEnergy":0},{"houseId":1,"timestampStart":1743014160000,"timestampEnd":1743014220000,"producedEnergy":0,"obtainedEnergy":46312484,"injectedEnergy":0},{"houseId":1,"timestampStart":1743014100000,"timestampEnd":1743014160000,"producedEnergy":0,"obtainedEnergy":46807014,"injectedEnergy":0},{"houseId":1,"timestampStart":1743014040000,"timestampEnd":1743014100000,"producedEnergy":0,"obtainedEnergy":46008856,"injectedEnergy":0},{"houseId":1,"timestampStart":1743013980000,"timestampEnd":1743014040000,"producedEnergy":0,"obtainedEnergy":46190942,"injectedEnergy":0},{"houseId":1,"timestampStart":1743013920000,"timestampEnd":1743013980000,"producedEnergy":0,"obtainedEnergy":46003058,"injectedEnergy":0},{"houseId":1,"timestampStart":1743013860000,"timestampEnd":1743013920000,"producedEnergy":0,"obtainedEnergy":45764948,"injectedEnergy":0},{"houseId":1,"timestampStart":1743013800000,"timestampEnd":1743013860000,"producedEnergy":0,"obtainedEnergy":45759883,"injectedEnergy":0},{"houseId":1,"timestampStart":1743013740000,"timestampEnd":1743013800000,"producedEnergy":0,"obtainedEnergy":46141194,"injectedEnergy":0},{"houseId":1,"timestampStart":1743013680000,"timestampEnd":1743013740000,"producedEnergy":0,"obtainedEnergy":45914642,"injectedEnergy":0},{"houseId":1,"timestampStart":1743013620000,"timestampEnd":1743013680000,"producedEnergy":0,"obtainedEnergy":49618896,"injectedEnergy":0},{"houseId":1,"timestampStart":1743013560000,"timestampEnd":1743013620000,"producedEnergy":0,"obtainedEnergy":50143588,"injectedEnergy":0},{"houseId":1,"timestampStart":1743013500000,"timestampEnd":1743013560000,"producedEnergy":0,"obtainedEnergy":49896600,"injectedEnergy":0},{"houseId":1,"timestampStart":1743013440000,"timestampEnd":1743013500000,"producedEnergy":0,"obtainedEnergy":50180348,"injectedEnergy":0},{"houseId":1,"timestampStart":1743013380000,"timestampEnd":1743013440000,"producedEnergy":0,"obtainedEnergy":49831943,"injectedEnergy":0},{"houseId":1,"timestampStart":1743013320000,"timestampEnd":1743013380000,"producedEnergy":0,"obtainedEnergy":49389683,"injectedEnergy":0},{"houseId":1,"timestampStart":1743013260000,"timestampEnd":1743013320000,"producedEnergy":0,"obtainedEnergy":47221875,"injectedEnergy":0},{"houseId":1,"timestampStart":1743013200000,"timestampEnd":1743013260000,"producedEnergy":0,"obtainedEnergy":47549260,"injectedEnergy":0},{"houseId":1,"timestampStart":1743013140000,"timestampEnd":1743013200000,"producedEnergy":0,"obtainedEnergy":50275336,"injectedEnergy":0},{"houseId":1,"timestampStart":1743013080000,"timestampEnd":1743013140000,"producedEnergy":0,"obtainedEnergy":50453877,"injectedEnergy":0},{"houseId":1,"timestampStart":1743013020000,"timestampEnd":1743013080000,"producedEnergy":0,"obtainedEnergy":50854795,"injectedEnergy":0},{"houseId":1,"timestampStart":1743012960000,"timestampEnd":1743013020000,"producedEnergy":0,"obtainedEnergy":49164663,"injectedEnergy":0},{"houseId":1,"timestampStart":1743012900000,"timestampEnd":1743012960000,"producedEnergy":0,"obtainedEnergy":51024456,"injectedEnergy":0},{"houseId":1,"timestampStart":1743012840000,"timestampEnd":1743012900000,"producedEnergy":0,"obtainedEnergy":47996484,"injectedEnergy":0},{"houseId":1,"timestampStart":1743012780000,"timestampEnd":1743012840000,"producedEnergy":0,"obtainedEnergy":47404432,"injectedEnergy":0},{"houseId":1,"timestampStart":1743012720000,"timestampEnd":1743012780000,"producedEnergy":0,"obtainedEnergy":54215233,"injectedEnergy":0},{"houseId":1,"timestampStart":1743012660000,"timestampEnd":1743012720000,"producedEnergy":0,"obtainedEnergy":47695367,"injectedEnergy":0},{"houseId":1,"timestampStart":1743012600000,"timestampEnd":1743012660000,"producedEnergy":0,"obtainedEnergy":48224265,"injectedEnergy":0},{"houseId":1,"timestampStart":1743012540000,"timestampEnd":1743012600000,"producedEnergy":0,"obtainedEnergy":48173370,"injectedEnergy":0},{"houseId":1,"timestampStart":1743012480000,"timestampEnd":1743012540000,"producedEnergy":0,"obtainedEnergy":48179888,"injectedEnergy":0},{"houseId":1,"timestampStart":1743012420000,"timestampEnd":1743012480000,"producedEnergy":0,"obtainedEnergy":47931370,"injectedEnergy":0},{"houseId":1,"timestampStart":1743012360000,"timestampEnd":1743012420000,"producedEnergy":0,"obtainedEnergy":48220993,"injectedEnergy":0},{"houseId":1,"timestampStart":1743012300000,"timestampEnd":1743012360000,"producedEnergy":0,"obtainedEnergy":47807703,"injectedEnergy":0},{"houseId":1,"timestampStart":1743012240000,"timestampEnd":1743012300000,"producedEnergy":0,"obtainedEnergy":48467594,"injectedEnergy":0},{"houseId":1,"timestampStart":1743012180000,"timestampEnd":1743012240000,"producedEnergy":0,"obtainedEnergy":49354452,"injectedEnergy":0},{"houseId":1,"timestampStart":1743012120000,"timestampEnd":1743012180000,"producedEnergy":0,"obtainedEnergy":49164242,"injectedEnergy":0},{"houseId":1,"timestampStart":1743012060000,"timestampEnd":1743012120000,"producedEnergy":0,"obtainedEnergy":45301655,"injectedEnergy":0},{"houseId":1,"timestampStart":1743012000000,"timestampEnd":1743012060000,"producedEnergy":0,"obtainedEnergy":45488635,"injectedEnergy":0},{"houseId":1,"timestampStart":1743011940000,"timestampEnd":1743012000000,"producedEnergy":0,"obtainedEnergy":45649654,"injectedEnergy":0},{"houseId":1,"timestampStart":1743011880000,"timestampEnd":1743011940000,"producedEnergy":0,"obtainedEnergy":44674549,"injectedEnergy":0},{"houseId":1,"timestampStart":1743011820000,"timestampEnd":1743011880000,"producedEnergy":0,"obtainedEnergy":45923059,"injectedEnergy":0},{"houseId":1,"timestampStart":1743011760000,"timestampEnd":1743011820000,"producedEnergy":0,"obtainedEnergy":45725156,"injectedEnergy":0},{"houseId":1,"timestampStart":1743011700000,"timestampEnd":1743011760000,"producedEnergy":0,"obtainedEnergy":45742786,"injectedEnergy":0},{"houseId":1,"timestampStart":1743011640000,"timestampEnd":1743011700000,"producedEnergy":0,"obtainedEnergy":45584859,"injectedEnergy":0},{"houseId":1,"timestampStart":1743011580000,"timestampEnd":1743011640000,"producedEnergy":0,"obtainedEnergy":45613996,"injectedEnergy":0},{"houseId":1,"timestampStart":1743011520000,"timestampEnd":1743011580000,"producedEnergy":0,"obtainedEnergy":45637842,"injectedEnergy":0},{"houseId":1,"timestampStart":1743011460000,"timestampEnd":1743011520000,"producedEnergy":0,"obtainedEnergy":45422159,"injectedEnergy":0},{"houseId":1,"timestampStart":1743011400000,"timestampEnd":1743011460000,"producedEnergy":0,"obtainedEnergy":45543455,"injectedEnergy":0},{"houseId":1,"timestampStart":1743011340000,"timestampEnd":1743011400000,"producedEnergy":0,"obtainedEnergy":45442465,"injectedEnergy":0},{"houseId":1,"timestampStart":1743011280000,"timestampEnd":1743011340000,"producedEnergy":0,"obtainedEnergy":42691073,"injectedEnergy":0},{"houseId":1,"timestampStart":1743011220000,"timestampEnd":1743011280000,"producedEnergy":0,"obtainedEnergy":43188412,"injectedEnergy":0},{"houseId":1,"timestampStart":1743011160000,"timestampEnd":1743011220000,"producedEnergy":0,"obtainedEnergy":43080711,"injectedEnergy":0},{"houseId":1,"timestampStart":1743011100000,"timestampEnd":1743011160000,"producedEnergy":0,"obtainedEnergy":42740475,"injectedEnergy":0}]
-
- public barChartOptions: ChartConfiguration<'bar'>['options'] = {
- // We use these empty structures as placeholders for dynamic theming.
- scales: {
- x: {
- stacked: true,
- },
- y: {},
- },
- plugins: {
- legend: {
- display: true,
- },
- },
- };
-
- public barChartData: ChartData<'bar'> = {
- labels: ['2006', '2007', '2008', '2009', '2010', '2011', '2012'],
- datasets: [
- { data: [65, 59, 80, 81, 56, 55, 40], label: 'Series A' },
- { data: [28, 48, 40, 19, 86, 27, 90], label: 'Series B' },
- ],
- };
-
-
}
diff --git a/src/app/rest.service.ts b/src/app/rest.service.ts
index 401b127..bfc24d0 100644
--- a/src/app/rest.service.ts
+++ b/src/app/rest.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Statistics } from './statistics';
import { Observable } from 'rxjs';
+import { Aggregate } from './aggregate';
@Injectable({
providedIn: 'root'
@@ -12,10 +13,13 @@ export class RestService {
}
getStatistics(): Observable {
-
return this.http.get('https://vz.home.peper.info/rest-vz/stats?houseId=1&duration=P7D');
}
+ getLatestData(): Observable {
+ return this.http.get('https://vz.home.peper.info/rest-vz/latest-data?houseId=1&timeWindow=1440');
+ }
+
getStatisticsWithDuration(duration: string | undefined): Observable {
if (duration) {
return this.http.get('https://vz.home.peper.info/rest-vz/stats?houseId=1&duration=' + duration);
diff --git a/src/app/test/test.component.ts b/src/app/test/test.component.ts
index 4c85d6e..91f01ce 100644
--- a/src/app/test/test.component.ts
+++ b/src/app/test/test.component.ts
@@ -4,7 +4,6 @@ import { RestService } from '../rest.service';
import { formatDate, formatNumber } from '@angular/common';
import { NgIf } from '@angular/common';
import * as _ from 'lodash';
-//import { RestService } from '../rest.service';
@Component({
selector: 'app-test',