viele Anpassungen

actions/data4map.js

@@ -135,40 +135,44 @@ export var getData4map = async (params) => {
         }
         let v4map = getValue4Map(typ)
         for (let sensor of properties) {
-            let id = sensor._id
-            const oneAktData = {
-                location: sensor.location[0].loc.coordinates,
-                id: sensor._id,
-                name: sensor.name[0].name,
-                indoor: sensor.location[0].indoor,
-                lastseen: sensor.values.timestamp
-            }
-            let now = new Date().getTime()
-            oneAktData.value = -1
-            if(oneAktData.lastseen !== '') {
-                let diff = now - oneAktData.lastseen.getTime()
-                if (diff >= 365 * 24 * 3600 * 1000) {
-                    oneAktData.value = -4
-                } else if (diff >= 30 * 24 * 3600 * 1000) {
-                    oneAktData.value = -3
-                } else if (diff >= 7 * 24 * 3600 * 1000) {
-                    oneAktData.value = -2
-                } else if (diff >= 2 * 3600 * 1000) {
-                    oneAktData.value = -1
-                } else {
-                    if (sensor.values !== undefined) {
-                        oneAktData.value = Math.round(sensor.values[v4map] * 100) / 100
-                    }
+            let oneAktData = {}
+            if (sensor.values !== undefined) {
+                oneAktData = {
+                    location: sensor.location[0].loc.coordinates,
+                    id: sensor._id,
+                    name: sensor.name[0].name,
+                    indoor: sensor.location[0].indoor,
+                    lastseen: sensor.values.timestamp
                 }
-                let weeks = Math.round(diff / (7 * 24 * 3600 * 1000))
-                oneAktData.weeks = weeks
-            }
-            if (sensor.values.timestamp > lastDate) {
-                lastDate = sensor.values.timestamp
+                let now = new Date().getTime()
+                if(oneAktData.lastseen !== '') {
+                    let diff = now - oneAktData.lastseen.getTime()
+                    if (diff >= 365 * 24 * 3600 * 1000) {
+                        oneAktData.value = -4
+                    } else if (diff >= 30 * 24 * 3600 * 1000) {
+                        oneAktData.value = -3
+                    } else if (diff >= 7 * 24 * 3600 * 1000) {
+                        oneAktData.value = -2
+                    } else if (diff >= 2 * 3600 * 1000) {
+                        oneAktData.value = -1
+                    } else {
+                        if (sensor.values !== undefined) {
+                            oneAktData.value = Math.round(sensor.values[v4map] * 100) / 100
+                        }
+                    }
+                    let weeks = Math.round(diff / (7 * 24 * 3600 * 1000))
+                    oneAktData.weeks = weeks
+                }
+                if (sensor.values.timestamp > lastDate) {
+                    lastDate = sensor.values.timestamp
+                }
+            } else {
+                oneAktData.value = -5 
+                oneAktData.weeks = 0
+                oneAktData.lastseen = ''
             }
             aktData.push(oneAktData)
         }
-//        logit(`Query duration: ${start.diffNow('seconds').toObject().seconds * -1} sec`)
         ret = {
             err: null,
             options: {

actions/getproperties.js

@@ -1,18 +1,10 @@
 // Fetch the properties for the given sensor
 
 import * as mongo from "../databases/mongo.js"
-import * as mock from "../mocks/mongo_mock.js"
 import {returnOnError} from "../utilities/reporterror.js"
 import checkParams from "../utilities/checkparams.js"
 
-const mockdb = false
-
-let readProperties
-if (mockdb) {
-    readProperties = mock.readProperties
-} else {
-    readProperties = mongo.readProperties
-}
+let readProperties = mongo.readProperties
 
 // Read properties for sensorid and properties for all other sensors on same location
 export const getOneProperty = async (params) => {

actions/getsensorData.js

@@ -1,5 +1,6 @@
 // get data for one sensor
 
+const DBASE = process.env.DBASE || 'mongo' 
 import {DateTime} from "luxon"
 import * as influx from "../databases/influx.js"
 import * as mongo from "../databases/mongo.js"
@@ -86,18 +87,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()
+        start = end = DateTime.local().toUTC()
         start = start.minus({days: opts.span})
     } else {
-        start = end = DateTime.fromISO(opts.datetime)
+        start = end = DateTime.fromISO(opts.datetime).toUTC()
         end = end.plus({days: opts.span})
     }
     if(opts.daystart) {
         start = start.startOf("day")
         end = end.startOf("day")
     }
-    start = start.toUTC()
-    end = end.toUTC()
+//    start = start.toUTC()
+//    end = end.toUTC()
     // if(opts.avg !== undefined) {
     //     start = start.minus({minutes: opts.avg})
     // }
@@ -150,11 +151,12 @@ export async function getSensorData(params) {
 
 //    export const getActData = async (opts) => {
 export async function getActData(opts) {
-//    let retI = await influx.fetchActData(opts)
-//    retI.mongo = false
-    let retM = await mongo.fetchActData(opts)
-    retM.mongo = true
-    return retM
+    if (DBASE === 'mongo') {
+        return await mongo.fetchActData(opts)
+    } else if (DBASE === 'influx') {
+       return await influx.fetchActData(opts)
+    }
+    return {err: 'DBASEUNKNOWN', values: []}    
 }