From 5d10f681eab5ba209c1a9e7ec358641be60a5959 Mon Sep 17 00:00:00 2001 From: rxf Date: Thu, 25 May 2023 09:24:12 +0200 Subject: [PATCH] changed date/time to local time actions/getsensorData.js - interpret given date/time as local time and convert ist to UTC for database databases/influx.js - log for 'read' added utilities/logit.js - print time in local time sensorspecials/noise.js - print starttime im options as local time - remove 'zone:utc' from every time function --- actions/getsensorData.js | 9 ++++++--- databases/influx.js | 1 + sensorspecials/noise.js | 14 +++++++------- utilities/logit.js | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/actions/getsensorData.js b/actions/getsensorData.js index 332962e..c7b0733 100644 --- a/actions/getsensorData.js +++ b/actions/getsensorData.js @@ -72,16 +72,18 @@ export const calcRange = (opts) => { let start, end let ret = { start: start, stop: end, err: null} if((opts.datetime === null) || (opts.datetime === undefined) || (opts.datetime === '')) { - start = end = DateTime.local().toUTC() + start = end = DateTime.local() start = start.minus({days: opts.span}) } else { - start = end = DateTime.fromISO(opts.datetime, {zone: 'utc'}) + start = end = DateTime.fromISO(opts.datetime) end = end.plus({days: opts.span}) } if(opts.daystart) { start = start.startOf("day") end = end.startOf("day") } + start = start.toUTC() + end = end.toUTC() if(opts.avg !== undefined) { start = start.minus({minutes: opts.avg}) } @@ -156,7 +158,8 @@ ${sorting} } -// ..../api/getavgdata?sensorid=123&span=2&avg=10&moving=true&datetime=2022-04-12T13:14:15Z +// ..../api/getavgdata? +// ToDo: check UTC !!!! export var getAvgData = async (params) => { let ret = {data: {count: 0, values: []}, err: null} let {opts, err} = checkParams(params, diff --git a/databases/influx.js b/databases/influx.js index f4a037e..1c8c9e5 100644 --- a/databases/influx.js +++ b/databases/influx.js @@ -19,6 +19,7 @@ const INFLUXURL_WRITE = `http://${INFLUXHOST}:${INFLUXPORT}/api/v2/write?org=${I export const influxRead = async (query) => { let start = DateTime.now() + logit(`ReadInflux from ${INFLUXURL_READ}`) let erg = { values: [], err: null} try { let ret = await axios({ diff --git a/sensorspecials/noise.js b/sensorspecials/noise.js index 9c850a5..2221857 100644 --- a/sensorspecials/noise.js +++ b/sensorspecials/noise.js @@ -48,7 +48,7 @@ export const getNoiseData = async (params, possibles, props) => { sid: opts.sensorid, indoor: props.location[0].indoor, span: opts.span, - start: opts.start.slice(7), + start: DateTime.fromISO(opts.start.slice(7)), data: opts.data, peak: opts.peak, count: erg.values.length, @@ -183,7 +183,7 @@ async function getdavgData(opts) { count += item.count; pk += item.peakcount; if (werte.datetime === undefined) { - let dt = DateTime.fromISO(item.datetime, {zone: 'utc'}) + let dt = DateTime.fromISO(item.datetime) werte.datetime = dt.startOf('day').toISO() } } @@ -211,7 +211,7 @@ async function getdavgData(opts) { // add the actual date to wert, if werte is undefined const addDatetime = (werte, item) => { if (werte.datetime === undefined) { - let dt = DateTime.fromISO(item.datetime, {zone: 'utc'}) + let dt = DateTime.fromISO(item.datetime) werte.datetime = dt.startOf('day').toISO() } } @@ -496,14 +496,14 @@ peak = data // hour in an element in docs becomes the index into the new array (for every new day this // index will be incremented by 24). Missing values are marked by: {n_sum=-1, n_AVG=-1}. // For havg add the missed hours to the arry - const misshours = DateTime.fromISO(ret.values[0].datetime, {zone: 'utc'}).get('hour') + const misshours = DateTime.fromISO(ret.values[0].datetime).get('hour') let hoursArr = new Array(opts.span * 24 + misshours); // generate new array hoursArr.fill(emptyValues) // fill array with 'empty' values - let startDay = DateTime.fromISO(ret.values[0].datetime, {zone: 'utc'}).get('day') // calc first day + let startDay = DateTime.fromISO(ret.values[0].datetime).get('day') // calc first day let k = 0 for (let d of ret.values) { // loop through docs - let stunde = DateTime.fromISO(d.datetime, {zone: 'utc'}).get('hour') // get current hour - let day = DateTime.fromISO(d.datetime, {zone: 'utc'}).get('day') // get current day + let stunde = DateTime.fromISO(d.datetime).get('hour') // get current hour + let day = DateTime.fromISO(d.datetime).get('day') // get current day if (day != startDay) { // if date has changed k += 24 // increment index by 24 startDay = day diff --git a/utilities/logit.js b/utilities/logit.js index 7a870e4..7a4e0c8 100644 --- a/utilities/logit.js +++ b/utilities/logit.js @@ -10,7 +10,7 @@ export function logit(str) { export function logerror(str) { if(MOCHA_TEST) return - let s = `${DateTime.utc().toISO()} => *** ERROR *** ${str}`; + let s = `${DateTime.toISO()} => *** ERROR *** ${str}`; console.log(s); }