ckaczor/HomeMonitor
1
0
Fork 0
mirror of https://github.com/ckaczor/HomeMonitor.git synced 2026-06-20 12:15:07 -04:00
Code Issues 9 Packages Projects Releases Wiki Activity

Change chart data format to account for missing data

Browse Source
This commit is contained in:
Chris Kaczor
2024-03-28 11:34:39 +00:00
parent 7d95bfc27a
commit d69d69bf68
4 changed files with 43 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
WebDisplay/src/pages/power.vue
View File

@@ -14,13 +14,10 @@
const powerReady = ref(false);
const lightReady = ref(false);
const powerCategories = ref<number[]>([]);
const lightCategories = ref<number[]>([]);
const generationSeries = ref({ name: 'Generation', data: [] as number[][] });
const consumptionSeries = ref({ name: 'Consumption', data: [] as number[][] });
const generationSeries = ref({ name: 'Generation', data: [] as number[] });
const consumptionSeries = ref({ name: 'Consumption', data: [] as number[] });
const lightSeries = ref({ name: 'Average Light', data: [] as number[] });
const lightSeries = ref({ name: 'Average Light', data: [] as number[][] });
const end = ref(new Date());
const start = ref(subHours(end.value, 24));
@@ -31,28 +28,26 @@
lightReady.value = false;
powerStore.getReadingHistoryGrouped(start.value, end.value, 15).then((groupedReadingsList) => {
powerCategories.value.length = 0;
generationSeries.value.data.length = 0;
consumptionSeries.value.data.length = 0;
groupedReadingsList.forEach((groupedReadings) => {
powerCategories.value.push(new Date(groupedReadings.bucket).getTime());
const date = new Date(groupedReadings.bucket).getTime();
generationSeries.value.data.push(groupedReadings.averageGeneration);
consumptionSeries.value.data.push(groupedReadings.averageConsumption);
generationSeries.value.data.push([date, groupedReadings.averageGeneration]);
consumptionSeries.value.data.push([date, groupedReadings.averageConsumption]);
});
powerReady.value = true;
});
weatherStore.getReadingValueHistoryGrouped(WeatherValueType.Light, start.value, end.value, 15).then((groupedReadingsList) => {
lightCategories.value.length = 0;
lightSeries.value.data.length = 0;
groupedReadingsList.forEach((groupedReadings) => {
lightCategories.value.push(new Date(groupedReadings.bucket).getTime());
const date = new Date(groupedReadings.bucket).getTime();
lightSeries.value.data.push(groupedReadings.averageValue);
lightSeries.value.data.push([date, groupedReadings.averageValue]);
});
lightReady.value = true;
@@ -95,7 +90,6 @@
group="power"
:y-axis-decimal-points="0"
:value-decimal-points="0"
:categories="powerCategories"
:series="[generationSeries, consumptionSeries]"></ValueChart>
</v-col>
<v-col
@@ -107,7 +101,6 @@
title="Light"
unit=" lx"
group="power"
:categories="lightCategories"
:series="[lightSeries]">
</ValueChart>
</v-col>