diff --git a/public/javascripts/chart_utilities.js b/public/javascripts/chart_utilities.js index 3879a15..08732a5 100644 --- a/public/javascripts/chart_utilities.js +++ b/public/javascripts/chart_utilities.js @@ -171,7 +171,7 @@ export async function addSensorID2chart(chart, sensor, width) { 'font-weight': 'bold', }) .attr({ - zIndex: 5, + zIndex: 2, }).add(); } diff --git a/public/javascripts/showcharts.js b/public/javascripts/showcharts.js index f57818f..2c7ce21 100644 --- a/public/javascripts/showcharts.js +++ b/public/javascripts/showcharts.js @@ -6,11 +6,11 @@ import * as map from "./map.js"; // table to distribute the different charts export const tabtable = [ {id: 'kartentab', type: 'map', container: 'map', func: map.showMap, div: null, dformat: null}, - {id: 'livetab', type: 'live', container: 'dlive', func: showChart, div: 100, dformat: "dd.LL - HH:mm:ss"}, - {id: 'houravgtab', type: 'havg', container: 'dhour', func: showChart, div: 10, dformat: "dd.LL - HH'h'"}, - {id: 'dayavgtab', type: 'davg', container: 'dday', func: showChart, div: 10, dformat: "dd.LL"}, - {id: 'daynighttab', type: 'daynight', container: 'ddaynight', func: showChart, div: 10, dformat: "dd.LL"}, - {id: 'ldentab', type: 'lden', container: 'dlden', func: showChart, div: 10, dformat: "dd.LL"}, + {id: 'livetab', type: 'live', container: 'dlive', func: showChart, div: 2, dformat: "dd.LL - HH:mm:ss"}, + {id: 'houravgtab', type: 'havg', container: 'dhour', func: showChart, div: 1, dformat: "dd.LL - HH'h'"}, + {id: 'dayavgtab', type: 'davg', container: 'dday', func: showChart, div: 1, dformat: "dd.LL"}, + {id: 'daynighttab', type: 'daynight', container: 'ddaynight', func: showChart, div: 1, dformat: "dd.LL"}, + {id: 'ldentab', type: 'lden', container: 'dlden', func: showChart, div: 1, dformat: "dd.LL"}, ] @@ -24,11 +24,15 @@ export async function showChart(params, typ, container) { if(((typ === 'daynight') && (this.series.name.startsWith('N'))) || (typ === 'lden')) { fmt = `${d.toFormat('dd')}/${d1.toFormat('dd.LL')}` } - let y = Math.round(this.y * item.div) / item.div + if(this.series.name === 'Peaks') { + item.div = 0 + } return '
' + fmt + '
' + '● ' + - this.series.name + ':  ' + y + '
' + this.series.name + ':  ' + + Highcharts.numberFormat(this.y,item.div) + + '' } } } @@ -62,7 +66,10 @@ export async function showChart(params, typ, container) { erg.options.xAxis.labels.formatter = xformat erg.options.tooltip.formatter = form let chr = Highcharts.chart(container, erg.options, function (chart) { - utils.addSensorID2chart(chart, {sid: erg.params.sensorid, indoor: erg.params.indoor}, document.getElementById(container).offsetWidth) + utils.addSensorID2chart(chart, { + sid: erg.params.sensorid, + indoor: erg.params.indoor + }, document.getElementById(container).offsetWidth) }) if((typ === 'havg') || (typ === 'davg')) { diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index 3c5cf58..c6e8742 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -167,4 +167,8 @@ footer #author #versn { border: red solid 2px; } +.highcharts-tooltip { + zIndex: 5; +} + /*# sourceMappingURL=style.css.map */ diff --git a/public/stylesheets/style.css.map b/public/stylesheets/style.css.map index eea3cff..a13f772 100644 --- a/public/stylesheets/style.css.map +++ b/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;EAEA;;;AAEF;EACE;;;AAEF;EACE","file":"style.css"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/public/stylesheets/style.sass b/public/stylesheets/style.sass index 9e452bf..9d17aa9 100644 --- a/public/stylesheets/style.sass +++ b/public/stylesheets/style.sass @@ -152,11 +152,13 @@ footer #dlive, #dhour, #dday, #ddaynight, #dlden, #dpeak1, #dpeak2 width: 100% - // height: 100% margin: auto #dialogError color: red .modal-content - border: red solid 2px \ No newline at end of file + border: red solid 2px + +.highcharts-tooltip + zIndex: 5 \ No newline at end of file