Peaks merged to havg/davh

index.pug
   - removed #dpeak1/#dpeak2

showcharts.js
   - removed second chart

public/stylesheets/style.sass
   - removed #dpeak1/2
   - ste height für char divs

public/javascripts/showcharts.js

@@ -16,41 +16,41 @@ export const tabtable = [
 
 export async function showChart(params, typ, container) {
     function form() {
-        for(let item of tabtable) {
+        for (let item of tabtable) {
             if (item.type === typ) {
                 const d = DateTime.fromMillis(this.x, {zone: 'utc'})
                 const d1 = d.plus({days: 1})
                 let fmt = d.toFormat(item.dformat)
-                if(((typ === 'daynight') && (this.series.name.startsWith('N'))) || (typ === 'lden')) {
+                if (((typ === 'daynight') && (this.series.name.startsWith('N'))) || (typ === 'lden')) {
                     fmt = `${d.toFormat('dd')}/${d1.toFormat('dd.LL')}`
                 }
-                if(this.series.name === 'Peaks') {
+                if (this.series.name === 'Peaks') {
                     item.div = 0
                 }
                 return '<div style="border: 2px solid ' + this.point.color + '; padding: 3px;">' +
                     fmt + '<br />' +
                     '<span style="color: ' + this.point.color + '">&#9679;&nbsp;</span>' +
                     this.series.name + ':&nbsp; <b>' +
-                    Highcharts.numberFormat(this.y,item.div) +
+                    Highcharts.numberFormat(this.y, item.div) +
                     '</b></div>'
             }
         }
     }
 
     function xformat() {
-        if(typ === 'lden') {
+        if (typ === 'lden') {
-        let lbl = this.axis.defaultLabelFormatter.call(this);
+            let lbl = this.axis.defaultLabelFormatter.call(this);
-        this.value += 86400000;
+            this.value += 86400000;
-        let lbl1 = this.axis.defaultLabelFormatter.call(this);
+            let lbl1 = this.axis.defaultLabelFormatter.call(this);
-        return parseInt(lbl) + '/' + lbl1;
+            return parseInt(lbl) + '/' + lbl1;
-    } else if ((typ === 'live') || (typ === 'havg')) {
+        } else if ((typ === 'live') || (typ === 'havg')) {
-        let v = this.axis.defaultLabelFormatter.call(this);
+            let v = this.axis.defaultLabelFormatter.call(this);
-        if (v.indexOf(':') == -1) {
+            if (v.indexOf(':') == -1) {
-            return '<span style="font-weight:bold;color:red">' + v + '<span>';
+                return '<span style="font-weight:bold;color:red">' + v + '<span>';
+            } else {
+                return v;
+            }
         } else {
-            return v;
-        }
-    } else {
             return this.axis.defaultLabelFormatter.call(this);
         }
     }
@@ -69,12 +69,6 @@ export async function showChart(params, typ, container) {
             indoor: erg.params.indoor
         }, document.getElementById(container).offsetWidth)
     })
-
-    if((typ === 'havg') || (typ === 'davg')) {
-        erg.options2.tooltip.formatter = form
-        erg.options2.xAxis.labels.formatter = xformat
-        let ch1 = Highcharts.chart(typ === 'havg' ? 'dpeak1' : 'dpeak2', erg.options2)
-        }
 }
 
 export const loadAll = async (params) => {

public/stylesheets/style.css

@@ -154,9 +154,10 @@ footer #author #versn {
   margin-top: 44px;
 }
 
-#dlive, #dhour, #dday, #ddaynight, #dlden, #dpeak1, #dpeak2 {
+#dlive, #dhour, #dday, #ddaynight, #dlden {
   width: 100%;
   margin: auto;
+  height: 80vh;
 }
 
 #dialogError {

public/stylesheets/style.css.map

@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["style.sass"],"names":[],"mappings":"AAWA;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAEF;EACE;EACA;EACA;EAEA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE,kBA7BoB;;AA+BpB;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;;;AAEJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;;AACA;EACE;;;AAEN;EACE;EAEA;EACA;EACA,eA3Ec;EA4Ed;EACA;EACA;;AAEA;EACE;EACA;EACA;;AACF;EACE;EACA;;;AAEJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AACF;EACE;EACA;;;AAEJ;EACE,kBA/FoB;;AAiGpB;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;;;AAGN;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE","file":"style.css"}
+{"version":3,"sourceRoot":"","sources":["style.sass"],"names":[],"mappings":"AAWA;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAEF;EACE;EACA;EACA;EAEA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE,kBA7BoB;;AA+BpB;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;;;AAEJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;;AACA;EACE;;;AAEN;EACE;EAEA;EACA;EACA,eA3Ec;EA4Ed;EACA;EACA;;AAEA;EACE;EACA;EACA;;AACF;EACE;EACA;;;AAEJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AACF;EACE;EACA;;;AAEJ;EACE,kBA/FoB;;AAiGpB;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;;;AAGN;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE","file":"style.css"}

public/stylesheets/style.sass

@@ -150,9 +150,10 @@ footer
 .tab-pane
   margin-top: 44px
 
-#dlive, #dhour, #dday, #ddaynight, #dlden, #dpeak1, #dpeak2
+#dlive, #dhour, #dday, #ddaynight, #dlden
   width: 100%
   margin: auto
+  height: 80vh
 
 #dialogError
   color: red
@@ -163,3 +164,4 @@ footer
 .highcharts-tooltip
   zIndex: 5
 
+

views/index.pug

@@ -35,10 +35,8 @@ block content
         #dlive
       .tab-pane.fade#t_houravg(role="tabpanel" aria-labelledby="map-tab")
         #dhour
-        #dpeak1
+Peaks merged to       .tab-pane.fade#t_dayavg(role="tabpanel" aria-labelledby="map-tab")
-      .tab-pane.fade#t_dayavg(role="tabpanel" aria-labelledby="map-tab")
         #dday
-        #dpeak2
       .tab-pane.fade#t_daynight(role="tabpanel" aria-labelledby="map-tab")
         #ddaynight  DayNightTAB
       .tab-pane.fade#t_lden(role="tabpanel" aria-labelledby="map-tab")