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

---
 public/js/rueckmeldung_client.js |  6 ++--
 server/routing.js                |  2 +-
 views/includes/rueckmeldung.pug  | 47 +++++++++-----------------------
 views/includes/wachalarm.pug     |  2 +-
 views/response.pug               |  5 ++--
 5 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/public/js/rueckmeldung_client.js b/public/js/rueckmeldung_client.js
index 1abdb80..23d5996 100755
--- a/public/js/rueckmeldung_client.js
+++ b/public/js/rueckmeldung_client.js
@@ -36,10 +36,10 @@ var map = L.map('map', {
 
 
   // Split timestamp into [ Y, M, D, h, m, s ]
-  console.log(einsatzdaten);
-  var t1 = eisnatzdaten.zeitstempel.split(/[- :]/);
+  console.log(einsatzdaten_obj);
+  var t1 = einsatzdaten_obj.zeitstempel.split(' ');
 
-  var start = new Date(t1[0], t1[1] - 1, t1[2], t1[3], t1[4], t1[5]);
+  $("#einsatz_datum").text(t1[0]);
 
 
 
diff --git a/server/routing.js b/server/routing.js
index 58c8542..ffb071a 100644
--- a/server/routing.js
+++ b/server/routing.js
@@ -51,7 +51,7 @@ module.exports = function(app, sql, app_cfg, passport, auth, udp) {
     var waip_uuid = req.params.waip_uuid;
     sql.db_get_einsatzdaten_by_uuid(waip_uuid, function(einsatzdaten) {
       if (einsatzdaten) {
-        res.render('test_rueckmeldung', {
+        res.render('response', {
           title: 'Einsatz-Rückmeldung',
           user: req.user,
           einsatzdaten: einsatzdaten
diff --git a/views/includes/rueckmeldung.pug b/views/includes/rueckmeldung.pug
index edddbf2..484b328 100755
--- a/views/includes/rueckmeldung.pug
+++ b/views/includes/rueckmeldung.pug
@@ -1,10 +1,8 @@
 .row.no-gutters
   .col-6
-
-  a #{' ' + start}
-    p.text-muted 01.01.2020 
+    p#einsatz_datum.text-muted 01.01.2020 
   .col-6
-    p.text-muted.text-right 11:22:33
+    p#einsatz_uhrzeit.text-muted.text-right 11:22:33
   .col-10
     case einsatzdaten.einsatzart
       when 'Brandeinsatz'
@@ -69,36 +67,17 @@
               div.d-flex.justify-content-between
                 div.pr-2 #{val.einsatzmittel}
                 unless val.status == null
-                  div.p-2.badge.badge-success 2
-
-
-
-
-
-          div.flex-fill.rounded.bg-light.p-2.m-1
-            div.d-flex.justify-content-between
-              div.pr-2 FL CB 00/00-00
-              div.p-2.badge.badge-success 2
-          div.flex-fill.rounded.bg-light.p-2.m-1
-            div.d-flex.justify-content-between
-              div.pr-2 FL CB 01/00-00
-              div.p-2.badge.badge-warning 3
-          div.flex-fill.rounded.bg-light.p-2.m-1
-            div.d-flex.justify-content-between
-              div.pr-2 FL CB T-Dienst
-              div.p-2.badge.badge-danger 4
-          div.flex-fill.rounded.bg-light.p-2.m-1
-            div.d-flex.justify-content-between 
-              div.pr-2 FL CB 12/00-00
-              div.p-2.badge.badge-success 2
-          div.flex-fill.rounded.bg-light.p-2.m-1
-            div.d-flex.justify-content-between
-              div.pr-2 FL SPN 00/00-00
-              div.p-2.badge.badge-info 1
-          div.flex-fill.rounded.bg-light.p-2.m-1
-            div.d-flex.justify-content-between 
-              div.pr-2 KAT CB 00/00-00
-              div.p-2.badge.badge-success 2  
+                  case val.status
+                    when 1
+                      div.p-2.badge.badge-info #{val.status}
+                    when 2
+                      div.p-2.badge.badge-success #{val.status}
+                    when 3
+                      div.p-2.badge.badge-warning #{val.status}
+                    when 4
+                      div.p-2.badge.badge-danger #{val.status}
+                    default
+                      div.p-2.badge.badge-dark #{val.status}
   //.col-12
     div.border-top.my-3
     .card.bg-secondary.mt-2
diff --git a/views/includes/wachalarm.pug b/views/includes/wachalarm.pug
index 61998e8..75220d1 100644
--- a/views/includes/wachalarm.pug
+++ b/views/includes/wachalarm.pug
@@ -4,7 +4,7 @@
       .ion-md-play-circle
     button#volume.btn.btn-outline-dark.h-100.mx-1.tf_singleline
       .ion-md-volume-high
-    #date-time.
+    #date-time
       .tf_singleline -Datum- - -Uhrzeit-  
   .col-6.h-5.d-flex.flex-row.align-items-center.justify-content-end.py-1.text-dark.tf_singleline
     #wachenname.ion-md-business=data_wache || ' -Wachenname-'
diff --git a/views/response.pug b/views/response.pug
index 712af6b..a49a033 100755
--- a/views/response.pug
+++ b/views/response.pug
@@ -1,13 +1,14 @@
 extends layout
 
 append head
-  //link(rel='stylesheet', href='/css/ionicons.min.css')
   link(rel='stylesheet', href='/css/leaflet.css')
 
 block content
-  include includes/modal_global
+  include includes/modal_info
   include includes/modal_response
   .container-fluid
     include includes/rueckmeldung
+  script.
+    var einsatzdaten_obj = !{JSON.stringify(einsatzdaten).replace(/<\//g, '<\\/')}
   script(src='/js/leaflet.js')
   script(src='/js/rueckmeldung_client.js')
\ No newline at end of file