ztimson/weather-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed daily and graphs

Browse Source
This commit is contained in:
Zakary Timson
2026-06-26 01:07:25 -04:00
parent 5947b61b8f
commit 216420ad80
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/components/GraphModal.vue
View File

@@ -15,11 +15,11 @@ watch([() => props.metricKey, mode], async ([key]) => {
if(mode.value === 'hourly') { if(mode.value === 'hourly') {
past.setHours(past.getHours() - 24, 0, 0, 0); past.setHours(past.getHours() - 24, 0, 0, 0);
future.setHours(future.getHours() + 24, 0, 0, 0); future.setHours(future.getHours() + 24, 0, 0, 0);
rows.value = await api.hourly(past, future, props.metricKey || undefined); rows.value = await api.hourly(past, future, `time,${props.metricKey}`);
} else { } else {
past.setDate(past.getDate() - 3); past.setDate(past.getDate() - 3);
future.setDate(future.getDate() + 3); future.setDate(future.getDate() + 3);
rows.value = await api.daily(past, future); rows.value = await api.daily(past, future, `time,${props.metricKey}`);
} }
}, {immediate: true}); }, {immediate: true});
@@ -54,6 +54,7 @@ const chart = computed(() => {
// stitch current point into both paths so lines meet // stitch current point into both paths so lines meet
const nearest = pts.reduce((a, b) => Math.abs(a.t - nowT) < Math.abs(b.t - nowT) ? a : b); const nearest = pts.reduce((a, b) => Math.abs(a.t - nowT) < Math.abs(b.t - nowT) ? a : b);
const dot = {x: xOf(nearest.t), y: yOf(nearest.v as number), v: nearest.v}; const dot = {x: xOf(nearest.t), y: yOf(nearest.v as number), v: nearest.v};
hist.push({t: nearest.t, v: nearest.v});
const toPath = (arr: typeof pts) => const toPath = (arr: typeof pts) =>
arr.map((p, i) => `${i===0?'M':'L'} ${xOf(p.t).toFixed(1)} ${yOf(p.v as number).toFixed(1)}`).join(' '); arr.map((p, i) => `${i===0?'M':'L'} ${xOf(p.t).toFixed(1)} ${yOf(p.v as number).toFixed(1)}`).join(' ');

5
server/src/influx.mjs
View File

@@ -92,6 +92,7 @@ export async function queryDaily(start, end) {
from(bucket: "${c.INFLUX_BUCKET}") from(bucket: "${c.INFLUX_BUCKET}")
|> range(start: ${start.toISOString()}, stop: ${end.toISOString()}) |> range(start: ${start.toISOString()}, stop: ${end.toISOString()})
|> filter(fn: (r) => r._measurement == "${m}") |> filter(fn: (r) => r._measurement == "${m}")
|> group(columns: ["_field"])
|> aggregateWindow(every: 1d, fn: mean, createEmpty: false) |> aggregateWindow(every: 1d, fn: mean, createEmpty: false)
|> pivot(rowKey: ["_time"], columnKey: ["_field"], valueColumn: "_value") |> pivot(rowKey: ["_time"], columnKey: ["_field"], valueColumn: "_value")
`), `),
@@ -99,6 +100,7 @@ export async function queryDaily(start, end) {
from(bucket: "${c.INFLUX_BUCKET}") from(bucket: "${c.INFLUX_BUCKET}")
|> range(start: ${start.toISOString()}, stop: ${end.toISOString()}) |> range(start: ${start.toISOString()}, stop: ${end.toISOString()})
|> filter(fn: (r) => r._measurement == "${m}") |> filter(fn: (r) => r._measurement == "${m}")
|> group(columns: ["_field"])
|> aggregateWindow(every: 1d, fn: min, createEmpty: false) |> aggregateWindow(every: 1d, fn: min, createEmpty: false)
|> pivot(rowKey: ["_time"], columnKey: ["_field"], valueColumn: "_value") |> pivot(rowKey: ["_time"], columnKey: ["_field"], valueColumn: "_value")
`), `),
@@ -106,19 +108,18 @@ export async function queryDaily(start, end) {
from(bucket: "${c.INFLUX_BUCKET}") from(bucket: "${c.INFLUX_BUCKET}")
|> range(start: ${start.toISOString()}, stop: ${end.toISOString()}) |> range(start: ${start.toISOString()}, stop: ${end.toISOString()})
|> filter(fn: (r) => r._measurement == "${m}") |> filter(fn: (r) => r._measurement == "${m}")
|> group(columns: ["_field"])
|> aggregateWindow(every: 1d, fn: max, createEmpty: false) |> aggregateWindow(every: 1d, fn: max, createEmpty: false)
|> pivot(rowKey: ["_time"], columnKey: ["_field"], valueColumn: "_value") |> pivot(rowKey: ["_time"], columnKey: ["_field"], valueColumn: "_value")
`), `),
]); ]);
// Mean values are the base — flat field names, no suffix
for(const row of means) { for(const row of means) {
const time = truncateToDay(row._time); const time = truncateToDay(row._time);
if(!results[time]) results[time] = {time}; if(!results[time]) results[time] = {time};
Object.assign(results[time], extractRow(row)); Object.assign(results[time], extractRow(row));
} }
// Only promote temp min/max to named fields, ignore the rest
for(const row of mins) { for(const row of mins) {
const time = truncateToDay(row._time); const time = truncateToDay(row._time);
if(!results[time]) results[time] = {time}; if(!results[time]) results[time] = {time};