Language switching works
app.js - call to index.js changed public/javascripts/global.js - no more show version - no more 'showReset routes/index.js - added 'translate'-function views/index.pug - texts changed for translation views/layout.pug - show version and date public/javascripts/map.js - added text from server charts/preparecharts.js - translate texts locales/[en|de]/translation.json - new translations charts/urils.js - added translations package.json "version": "3.0.2", "date": "2023-04-19 11:00 UTC",
This commit is contained in:
@@ -6,7 +6,6 @@ import * as dt from './datetime.js'
|
||||
import {logerror, logit} from './logit.js'
|
||||
import {tabtable, loadAll, showChart} from './showcharts.js'
|
||||
import { DateTime } from './luxon.min.js'
|
||||
import {showReset} from "./chart_utilities.js";
|
||||
|
||||
(async () => {
|
||||
|
||||
@@ -104,7 +103,7 @@ import {showReset} from "./chart_utilities.js";
|
||||
tabTrigger.show()
|
||||
currentTab = event.currentTarget.id
|
||||
if (currentTab === 'maptab') {
|
||||
map.showMap(params)
|
||||
map.showMap(params, sysparams)
|
||||
document.querySelector('#sellan').style.display = 'inline'
|
||||
}
|
||||
})
|
||||
@@ -114,10 +113,6 @@ import {showReset} from "./chart_utilities.js";
|
||||
// and show date/time every minute
|
||||
setInterval(() => dt.showDate(false), 1000)
|
||||
|
||||
// show version and version-date
|
||||
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')
|
||||
@@ -130,7 +125,7 @@ import {showReset} from "./chart_utilities.js";
|
||||
} else {
|
||||
// show the map
|
||||
document.querySelector('#sellan').style.display = 'inline'
|
||||
map.showMap(params)
|
||||
map.showMap(params,sysparams)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ const colorscale = ['#d53e4f', '#fc8d59', '#fee08b', '#e6f598', '#99d594', '#328
|
||||
const dba = [100, 80, 60, 40, 20, 0, -999];
|
||||
const APIURL = '/api/getmapdata?'
|
||||
|
||||
export async function showMap(params) {
|
||||
export async function showMap(params, sysparams) {
|
||||
utils.removeTabs()
|
||||
if(map && map.remove) {
|
||||
map.off();
|
||||
@@ -205,7 +205,7 @@ export async function buildMarkers() {
|
||||
lastseen: dt.formatISODate(x.lastseen),
|
||||
indoor: x.indoor
|
||||
})
|
||||
.on('click', e => onMarkerClick(e, true)) // define click- and
|
||||
.on('click', e => onMarkerClick(e, true, sensors.popuptxt)) // define click- and
|
||||
.bindPopup(popuptext); // and bint the popup text
|
||||
markers.addLayer(marker);
|
||||
}
|
||||
@@ -217,27 +217,27 @@ export async function buildMarkers() {
|
||||
}
|
||||
|
||||
|
||||
async function onMarkerClick(e, click) {
|
||||
async function onMarkerClick(e, click, txts) {
|
||||
let item = e.target.options;
|
||||
clickedSensor = item.name;
|
||||
clickedcoords = e.latlng
|
||||
|
||||
let offlinetext = `
|
||||
<tr><td colspan="2"><span style="color:red;">offline</span></td></tr>
|
||||
<tr><td>Last seen:</td><td>${item.lastseen}</td></tr>`
|
||||
<tr><td colspan="2"><span style="color:red;">${txts.offline}</span></td></tr>
|
||||
<tr><td>${txts.lastseen}:</td><td>${item.lastseen}</td></tr>`
|
||||
let normaltext = `
|
||||
<tr></tr><tr><td>LA_max:</td><td>${item.value}</td></tr>`
|
||||
|
||||
let popuptext = `
|
||||
<div id="infoTitle">
|
||||
<h4>Sensor: ${item.name}</h4>
|
||||
<h4>${txts.sensor}: ${item.name}</h4>
|
||||
<div id="infoTable">
|
||||
<table>
|
||||
<tr><td colspan="2"><span style="color:limegreen;">${item.indoor==1 ? "indoor" : ""}</span></td></tr>
|
||||
${item.value < 0 ? offlinetext : normaltext}
|
||||
</table>
|
||||
<div id="infoBtn">
|
||||
<a href="#" class="speciallink">Show chart</a>
|
||||
<a href="#" class="speciallink">${txts.showchart}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>`
|
||||
@@ -273,13 +273,7 @@ async function showLastDate(ld) {
|
||||
console.log(e)
|
||||
});
|
||||
let sensors = await ret.json()
|
||||
let actsensors = 0
|
||||
for (let x of sensors.values) {
|
||||
if (x.value >= 0) {
|
||||
actsensors++
|
||||
}
|
||||
}
|
||||
document.querySelector('#mapdate').innerText = 'Values from ' + dt.formatISODate(ld).slice(0,-3)
|
||||
document.querySelector('#actsensors').innerText = `Active sensors: ${actsensors} (registered: ${sensors.count})`
|
||||
document.querySelector('#mapdate').innerText = `${sensors.valfromtxt} ${dt.formatISODate(ld).slice(0,-3)}`
|
||||
document.querySelector('#actsensors').innerText = `${sensors.actsensors} ${sensors.registered}`
|
||||
// $('#actsensors').html(`${erg.count} aktive Sensoren (angemeldet ${allsens})`)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user