ckaczor/HomeMonitor
1
0
Fork 0
mirror of https://github.com/ckaczor/HomeMonitor.git synced 2026-01-18 17:23:37 -05:00
Code Issues 9 Packages Projects Releases Wiki Activity

Data model simplification

Browse Source
This commit is contained in:
Chris Kaczor
2020-07-30 19:31:50 -04:00
parent e810c4a240
commit 6514eb7c76
16 changed files with 75 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Display/src/app/components/power/charts/power-charts.component.ts
View File

@@ -106,7 +106,7 @@ export class PowerChartsComponent implements OnInit {
data[1].forEach(dataElement => {
const date = Date.parse(dataElement.bucket);
seriesData[2].data.push([date, dataElement.averageValue * 100]);
seriesData[2].data.push([date, dataElement.averageValue]);
});
const title = this.selectedTimeSpan === TimeSpan.Last24Hours ? this.timeSpanItems[TimeSpan.Last24Hours] : this.getSelectedDateDisplayString();

4
Display/src/app/components/weather/almanac/almanac.component.ts
View File

@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { WeatherReading } from 'src/app/models/weather/weather-reading';
import { WeatherUpdate } from 'src/app/models/weather/weather-update';
import { WeatherService } from 'src/app/services/weather/weather.service';
import { first } from 'rxjs/operators';
@@ -14,7 +14,7 @@ import 'moment-duration-format';
})
export class AlmanacComponent implements OnInit {
public loaded = false;
public latestReading: WeatherReading;
public latestReading: WeatherUpdate;
public sunTimes: SunCalc.GetTimesResult;
public moonTimes: SunCalc.GetMoonTimes;
public moon: SunCalc.GetMoonIlluminationResult;

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

@@ -118,10 +118,10 @@ export class WeatherChartsComponent implements OnInit {
data.forEach(dataElement => {
const date = Date.parse(dataElement.bucket);
seriesData[0].data.push([date, dataElement.averagePressureTemperature]);
seriesData[0].data.push([date, dataElement.averageTemperature]);
seriesData[1].data.push([date, dataElement.averagePressure / 33.864 / 100]);
seriesData[2].data.push([date, dataElement.averageHumidity]);
seriesData[3].data.push([date, dataElement.averageLightLevel * 100]);
seriesData[3].data.push([date, dataElement.averageLightLevel]);
seriesData[4].data.push([date, dataElement.rainTotal]);
});

2
Display/src/app/components/weather/current/weather-current.component.html
View File

@@ -10,7 +10,7 @@
Temperature
</td>
<td>
{{ latestReading.PressureTemperature.toFixed(2) }}°F
{{ latestReading.Temperature.toFixed(2) }}°F
</td>
</tr>
<tr *ngIf="latestReading.HeatIndex">

4
Display/src/app/components/weather/current/weather-current.component.ts
View File

@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { WeatherReading } from 'src/app/models/weather/weather-reading';
import { WeatherUpdate } from 'src/app/models/weather/weather-update';
import { WeatherService } from 'src/app/services/weather/weather.service';
@Component({
@@ -8,7 +8,7 @@ import { WeatherService } from 'src/app/services/weather/weather.service';
styleUrls: ['./weather-current.component.scss']
})
export class WeatherCurrentComponent implements OnInit {
public latestReading: WeatherReading;
public latestReading: WeatherUpdate;
constructor(private weatherService: WeatherService) { }