First running version

public/javascripts/chart_utilities.js

@@ -13,15 +13,19 @@ let nbrofdaysforavg = 8;                // Stundenmittel Anzahl Tagte (default =
 let nbrofdaysfordaynight = 30;          // use 30 days or day/night graphic
 let stucols = 1;                        // Anzeige nur Balken (StundenMittel)
 
+export const noise_ymin = 30;                    // lowest value on y-axis for noise
+export const noise_ymax = 120;                   // highest value on y-axis for noise
+let activeTab = 0;                      // active TAB number
+export let peaklim = 70;                       // threshold for peak count
+
+export const url = '/api'
 
 export function createGlobObtions() {
-    var globObject = {};
-
     // Options, die für alle Plots identisch sind
-    globObject = {
+    let globObject = {
         chart: {
             height: 600,
-//            width: 1000;
+//            width: 1000,
             spacingRight: 20,
             spacingLeft: 20,
             spacingTop: 25,
@@ -51,7 +55,7 @@ export function createGlobObtions() {
             useHTML: true,
         },
         subtitle: {
-            text: 'Gemessene Werte und ' + avgTime + 'min-gleitende Mittelwerte',
+//            text: 'Gemessene Werte und ' + avgTime + 'min-gleitende Mittelwerte',
             align: 'left',
         },
         tooltip: {
@@ -60,14 +64,6 @@ export function createGlobObtions() {
             borderWidth: 0,
             borderRadius: 0,
             useHTML: true,
-            formatter: function () {
-                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>' +
-                    Highcharts.numberFormat(this.y, 1) +
-                    '</b></div>';
-            }
         },
         xAxis: {
             type: 'datetime',
@@ -106,16 +102,16 @@ export function createGlobObtions() {
     return globObject;
 }
 
-function calcWeekends(data, isyear) {
-    var weekend = [];
-    var oldDay = 8;
-    for (var i = 0; i < data.length; i++) {
-        var mom = moment(data[i].date);
+export function calcWeekends(data, isyear) {
+    let weekend = [];
+    let oldDay = 8;
+    for (let i = 0; i < data.length; i++) {
+        let mom = moment(data[i].date);
         if (isyear) {
             mom = moment(data[i]._id)
         }
-        var day = mom.day();
-        var st = mom.startOf('day');
+        let day = mom.day();
+        let st = mom.startOf('day');
         if (day != oldDay) {
             if (day == 6) {
                 weekend.push({
@@ -138,21 +134,21 @@ function calcWeekends(data, isyear) {
     return weekend;
 }
 
-function calcDays(data, isyear) {
-    var days = [];
+export function calcDays(data, isyear) {
+    let days = [];
     if (data.length == 0) {
         return days
     }
-    var oldday = moment(data[0].date).day();
+    let oldday = moment(data[0].date).day();
     if (isyear) {
         oldday = moment(data[0]._id).day();
     }
-    for (var i = 0; i < data.length; i++) {
-        var m = moment(data[i].date);
+    for (let i = 0; i < data.length; i++) {
+        let m = moment(data[i].date);
         if (isyear) {
             m = moment(data[i]._id);
         }
-        var tag = m.day()
+        let tag = m.day()
         if (tag != oldday) {
             m.startOf('day');
             days.push({color: 'lightgray', value: m.valueOf(), width: 1, zIndex: 2});
@@ -162,26 +158,12 @@ function calcDays(data, isyear) {
     return days;
 };
 
-function getIndoor(sensor) {
-    let p = new Promise(function (resolve, reject) {
-        let url = '/api/getdata?data=props&sensorid=' + sensor;
-        $.get(url, (data, err) => {
-            if (err != 'success') {
-                resolve(false)
-            } else {
-                resolve(data.values[0].indoor == 1)
-            }
-        })
-    })
-    return p
-}
-
-export async function addSensorID2chart(chart, props, width) {
+export async function addSensorID2chart(chart, sensor, width) {
     console.log('widht: ',width);
-    let indoor = props.location[0].indoor
+    let indoor =sensor.indoor
     console.log('indoor: ',indoor)
     let sens = chart.renderer.label(
-        `Sensor: ${props._id} ${indoor ? ' (indoor)' : ''}`,
+        `Sensor: ${sensor.sid} ${indoor ? ' (indoor)' : ''}`,
         width / 2 - 100, 65,
         'text', 0, 0, true)
         .css({
@@ -192,3 +174,9 @@ export async function addSensorID2chart(chart, props, width) {
             zIndex: 5,
         }).add();
 }
+
+export const showError = (err) => {
+    document.querySelector('.modal-body').setHTML(err)
+    let myModal = new bootstrap.Modal(document.getElementById('dialogError'))
+    myModal.show()
+}