Added info table to live chart
public/javascripts/datetime.js - wrong call fixed public/javascripts/global.js - direct call to live chart if sensorid is given public/javascripts/showcharts.js - info table added public/stylesheets/style.sass - style for infotabel - changed color vor nav tabs
This commit is contained in:
@@ -5,7 +5,7 @@ import { DateTime } from './luxon.min.js'
|
||||
export const showDate = (sofort) => {
|
||||
let d = DateTime.now()
|
||||
if(sofort || d.second === 0) {
|
||||
document.querySelector('#h1datum').setHTML(d.toFormat('yyyy-MM-dd HH:mm'))
|
||||
document.querySelector('#h1datum').innerHTML = d.toFormat('yyyy-MM-dd HH:mm')
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import * as chart_dayavg from './chart_dayavg.js'
|
||||
import * as chart_daynight from './chart_daynight.js'
|
||||
import * as chart_lden from './chart_lden.js'
|
||||
import * as utils from "./chart_utilities.js";
|
||||
import { tabtable, loadAll } from './showcharts.js'
|
||||
import {tabtable, loadAll, showChart} from './showcharts.js'
|
||||
import { DateTime } from './luxon.min.js'
|
||||
|
||||
|
||||
@@ -104,18 +104,23 @@ import { DateTime } from './luxon.min.js'
|
||||
setInterval(() => dt.showDate(false), 1000)
|
||||
|
||||
// show version and version-date
|
||||
document.querySelector('#versn').setHTML(`Version: ${sysparams.version} vom ${sysparams.date.slice(0,10)}`)
|
||||
document.querySelector('#versn').innerHTML =
|
||||
`Version: ${sysparams.version} vom ${sysparams.date.slice(0,10)}`
|
||||
|
||||
const csid = parseInt(sysparams.csid)
|
||||
if(csid !== -1) {
|
||||
let triggerEl = document.querySelector('#livetab')
|
||||
bootstrap.Tab.getInstance(triggerEl).show() // Select tab by name
|
||||
params.sid = csid
|
||||
await chart_live.showLive(params)
|
||||
let ok = await showChart(params, 'live', 'dlive')
|
||||
if (ok) {
|
||||
loadAll(params)
|
||||
status.loaded = true
|
||||
}
|
||||
} else {
|
||||
// show the map
|
||||
map.showMap(params, status)
|
||||
}
|
||||
|
||||
// show the map
|
||||
map.showMap(params, status)
|
||||
}
|
||||
|
||||
main().catch(console.error)
|
||||
|
||||
@@ -70,6 +70,24 @@ export async function showChart(params, typ, container) {
|
||||
sid: erg.params.sensorid,
|
||||
indoor: erg.params.indoor
|
||||
}, document.getElementById(container).offsetWidth)
|
||||
if(erg.info) {
|
||||
let wbreit = window.innerWidth
|
||||
let cbreit = chart.chartWidth
|
||||
let infoposx = wbreit - ((wbreit-cbreit)/2) -200
|
||||
let infoposy = chart.plotTop - 80
|
||||
chart.renderer.label(
|
||||
erg.info.text,
|
||||
infoposx,
|
||||
infoposy,
|
||||
'rect', 0, 0, true)
|
||||
.css({
|
||||
fontSize: '10pt',
|
||||
color: 'green'
|
||||
})
|
||||
.attr({
|
||||
zIndex: 5,
|
||||
}).add();
|
||||
}
|
||||
})
|
||||
return true
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user