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

---
 public/js/rueckmeldung_client.js | 4 +---
 server/sql_qry.js                | 8 +++++---
 views/show_active_waip.pug       | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/js/rueckmeldung_client.js b/public/js/rueckmeldung_client.js
index 0482b58..693fb1f 100755
--- a/public/js/rueckmeldung_client.js
+++ b/public/js/rueckmeldung_client.js
@@ -40,6 +40,4 @@ $('#rueckmeldung').each(function(index) {
   $(this).on("click", function(){
     $('#responseModal').modal('show');
   });
-});
-
-console.log(einsatzdaten);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/server/sql_qry.js b/server/sql_qry.js
index 6b5b13f..f720ee6 100644
--- a/server/sql_qry.js
+++ b/server/sql_qry.js
@@ -468,7 +468,7 @@ module.exports = function(db, async, app_cfg) {
   };
 
   function db_get_active_waips(callback) {
-    db.all(`select we.einsatzart, we.stichwort, we.ort, we.ortsteil,
+    db.all(`select we.uuid, we.einsatzart, we.stichwort, we.ort, we.ortsteil,
     GROUP_concat(DISTINCT substr( wa.nr_wache, 0, 3 )) a,
     GROUP_concat(DISTINCT substr( wa.nr_wache, 0, 5 )) b,
     GROUP_concat(DISTINCT wa.nr_wache) c
@@ -674,11 +674,13 @@ module.exports = function(db, async, app_cfg) {
   };
 
   function db_get_einsatzdaten_by_uuid(waip_uuid, callback){
-    db.get(`SELECT e.id, e.ZEITSTEMPEL, e.EINSATZART, e.STICHWORT, e.SONDERSIGNAL, e.OBJEKT, e.ORT, 
+    db.get(`SELECT e.id, e.uuid, e.ZEITSTEMPEL, e.EINSATZART, e.STICHWORT, e.SONDERSIGNAL, e.OBJEKT, e.ORT, 
       e.ORTSTEIL, e.STRASSE, e.BESONDERHEITEN, e.wgs84_x, e.wgs84_y, e.wgs84_area FROM WAIP_EINSAETZE e 
       WHERE e.uuid like ?`, [waip_uuid], function(err, row) {
       if (err == null && row) {
-        db.all(`SELECT e.wachenname, e.einsatzmittel, e.status FROM waip_einsaztmittel e 
+        console.log(row.uuid);
+        console.log(row.id);
+        db.all(`SELECT e.wachenname, e.einsatzmittel, e.status FROM waip_einsatzmittel e 
           WHERE e.waip_einsaetze_id = ?`, [row.id], function(err, rows) {
           if (err == null && rows) {
             var einsatzdaten = row;
diff --git a/views/show_active_waip.pug b/views/show_active_waip.pug
index f666c5e..734799d 100644
--- a/views/show_active_waip.pug
+++ b/views/show_active_waip.pug
@@ -9,7 +9,7 @@ block content
         .col-12        
           ol
             each val in dataSet
-              li= val.einsatzart + ', ' + val.stichwort + ', ' + val.ort + ' ' + val.ortsteil
+              li= val.einsatzart + ', ' + val.stichwort + ', ' + val.ort + ' ' + val.ortsteil + ' (' + val.uuid + ')'
                 ul
                   if val.a
                     each val_a in (val.a).split(",")