From f6ca61cbdddaa1988783d233f644ce14bdc34acc Mon Sep 17 00:00:00 2001
From: Robert Richter <robertrichter87@web.de>
Date: Thu, 6 Feb 2020 16:01:01 +0100
Subject: [PATCH] update Do 6. Feb 16:01:01 CET 2020

---
 public/js/rueckmeldung_client.js  | 90 +++++++++++++++++++++----------
 views/includes/modal_response.pug | 19 +++----
 2 files changed, 70 insertions(+), 39 deletions(-)

diff --git a/public/js/rueckmeldung_client.js b/public/js/rueckmeldung_client.js
index 23d5996..a217ecd 100755
--- a/public/js/rueckmeldung_client.js
+++ b/public/js/rueckmeldung_client.js
@@ -4,44 +4,78 @@
 
 // Karte definieren
 var map = L.map('map', {
-    zoomControl: false
-  }).setView([51.733005, 14.338048], 13);
-  
-  // Layer der Karte
-  mapLink = L.tileLayer(
-    'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-    //map_tile, {
-      maxZoom: 18
-    }).addTo(map);
-  
-  // Icon der Karte zuordnen
-  var redIcon = new L.Icon({
-    iconUrl: '/media/marker-icon-2x-red.png',
-    shadowUrl: '/media/marker-shadow.png',
-    iconSize: [25, 41],
-    iconAnchor: [12, 41],
-    popupAnchor: [1, -34],
-    shadowSize: [41, 41]
-  });
-  
-  // Icon setzen
-  var marker = L.marker(new L.LatLng(0, 0), {
-    icon: redIcon
+  zoomControl: false
+}).setView([51.733005, 14.338048], 13);
+
+// Layer der Karte
+mapLink = L.tileLayer(
+  'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+  //map_tile, {
+    maxZoom: 18
   }).addTo(map);
 
+// Icon der Karte zuordnen
+var redIcon = new L.Icon({
+  iconUrl: '/media/marker-icon-2x-red.png',
+  shadowUrl: '/media/marker-shadow.png',
+  iconSize: [25, 41],
+  iconAnchor: [12, 41],
+  popupAnchor: [1, -34],
+  shadowSize: [41, 41]
+});
+
+// Icon setzen
+var marker = L.marker(new L.LatLng(0, 0), {
+  icon: redIcon
+}).addTo(map);
+
+// Karte setzen
+map.removeLayer(marker);
+marker = L.marker(new L.LatLng(einsatzdaten_obj.wgs84_x, einsatzdaten_obj.wgs84_y), {
+  icon: redIcon
+}).addTo(map);
+map.setView(new L.LatLng(einsatzdaten_obj.wgs84_x, einsatzdaten_obj.wgs84_y), 13);
+
 
 /* ########################### */
 /* ####### Funktionen ######## */
 /* ########################### */
 
 
-  // Split timestamp into [ Y, M, D, h, m, s ]
-  console.log(einsatzdaten_obj);
-  var t1 = einsatzdaten_obj.zeitstempel.split(' ');
-
-  $("#einsatz_datum").text(t1[0]);
+// Split timestamp into [ Y, M, D, h, m, s ]
+var t1 = einsatzdaten_obj.zeitstempel.split(/[- :]/);
+var d = new Date(t1[0], t1[1] - 1, t1[2], t1[3], t1[4], t1[5]);
 
+// Zeitwerte
+var curr_day = d.getDay();
+var curr_date = d.getDate();
+var curr_month_id = d.getMonth();
+curr_month_id = curr_month_id + 1;
+var curr_year = d.getFullYear();
+var curr_hour = d.getHours();
+var curr_min = d.getMinutes();
+var curr_sek = d.getSeconds();
+// Tag und Monat Anpassen
+if ((String(curr_date)).length == 1)
+  curr_date = '0' + curr_date;
+if ((String(curr_month_id)).length == 1)
+  curr_month_id = '0' + curr_month_id;
+// Uhrzeit anpassen
+if (curr_min <= 9) {
+  curr_min = '0' + curr_min;
+};
+if (curr_hour <= 9) {
+  curr_hour = '0' + curr_hour;
+};
+if (curr_sek <= 9) {
+  curr_sek = '0' + curr_sek;
+};
+var curr_month = d.getMonth();
+var curr_year = d.getFullYear();
 
+// Datum und Uhrzeit setzen
+$("#einsatz_datum").text(curr_date + '.' + curr_month_id + '.' + curr_year);
+$("#einsatz_uhrzeit").text(curr_hour + ':' + curr_min + ':' + curr_sek);
 
 
 /* ########################### */
diff --git a/views/includes/modal_response.pug b/views/includes/modal_response.pug
index be07ff3..2eed7ab 100644
--- a/views/includes/modal_response.pug
+++ b/views/includes/modal_response.pug
@@ -7,7 +7,6 @@
         button.close(type='button', data-dismiss='modal', aria-label='Close')
           span(aria-hidden='true') ×
       #responseModalBody.modal-body
-        //h4.text-info Aufgabenwahrnehmung
         p.text-muted Ich komme als ...
           .form-group
             .custom-control.custom-radio.form-control-lg
@@ -23,7 +22,6 @@
               label.custom-control-label(for='radios_res_fk')
                 | Führungskraft
         div.border-top.my-3
-        //h4.text-info AGT
         .form-group
           .custom-control.custom-switch
             input#cb_res_agt.custom-control-input(type='checkbox')
@@ -32,18 +30,17 @@
         div.border-top.my-3
         p.text-muted in ungefähr ...
           .form-group
-            custom-select
-              select.custom-select
-                option() bitte Eintreffzeit wählen
-                option(value='1') 5 Minuten
-                option(value='2') 10 Minuten
-                option(value='3') 15 Minuten
-                option(value='4') 20 Minuten
+            select#eintreffzeit.form-control.form-control-lg
+              option(value=null) bitte Eintreffzeit wählen
+              option(value='5') 5 Minuten
+              option(value='10') 10 Minuten
+              option(value='15') 15 Minuten
+              option(value='20') 20 Minuten
         p.text-muted zur Wache ...
           .form-group
-            custom-select
+            select#wachenauswahl.form-control.form-control-lg
               select.custom-select
-                option(selected='') bitte Wache wählen
+                option(value=null) bitte Wache wählen
                 option(value='1') CB FW Cottbus 1
                 option(value='2') CB FW Cottbus 3
                 option(value='3') CB FW Madlow