WIP WIP prepared for Geiger

views/index_geiger.pug

@@ -0,0 +1,111 @@
+extends layout
+
+block content
+  header
+    #hline1
+      #h1name #{t("GeigerMeasurement")}
+      #h1datum
+
+  #fenster
+    #buttonsRight
+        button.btn.btn-primary#btnSet(value='set') #{t("Settings")}
+        button.btn.btn-primary#btnHelp(value='help') #{t("Info")}
+                
+  #map
+      #legendcontainer
+          .legend#legendcpm
+              #legend-inner-cpm
+                  .gradient
+                  .labels
+                      .label(style="bottom: 100%;") >= 5 µSv/h
+                      .label(style="bottom: 86%;") 2
+                      .label(style="bottom: 72%;") 1
+                      .label(style="bottom: 58%;") 0.5
+                      .label(style="bottom: 44%;") 0.2
+                      .label(style="bottom: 30%;") 0.1
+                      .label(style="bottom: 17%;") 0.05
+                      .label1(style="bottom: 10%;") offline
+                      .label1(style="bottom: 2%;") indoor
+  #mapdateactsens
+      #actsensors
+      #mapdate
+                    
+
+  #overlay
+      #loading Lade die Daten ...
+      #placeholderFS_1
+      #placeholderBME
+
+  // Error-Dialog
+  .modal.fade#dialogError(tabindex="-1" role="dialog" aria-labelledby="Error" aria-hidden="true")
+    .modal-dialog.modal-dialog-centered(role="document")
+      .modal-content
+        .modal-header
+          h5.modal-title.dialogErrorTitle #{t("Error")}
+          button(type="button" class="close" data-bs-dismiss="modal" aria-label="Close")
+            span(aria-hidden="true") ×
+        .modal-body
+        .modal-footer
+          //button(type="button" class="btn btn-secondary" data-bs-dismiss="modal") Close
+          // button(type="button" class="btn btn-primary") Save changes
+
+
+  // Settings-Dialog
+  .modal.fade#dialogSettings(tabindex="-1" role="dialog" aria-labelledby="Settings" aria-hidden="true")
+    .modal-dialog.modal-dialog-centered(role="document")
+      .modal-content
+        .modal-header
+          h5.modal-title.dialogErrorTitle #{t("Settings")}
+          button(type="button" class="close" data-bs-dismiss="modal" aria-label="Close")
+            span(aria-hidden="true") ×
+        .modal-body.settings
+          .rows
+            .column#stday
+              label.thelabels(for='startday') #{t("StartDate")}:
+              input.theInputs#startday(name='startday' )
+            .column
+            .column#nbday
+              label.thelabels(for='nbrofdays')
+                | #{t("NumberOfDays")}:<br />
+                // span.klein (#{t("Only_for_live_chart")})
+              input.theInputs#nbrofdays(type = 'number' name = 'nbrofdays', min="1", max="10")
+              span.klein &nbsp;&nbsp;(max. 10)
+            .column#pklim
+              label.thelabels(for='peaklim')
+                | #{t("Count_peaks_over")}
+              input.theInputs#peaklim(type = 'number' name = 'peaklim', min="10", max="130")
+              | &nbsp;&nbsp;dbA
+              span.klein &nbsp;&nbsp;(max. 130)
+            .column#odth
+              label.thelabels(for='olderthan')
+                | #{t("RemoveFromMap")}
+              input.theInputs#olderthan(type = 'number' name = 'olderthan', min="0", max="52")
+              | &nbsp;&nbsp;#{t("weeks")}
+              span.klein &nbsp;&nbsp;(max. 52)
+            .column
+            .column#sellan
+              label.thelabels
+                | #{t("Language")}:
+              .form-check.form-check-inline
+                input#de.form-check-input(type="radio" name="lanbut")
+                label.form-check-label(for='de') Deutsch
+              .form-check.form-check-inline
+                input#en.form-check-input(type="radio" name="lanbut", checked)
+                label.form-check-label(for="en") English
+        .modal-footer
+          button.btn.btn-secondary(type="button" data-bs-dismiss="modal") #{t("Close")}
+          button#btnSave.btn.btn-primary(type="button" data-bs-dismiss="modal") #{t("Save_changes")}
+
+
+  // Error-Dialog
+  .modal.fade#dialogReset(tabindex="-1" role="dialog" aria-labelledby="Error" aria-hidden="true")
+    .modal-dialog.modal-dialog-centered(role="document")
+      .modal-content
+        .modal-header
+          h5.modal-title.dialogErrorTitle Info
+          button(type="button" class="close" data-bs-dismiss="modal" aria-label="Close")
+            span(aria-hidden="true") &times;
+        .modal-body
+        .modal-footer
+          //button(type="button" class="btn btn-secondary" data-bs-dismiss="modal") Close
+          button(type="button" class="btn btn-primary" data-bs-dismiss="modal") OK

views/index_noise.pug

@@ -11,7 +11,10 @@ block content
   header
     #hline1
       #h1name #{t("NoiseMeasurement")}
-      #h1datum
+      #buttonsRight
+        button.btn.btn-primary#btnSet(value='set') #{t("Settings")}
+        button.btn.btn-primary#btnHelp(value='help') #{t("Info")}
+        #h1datum
 
   #fenster
     #navi
@@ -28,10 +31,6 @@ block content
           button.nav-link#daynighttab(data-bs-toggle="tab" data-bs-target="#t_daynight" type="button" role="tab" aria-controls="daynight" aria-selected="true") #{t("Day_Night")}
         li.nav-item(role='presentation')
           button.nav-link#ldentab(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') #{t("Settings")}
-      button.btn.btn-primary#btnHelp(value='help') #{t("Info")}
-
     .tab-content#thetabs
       .tab-pane.fade.show.active#t_map(role="tabpanel" aria-labelledby="map-tab")
         #map

views/layout.pug

@@ -12,14 +12,19 @@ html
     link(rel='stylesheet', href='/stylesheets/MarkerCluster.css')
     // link(rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr@4.6.13/dist/flatpickr.min.css")
     link(rel="stylesheet" href="https://cdn.jsdelivr.net/npm/vanillajs-datepicker@1.3.1/dist/css/datepicker.min.css")
-    link(rel='stylesheet', href='/stylesheets/style.css')
 
-  script.
-    let sysparams = {
-      version: '#{version}',
-      date: '#{date}',
-      csid: '#{csensor}'
-      }
+    script.
+      const sysparams = {
+        version: '#{version}',
+        date: '#{date}',
+        csid: '#{csensor}',
+        category: '#{category}'
+        };
+
+    if category === 'multigeiger'
+      link(rel='stylesheet', href='/stylesheets/style_geiger.css')
+    else
+      link(rel='stylesheet', href='/stylesheets/style.css')
 
   body
     #wrapper
@@ -40,4 +45,5 @@ html
     script(src="https://code.highcharts.com/highcharts.js")
     script(src="https://cdn.jsdelivr.net/npm/vanillajs-datepicker@1.3.1/dist/js/datepicker-full.min.js")
     script(src="https://cdn.jsdelivr.net/npm/vanillajs-datepicker@1.3.1/dist/js/locales/de.js")
+    script(src="https://cdnjs.cloudflare.com/ajax/libs/d3/7.0.0/d3.min.js")
     script(type="module" src="/javascripts/global.js")