First running version

public/javascripts/chart_live.js

@@ -1,22 +1,18 @@
 // Show the live data chart
 import {logit, logerror} from './logit.js'
 import * as utils from './chart_utilities.js'
+import {DateTime} from "./luxon.min.js";
 
 // ******************************************************************
 // PlotDayLive_Noise
 // ******************************************************************
 
-let noise_ymin = 30;                    // lowest value on y-axis for noise
-let noise_ymax = 120;                   // highest value on y-axis for noise
-let activeTab = 0;                      // active TAB number
-let peaklim = 70;                       // threshold for peak count
 
-
-export const showLive = (params) => {
-    PlotDayLive_Noise(37833)
+export const showLive = async (params) => {
+    await PlotDayLive_Noise(params.sid)
 }
 
-export const PlotDayLive_Noise = async (sid) => {
+const PlotDayLive_Noise = async (sid) => {
 
     let series1 = []
     let series2 = []
@@ -26,49 +22,54 @@ export const PlotDayLive_Noise = async (sid) => {
     let aktVal = {}
 
     // read the data from the server
-    const url = `http://localhost:3004/getsensordata?type=noise&sensorid=${sid}`
+    const url = `/api/getsensordata?&sensorid=${sid}`
     let ret = await fetch(url)
         .catch(e => {
             logerror(e)
         });
-    let sensors = await ret.json()
-    let lastidx = sensors.count-1
-    // Put values into the arrays
-    let cnt = 0
-    sensors.values.forEach((x) => {
-        let dat = new Date(x.datetime).getTime()
-        series1.push([dat, x.noise_LAeq])
-        series2.push([dat, x.noise_LA_max])
-        series3.push([dat, x.noise_LA_min])			// put data and value into series array
-    })
+    let data = await ret.json()
 
-    if (sensors.values.length != 0) {
-        // Aktuelle Werte speichern
-        aktVal['LAeq'] = sensors.values[lastidx].noise_LAeq
-        aktVal['LAMax'] = sensors.values[lastidx].noise_LA_max
-        aktVal['LAMin'] = sensors.values[lastidx].noise_LA_min
+    if(!data.err) {
+        let lastidx = data.count - 1
+        // Put values into the arrays
+        let cnt = 0
+        data.values.forEach((x) => {
+            let dat = new Date(x.datetime).getTime()
+            series1.push([dat, x.noise_LAeq])
+            series2.push([dat, x.noise_LA_max])
+            series3.push([dat, x.noise_LA_min])			// put data and value into series array
+        })
 
-        // InfoTafel füllen
-        let infoTafel =
-            '<table class="infoTafel"><tr >' +
-            '<th colspan="3">Aktuelle Werte</th>' +
-            '</tr><tr>' +
-            '<td>LAeq</td><td>' + (aktVal.LAeq).toFixed(1) + '</td><td>dbA</td>'
-        infoTafel +=
-            '</tr><tr>' +
-            '<td>LAmin</td><td>' + (aktVal.LAMin).toFixed(0) + '</td><td>dbA</td>'
-        infoTafel +=
-            '</tr><tr>' +
-            '<td>LAmax</td><td>' + (aktVal.LAMax).toFixed(0) + '</td><td>dbA</td>'
-        infoTafel +=
-            '</tr></table>' +
-            '</div>'
+        if (data.values.length != 0) {
+            // Aktuelle Werte speichern
+            aktVal['LAeq'] = data.values[lastidx].noise_LAeq
+            aktVal['LAMax'] = data.values[lastidx].noise_LA_max
+            aktVal['LAMin'] = data.values[lastidx].noise_LA_min
+
+            // InfoTafel füllen
+            let infoTafel =
+                '<table class="infoTafel"><tr >' +
+                '<th colspan="3">Aktuelle Werte</th>' +
+                '</tr><tr>' +
+                '<td>LAeq</td><td>' + (aktVal.LAeq).toFixed(1) + '</td><td>dbA</td>'
+            infoTafel +=
+                '</tr><tr>' +
+                '<td>LAmin</td><td>' + (aktVal.LAMin).toFixed(0) + '</td><td>dbA</td>'
+            infoTafel +=
+                '</tr><tr>' +
+                '<td>LAmax</td><td>' + (aktVal.LAMax).toFixed(0) + '</td><td>dbA</td>'
+            infoTafel +=
+                '</tr></table>' +
+                '</div>'
+        }
+        let txtMeldung = false
+    } else {
+        utils.showError(data.err)
     }
-    let txtMeldung = false
 
 
     // Plot-Options
-    let options = utils.createGlobObtions()
+    let options = utils.createGlobObtions('dd.LL  HH:mm:ss')
 
     let series_LAeq = {
         name: 'LAeq',
@@ -138,10 +139,11 @@ export const PlotDayLive_Noise = async (sid) => {
                 color: 'black'
             }
         },
-        max: noise_ymax,
-        min: noise_ymin,
+        max: utils.noise_ymax,
+//        min: utils.noise_ymin,
+        min: 20,
 //            opposite: true,
-        tickAmount: 10,
+        tickAmount: 11,
         useHTML: true,
     }
 
@@ -167,6 +169,13 @@ export const PlotDayLive_Noise = async (sid) => {
         },
         relativeTo: 'chart'
     }
+    options.tooltip.formatter =  function () {
+        let y = Math.round(this.y * 100) / 100
+        return '<div style="border: 2px solid ' + this.point.color + '; padding: 3px;">' +
+            DateTime.fromMillis(this.x, {zone: 'utc'}).toFormat("dd.LL - HH:mm:ss") + '<br />' +
+            '<span style="color: ' + this.point.color + '">&#9679;&nbsp;</span>' +
+            this.series.name + ':&nbsp; <b>' + y + '</b></div>'
+    }
 
 
     let noDataTafel = '<div class="errTafel">' +
@@ -180,7 +189,7 @@ export const PlotDayLive_Noise = async (sid) => {
     let navtime = [-24, -12, 0, 12, 24]
 
     let chr = Highcharts.chart('dlive', options, function (chart) {
-        utils.addSensorID2chart(chart, sensors.props, document.getElementById('dlive').offsetWidth)
+        utils.addSensorID2chart(chart, {sid: data.sid, indoor: data.indoor}, document.getElementById('dlive').offsetWidth)
         // let breit = $(window).width()
         // let navx = breit-350
         // chart.renderer.label(