ckaczor/HomeMonitor
1
0
Fork 0
mirror of https://github.com/ckaczor/HomeMonitor.git synced 2026-02-16 10:58:32 -05:00
Code Issues 9 Packages Projects Releases Wiki Activity

Add rain to weather chart

Browse Source
This commit is contained in:
Chris Kaczor
2019-10-08 19:41:38 -04:00
parent f2b47e863e
commit 1cbdd12a9a
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Display/src/app/components/weather/charts/weather-charts.component.ts
View File

@@ -121,6 +121,9 @@ export class WeatherChartsComponent implements OnInit {
seriesData.push({ name: 'Pressure', data: [], yAxis: 1, tooltip: { valueSuffix: '"' } } as SeriesLineOptions); seriesData.push({ name: 'Pressure', data: [], yAxis: 1, tooltip: { valueSuffix: '"' } } as SeriesLineOptions);
seriesData.push({ name: 'Humidity', data: [], yAxis: 2, tooltip: { valueSuffix: '%' } } as SeriesLineOptions); seriesData.push({ name: 'Humidity', data: [], yAxis: 2, tooltip: { valueSuffix: '%' } } as SeriesLineOptions);
seriesData.push({ name: 'Light', data: [], yAxis: 2, tooltip: { valueSuffix: '%' } } as SeriesLineOptions); seriesData.push({ name: 'Light', data: [], yAxis: 2, tooltip: { valueSuffix: '%' } } as SeriesLineOptions);
seriesData.push({ name: 'Rain', data: [], yAxis: 3, tooltip: { valueSuffix: '"' } } as SeriesLineOptions);
let rainTotal = 0;
data.forEach(dataElement => { data.forEach(dataElement => {
const date = Date.parse(dataElement.bucket); const date = Date.parse(dataElement.bucket);
@@ -128,6 +131,10 @@ export class WeatherChartsComponent implements OnInit {
seriesData[1].data.push([date, dataElement.averagePressure / 33.864 / 100]); seriesData[1].data.push([date, dataElement.averagePressure / 33.864 / 100]);
seriesData[2].data.push([date, dataElement.averageHumidity]); seriesData[2].data.push([date, dataElement.averageHumidity]);
seriesData[3].data.push([date, dataElement.averageLightLevel * 100]); seriesData[3].data.push([date, dataElement.averageLightLevel * 100]);
rainTotal += dataElement.rainTotal;
seriesData[4].data.push([date, rainTotal]);
}); });
const title = this.selectedTimeSpan === TimeSpan.Last24Hours ? this.timeSpanItems[TimeSpan.Last24Hours] : this.getSelectedDateDisplayString(); const title = this.selectedTimeSpan === TimeSpan.Last24Hours ? this.timeSpanItems[TimeSpan.Last24Hours] : this.getSelectedDateDisplayString();
@@ -162,7 +169,7 @@ export class WeatherChartsComponent implements OnInit {
format: '{value:.2f}°F', format: '{value:.2f}°F',
}, },
title: { title: {
text: '' text: 'Temperature'
} }
}, },
{ {
@@ -170,14 +177,30 @@ export class WeatherChartsComponent implements OnInit {
format: '{value:.2f}"' format: '{value:.2f}"'
}, },
title: { title: {
text: '' text: 'Pressure'
}, },
opposite: true opposite: true
}, },
{ {
visible: false, visible: true,
labels: {
format: '{value:.2f}%'
},
title: {
text: 'Percentage'
},
min: 0, min: 0,
max: 100 max: 100
},
{
labels: {
format: '{value:.2f}"'
},
title: {
text: 'Rain'
},
visible: true,
opposite: true
} }
], ],
time: { time: {

1
Display/src/app/models/weather/weather-reading-grouped.ts
View File

@@ -5,4 +5,5 @@ export class WeatherReadingGrouped {
averageLightLevel: number; averageLightLevel: number;
averageHumidity: number; averageHumidity: number;
averageHumidityTemperature: number; averageHumidityTemperature: number;
rainTotal: number;
} }