admin/noise
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP WIP WIP *** Now with tabs

Browse Source
This commit is contained in:
rxf
2023-03-15 16:08:33 +01:00
parent b270370105
commit 0a89e05329
9 changed files with 88 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/vcs.xml
Generated
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
public/javascripts/datetime.js
+1 -1
View File
@@ -5,7 +5,7 @@ import { DateTime } from './luxon.min.js'
export const showDate = (sofort) => {
let d = DateTime.now()
if(sofort || d.second === 0) {
$('#h1datum').text(d.toFormat('yyyy-MM-dd HH:mm'))
document.querySelector('#h1datum').setHTML(d.toFormat('yyyy-MM-dd HH:mm'))
}
}
public/javascripts/global.js
+14 -3
View File
@@ -4,7 +4,7 @@
import * as map from './map.js'
import * as dt from './datetime.js'
$(async() => {
(async function () {
// global constants
const Stuttgart = [48.779, 9.16]
const MAXROWS_IN_TABLE = 1000
@@ -28,13 +28,24 @@ $(async() => {
async function main() {
// initialise tabs
let triggerTabList = [].slice.call(document.querySelectorAll('#myTab a'))
triggerTabList.forEach(function (triggerEl) {
let tabTrigger = new bootstrap.Tab(triggerEl)
triggerEl.addEventListener('click', function (event) {
event.preventDefault()
tabTrigger.show()
})
})
// show dat/time at start
dt.showDate(true)
// and show date/time every minute
setInterval(() => dt.showDate(false), 1000)
// show version and version-date
$('#versn').text(`Version: ${sysparams.version} vom ${sysparams.date.slice(0,10)}`)
document.querySelector('#versn').setHTML(`Version: ${sysparams.version} vom ${sysparams.date.slice(0,10)}`)
// show the map
map.showMap(params)
@@ -42,4 +53,4 @@ $(async() => {
}
main().catch(console.error)
})
})()
public/javascripts/map.js
+1 -1
View File
@@ -250,7 +250,7 @@ export async function buildMarkers() {
markers.addLayer(marker);
}
map.addLayer(markers);
showLastDate(sensors.lastDate);
// ToDo showLastDate(sensors.lastDate);
}
public/stylesheets/style.css
+18
View File
@@ -43,6 +43,24 @@ header #h1name {
}
header #h1datum {
float: right;
margin-top: 5px;
}
#fenster {
margin-top: 45px;
background: lightgray;
padding-top: 5px;
}
#fenster #navi {
float: left;
margin-left: 1%;
}
#fenster #buttonsRight {
float: right;
margin-right: 1%;
}
#fenster #buttonsRight #btnSet {
margin-right: 20px;
}
#map {
public/stylesheets/style.css.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"sourceRoot":"","sources":["style.sass"],"names":[],"mappings":"AAUA;EACE;EACA;EACA;EACA;EACA;EACA;EACA,kBAfW;;;AAiBb;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;AAEA;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;;;AAGJ;EACE;EACA;EACA;EACA;EACA,eA1Dc;EA2Dd;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;;;AAGJ;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA","file":"style.css"}
{"version":3,"sourceRoot":"","sources":["style.sass"],"names":[],"mappings":"AAUA;EACE;EACA;EACA;EACA;EACA;EACA;EACA,kBAfW;;;AAiBb;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;AAEA;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;;;AAEJ;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;;AACA;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA,eAzEc;EA0Ed;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;;;AAGJ;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA","file":"style.css"}
public/stylesheets/style.sass
+15
View File
@@ -49,7 +49,22 @@ header
#h1datum
float: right
margin-top: 5px
#fenster
margin-top: 45px
background: lightgray
padding-top: 5px
#navi
float: left
margin-left: 1%
#buttonsRight
float: right
margin-right: 1%
#btnSet
margin-right: 20px
#map
margin-left: 1vw
views/index.pug
+32 -2
View File
@@ -3,8 +3,38 @@ extends layout
block content
header
#hline1
#h1name Lärm-Messung
#h1name Noise Measurement
#h1datum
#fenster
#navi
ul.nav.nav-tabs#tablist
li.nav-item(role='presentation')
button.nav-link.active#kartentab(data-bs-toggle="tab" data-bs-target="#t_map" type="button" role="tab" aria-controls="map" aria-selected="true") Map
li.nav-item(role='presentation')
button.nav-link.active#livetab(data-bs-toggle="tab" data-bs-target="#t_live" type="button" role="tab" aria-controls="live" aria-selected="true") Live
li.nav-item(role='presentation')
button.nav-link.active#houravgtab(data-bs-toggle="tab" data-bs-target="#t_houravg" type="button" role="tab" aria-controls="houravg" aria-selected="true") Hour_AVG
li.nav-item(role='presentation')
button.nav-link.active#dayavgtab(data-bs-toggle="tab" data-bs-target="#t_dayavg" type="button" role="tab" aria-controls="dayavg" aria-selected="true") Day_AVG
li.nav-item(role='presentation')
button.nav-link.active#daynightab(data-bs-toggle="tab" data-bs-target="#t_daynight" type="button" role="tab" aria-controls="daynight" aria-selected="true") Day_Night
li.nav-item(role='presentation')
button.nav-link.active#ldenab(data-bs-toggle="tab" data-bs-target="#t_lden" type="button" role="tab" aria-controls="lden" aria-selected="true") L<sub>DEN</sub>-Index
#buttonsRight
button.btn.btn-primary#btnSet(value='set') Settings
button.btn.btn-primary#btnHelp(value='help') Info
#map
.tab-content#thetabs
.tab-pane.fade.show.active#t_map(role="tabpanel" aria-labelledby="map-tab")
#map MapTAB
.tab-pane.fade.show.active#t_live(role="tabpanel" aria-labelledby="map-tab")
#placeholderNOI1 LiveTAB
.tab-pane.fade.show.active#t_houravg(role="tabpanel" aria-labelledby="map-tab")
#placeholderNOI2 HourTAB
.tab-pane.fade.show.active#t_dayavg(role="tabpanel" aria-labelledby="map-tab")
#placeholderNOI3 DayTAB
.tab-pane.fade.show.active#t_daynight(role="tabpanel" aria-labelledby="map-tab")
#placeholderNOI4 DayNightTAB
.tab-pane.fade.show.active#t_lden(role="tabpanel" aria-labelledby="map-tab")
#placeholderNOI5 LdenTAB
views/layout.pug
-2
View File
@@ -39,8 +39,6 @@ html
script(src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"
integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4"
crossorigin="anonymous")
script(src="https://code.jquery.com/jquery-3.6.4.min.js"
integrity="sha256-oP6HI9z1XaZNBrJURtCoUT5SUnxFr8s3BzRl+cbzUq8=" crossorigin="anonymous")
script(src="https://unpkg.com/leaflet@1.9.3/dist/leaflet.js"
integrity="sha256-WBkoXOwTeyKclOHuWtc+i2uENFpDZ9YPdf5Hf+D7ewM="
crossorigin="")