Added week to settings

This commit is contained in:
rxf
2023-04-21 17:31:39 +02:00
parent 7763c1e43d
commit 58e25bf468
8 changed files with 41 additions and 19 deletions
+5 -2
View File
@@ -3,7 +3,7 @@
"Settings": "Einstellungen", "Settings": "Einstellungen",
"Info": "Info", "Info": "Info",
"StartDate": "Start Datum", "StartDate": "Start Datum",
"NumberOfDays": "Anzahl Tage", "NumberOfDays": "So viele Tage anzeigen",
"Only_for_live_chart": "Nur bei 'live' Grafik", "Only_for_live_chart": "Nur bei 'live' Grafik",
"Count_peaks_over": "Zähle Spitzen über", "Count_peaks_over": "Zähle Spitzen über",
"Close": "Schließen", "Close": "Schließen",
@@ -39,5 +39,8 @@
"DailyMeanValuesOfLDEN-Index": "Tages-Mittelwerte des L<sub>DEN</sub>-Index", "DailyMeanValuesOfLDEN-Index": "Tages-Mittelwerte des L<sub>DEN</sub>-Index",
"Date": "Datum", "Date": "Datum",
"Version": "Version", "Version": "Version",
"from": "vom" "from": "vom",
"RemoveFromMap": "Sensoren nicht anzeigen, die nicht gesendet haben seit",
"weeks": "Wochen"
} }
+5 -2
View File
@@ -3,7 +3,7 @@
"Settings": "Einstellungen", "Settings": "Einstellungen",
"Info": "Info", "Info": "Info",
"StartDate": "Start Datum", "StartDate": "Start Datum",
"NumberOfDays": "Anzahl Tage", "NumberOfDays": "So viele Tage anzeigen",
"Only_for_live_chart": "Nur bei 'live' Grafik", "Only_for_live_chart": "Nur bei 'live' Grafik",
"Count_peaks_over": "Zähle Spitzen über", "Count_peaks_over": "Zähle Spitzen über",
"Close": "Schließen", "Close": "Schließen",
@@ -39,5 +39,8 @@
"DailyMeanValuesOfLDEN-Index": "Tages-Mittelwerte des L<sub>DEN</sub>-Index", "DailyMeanValuesOfLDEN-Index": "Tages-Mittelwerte des L<sub>DEN</sub>-Index",
"Date": "Datum", "Date": "Datum",
"Version": "Version", "Version": "Version",
"from": "vom" "from": "vom",
"RemoveFromMap": "Sensoren nicht anzeigen, die nicht gesendet haben seit",
"weeks": "Wochen"
} }
+5 -3
View File
@@ -2,8 +2,8 @@
"NoiseMeasurement": "Noise Measurement", "NoiseMeasurement": "Noise Measurement",
"Settings": "Settings", "Settings": "Settings",
"Info": "Info", "Info": "Info",
"StartDate": "Start date:", "StartDate": "Start date",
"NumberOfDays": "Number of days", "NumberOfDays": "Show so many days",
"Only_for_live_chart": "Only for 'live' chart", "Only_for_live_chart": "Only for 'live' chart",
"Count_peaks_over": "Count peaks over", "Count_peaks_over": "Count peaks over",
"Close": "Close", "Close": "Close",
@@ -39,5 +39,7 @@
"DailyMeanValuesOfLDEN-Index": "Daily mean values of L<sub>DEN</sub>-Index", "DailyMeanValuesOfLDEN-Index": "Daily mean values of L<sub>DEN</sub>-Index",
"Date": "Date", "Date": "Date",
"Version": "Version", "Version": "Version",
"from": "from" "from": "from",
"RemoveFromMap": "Don't show sensors that have not sent for",
"weeks": "weeks"
} }
+6
View File
@@ -21,6 +21,7 @@ import { DateTime } from './luxon.min.js'
zoom: 10, zoom: 10,
span: 1, span: 1,
peak: 70, peak: 70,
weeks: 4,
datetime: '', datetime: '',
seldate: 'today', seldate: 'today',
refresh: 0, refresh: 0,
@@ -46,6 +47,7 @@ import { DateTime } from './luxon.min.js'
params.seldate = selDate params.seldate = selDate
const span = document.getElementById('nbrofdays').value const span = document.getElementById('nbrofdays').value
const peak = document.getElementById('peaklim').value const peak = document.getElementById('peaklim').value
const weeks = document.getElementById('olderthan').value
console.log(starttime, span, peak) console.log(starttime, span, peak)
if(span < 10) { if(span < 10) {
params.span = span params.span = span
@@ -53,6 +55,9 @@ import { DateTime } from './luxon.min.js'
if(peak < 130 ) { if(peak < 130 ) {
params.peak = peak params.peak = peak
} }
if (weeks < 52) {
params.weeks = weeks
}
let newlng = document.querySelector('#sellan input:checked').id let newlng = document.querySelector('#sellan input:checked').id
let oldlng = localStorage.getItem('curlang') let oldlng = localStorage.getItem('curlang')
localStorage.setItem('curlang', newlng) localStorage.setItem('curlang', newlng)
@@ -75,6 +80,7 @@ import { DateTime } from './luxon.min.js'
document.getElementById('startday').value = params.seldate document.getElementById('startday').value = params.seldate
document.getElementById('nbrofdays').value = params.span document.getElementById('nbrofdays').value = params.span
document.getElementById('peaklim').value = params.peak document.getElementById('peaklim').value = params.peak
document.getElementById('olderthan').value = params.weeks
myModal.show() myModal.show()
}) })
+1
View File
@@ -64,6 +64,7 @@ export async function showMap(params, sysparams) {
await loadAll(params) await loadAll(params)
} }
params.center = [clickedcoords.lat, clickedcoords.lng] params.center = [clickedcoords.lat, clickedcoords.lng]
map.setView([clickedcoords.lat, clickedcoords.lng]);
}) })
}) })
} }
+5 -5
View File
@@ -177,7 +177,7 @@ footer #author #versn {
} }
.thelabels { .thelabels {
width: 40%; width: 50%;
float: left; float: left;
} }
@@ -197,11 +197,11 @@ footer #author #versn {
} }
#startday { #startday {
width: 60%; width: 40%;
} }
#nbrofdays, #peaklim { #nbrofdays, #peaklim, #olderthan {
width: 20%; width: 10%;
} }
.addit { .addit {
@@ -209,7 +209,7 @@ footer #author #versn {
border: 1px solid blue; border: 1px solid blue;
} }
#klein { .klein {
font-size: 80%; font-size: 80%;
} }
+5 -5
View File
@@ -170,7 +170,7 @@ footer
text-align: left text-align: left
.thelabels .thelabels
width: 40% width: 50%
float: left float: left
// border: 1px solid green // border: 1px solid green
@@ -189,16 +189,16 @@ footer
margin-bottom: 15px margin-bottom: 15px
#startday #startday
width: 60% width: 40%
#nbrofdays, #peaklim #nbrofdays, #peaklim, #olderthan
width: 20% width: 10%
.addit .addit
width: 20% width: 20%
border: 1px solid blue border: 1px solid blue
#klein .klein
font-size: 80% font-size: 80%
.infoTafel th,td .infoTafel th,td
+9 -2
View File
@@ -80,14 +80,21 @@ block content
.column .column
label.thelabels(for='nbrofdays') label.thelabels(for='nbrofdays')
| #{t("NumberOfDays")}:<br /> | #{t("NumberOfDays")}:<br />
span#klein (#{t("Only_for_live_chart")}) span.klein (#{t("Only_for_live_chart")})
input.theInputs#nbrofdays(type = 'number' name = 'nbrofdays') input.theInputs#nbrofdays(type = 'number' name = 'nbrofdays')
| &nbsp;&nbsp;(max. 10) span.klein &nbsp;&nbsp;(max. 10)
.column .column
label.thelabels(for='peaklim') label.thelabels(for='peaklim')
| #{t("Count_peaks_over")} | #{t("Count_peaks_over")}
input.theInputs#peaklim(type = 'number' name = 'peaklim') input.theInputs#peaklim(type = 'number' name = 'peaklim')
| &nbsp;&nbsp;dbA | &nbsp;&nbsp;dbA
span.klein &nbsp;&nbsp;(max. 130)
.column
label.thelabels(for='olderthan')
| #{t("RemoveFromMap")}
input.theInputs#olderthan(type = 'number' name = 'olderthan')
| &nbsp;&nbsp;#{t("weeks")}
span.klein &nbsp;&nbsp;(max. 52)
.column#sellan .column#sellan
label.thelabels label.thelabels
| #{t("Language")}: | #{t("Language")}: