Automatic refresh after change of settings
routes/api.js - check error on return from server public/javascripts/global.js - reload pages with new values after save at settings public/javascripts/map.js - removed status.loaded=true after call to laodAll public/javascripts/showcharts.js - also load live at loadAll
This commit is contained in:
@@ -27,13 +27,10 @@ import { DateTime } from './luxon.min.js'
|
|||||||
refresh: 0,
|
refresh: 0,
|
||||||
}
|
}
|
||||||
|
|
||||||
let status = {
|
|
||||||
loaded: false
|
|
||||||
}
|
|
||||||
// END global variables
|
// END global variables
|
||||||
|
|
||||||
// Register events
|
// Register events
|
||||||
document.querySelector('#btnSave').addEventListener('click', () => {
|
document.querySelector('#btnSave').addEventListener('click', async () => {
|
||||||
const selDate = document.getElementById('startday').value
|
const selDate = document.getElementById('startday').value
|
||||||
let starttime
|
let starttime
|
||||||
if (selDate === 'today') {
|
if (selDate === 'today') {
|
||||||
@@ -52,8 +49,7 @@ import { DateTime } from './luxon.min.js'
|
|||||||
if(peak < 130 ) {
|
if(peak < 130 ) {
|
||||||
params.peak = peak
|
params.peak = peak
|
||||||
}
|
}
|
||||||
status.loaded = false
|
await loadAll(params)
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
@@ -82,14 +78,6 @@ import { DateTime } from './luxon.min.js'
|
|||||||
triggerEl.addEventListener('click', function (event) {
|
triggerEl.addEventListener('click', function (event) {
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
tabTrigger.show()
|
tabTrigger.show()
|
||||||
if((!status.loaded) || (this.id === 'kartentab')) {
|
|
||||||
for (let x of tabtable) {
|
|
||||||
if (x.id === event.currentTarget.id) {
|
|
||||||
x.func(params, x.type, x.container)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
logit(`tab changed to ${event.currentTarget.id}`)
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -108,12 +96,11 @@ import { DateTime } from './luxon.min.js'
|
|||||||
params.sid = csid
|
params.sid = csid
|
||||||
let ok = await showChart(params, 'live', 'dlive')
|
let ok = await showChart(params, 'live', 'dlive')
|
||||||
if (ok) {
|
if (ok) {
|
||||||
loadAll(params)
|
await loadAll(params)
|
||||||
status.loaded = true
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// show the map
|
// show the map
|
||||||
map.showMap(params, status)
|
map.showMap(params)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ let clickedcoords = {}
|
|||||||
const colorscale = ['#d53e4f', '#fc8d59', '#fee08b', '#e6f598', '#99d594', '#3288bd', '#808080'];
|
const colorscale = ['#d53e4f', '#fc8d59', '#fee08b', '#e6f598', '#99d594', '#3288bd', '#808080'];
|
||||||
const dba = [100, 80, 60, 40, 20, 0, -999];
|
const dba = [100, 80, 60, 40, 20, 0, -999];
|
||||||
|
|
||||||
export async function showMap(params, status) {
|
export async function showMap(params) {
|
||||||
utils.removeTabs()
|
utils.removeTabs()
|
||||||
|
|
||||||
if(map && map.remove) {
|
if(map && map.remove) {
|
||||||
@@ -60,8 +60,7 @@ export async function showMap(params, status) {
|
|||||||
bootstrap.Tab.getInstance(triggerEl).show() // Select tab by name
|
bootstrap.Tab.getInstance(triggerEl).show() // Select tab by name
|
||||||
let ok = await showChart(params, 'live', 'dlive')
|
let ok = await showChart(params, 'live', 'dlive')
|
||||||
if (ok) {
|
if (ok) {
|
||||||
loadAll(params)
|
await loadAll(params)
|
||||||
status.loaded = true
|
|
||||||
}
|
}
|
||||||
map.setView([clickedcoords.lat, clickedcoords.lng]);
|
map.setView([clickedcoords.lat, clickedcoords.lng]);
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ export async function showChart(params, typ, container) {
|
|||||||
|
|
||||||
export const loadAll = async (params) => {
|
export const loadAll = async (params) => {
|
||||||
console.log('now load all in Background')
|
console.log('now load all in Background')
|
||||||
for (let i = 2; i < tabtable.length; i++) {
|
for (let i = 1; i < tabtable.length; i++) {
|
||||||
let ok = await showChart(params, tabtable[i].type, tabtable[i].container)
|
let ok = await showChart(params, tabtable[i].type, tabtable[i].container)
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -32,6 +32,10 @@ router.get('/:cmd', async function(req, res, next) {
|
|||||||
if (response.status !== 200) {
|
if (response.status !== 200) {
|
||||||
res.json({err: `Error from servercall: status = ${response.status}`})
|
res.json({err: `Error from servercall: status = ${response.status}`})
|
||||||
}
|
}
|
||||||
|
if(response.data.err) {
|
||||||
|
res.json(response.data)
|
||||||
|
return
|
||||||
|
}
|
||||||
const options = response.data.options
|
const options = response.data.options
|
||||||
for(let x of disttable) {
|
for(let x of disttable) {
|
||||||
if (x.type === options.data) {
|
if (x.type === options.data) {
|
||||||
|
|||||||
Reference in New Issue
Block a user