From b340fe1b5e6889f690f96184acf82268e5f9bb54 Mon Sep 17 00:00:00 2001
From: Chris Kaczor <chris@kaczorzoo.net>
Date: Sat, 18 Apr 2020 17:27:00 -0400
Subject: [PATCH] Adjust chart time intervals

---
 .../app/components/power/charts/power-charts.component.ts   | 6 ++++--
 .../components/weather/charts/weather-charts.component.ts   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Display/src/app/components/power/charts/power-charts.component.ts b/Display/src/app/components/power/charts/power-charts.component.ts
index 59104ef..1f84bde 100644
--- a/Display/src/app/components/power/charts/power-charts.component.ts
+++ b/Display/src/app/components/power/charts/power-charts.component.ts
@@ -35,6 +35,8 @@ export class PowerChartsComponent implements OnInit {
     private selectedTimeSpanValue: TimeSpan = TimeSpan.Last24Hours;
     private selectedDateValue: moment.Moment = moment().startOf('day');
 
+    private timeInterval = 5;
+
     constructor(private httpClient: HttpClient) { }
 
     ngOnInit() {
@@ -87,8 +89,8 @@ export class PowerChartsComponent implements OnInit {
         const endString = end.toISOString();
 
         forkJoin([
-            this.httpClient.get<PowerStatusGrouped[]>(`/api/power/status/history-grouped?start=${startString}&end=${endString}&bucketMinutes=5`),
-            this.httpClient.get<WeatherValueGrouped[]>(`/api/weather/readings/value-history-grouped?weatherValueType=LightLevel&start=${startString}&end=${endString}&bucketMinutes=5`)
+            this.httpClient.get<PowerStatusGrouped[]>(`/api/power/status/history-grouped?start=${startString}&end=${endString}&bucketMinutes=${this.timeInterval}`),
+            this.httpClient.get<WeatherValueGrouped[]>(`/api/weather/readings/value-history-grouped?weatherValueType=LightLevel&start=${startString}&end=${endString}&bucketMinutes=${this.timeInterval}`)
         ]).subscribe(data => {
             const seriesData: Array<SeriesLineOptions> = [];
 
diff --git a/Display/src/app/components/weather/charts/weather-charts.component.ts b/Display/src/app/components/weather/charts/weather-charts.component.ts
index dee972f..3e52a94 100644
--- a/Display/src/app/components/weather/charts/weather-charts.component.ts
+++ b/Display/src/app/components/weather/charts/weather-charts.component.ts
@@ -42,6 +42,8 @@ export class WeatherChartsComponent implements OnInit {
     private selectedTimeSpanValue: TimeSpan = TimeSpan.Last24Hours;
     private selectedDateValue: moment.Moment = moment().startOf('day');
 
+    private timeInterval = 5;
+
     constructor(private httpClient: HttpClient) { }
 
     ngOnInit() {
@@ -103,7 +105,7 @@ export class WeatherChartsComponent implements OnInit {
         const startString = start.toISOString();
         const endString = end.toISOString();
 
-        const request = this.httpClient.get<WeatherReadingGrouped[]>(`/api/weather/readings/history-grouped?start=${startString}&end=${endString}&bucketMinutes=30`);
+        const request = this.httpClient.get<WeatherReadingGrouped[]>(`/api/weather/readings/history-grouped?start=${startString}&end=${endString}&bucketMinutes=${this.timeInterval}`);
 
         request.subscribe(data => {
             const seriesData: Array<SeriesLineOptions | SeriesColumnOptions> = [];
@@ -224,7 +226,7 @@ export class WeatherChartsComponent implements OnInit {
         const startString = start.toISOString();
         const endString = end.toISOString();
 
-        const request = this.httpClient.get<WindHistoryGrouped[]>(`/api/weather/readings/wind-history-grouped?start=${startString}&end=${endString}&bucketMinutes=30`);
+        const request = this.httpClient.get<WindHistoryGrouped[]>(`/api/weather/readings/wind-history-grouped?start=${startString}&end=${endString}&bucketMinutes=${this.timeInterval}`);
 
         request.subscribe(data => {
             const seriesData: Array<SeriesLineOptions | SeriesWindbarbOptions> = [];