From 6871cb96b488bfb42ff1218713e6231a573f27df Mon Sep 17 00:00:00 2001
From: Robert Richter <robertrichter87@web.de>
Date: Sun, 16 Feb 2020 10:31:01 +0100
Subject: [PATCH] update So 16. Feb 10:31:01 CET 2020

---
 server/socket.js              |  2 +-
 server/sql_qry.js             | 32 +++++++++++++++++---------------
 views/includes/modal_rmld.pug |  7 +++++++
 views/waip.pug                |  6 +++---
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/server/socket.js b/server/socket.js
index db24f6b..0027269 100755
--- a/server/socket.js
+++ b/server/socket.js
@@ -41,7 +41,7 @@ socket_api.emit('CH01', 'me', 'test msg');
                 waip.einsatz_verteilen(result_einsatz[0].waip_einsaetze_ID, socket.id, wachen_id);
                 sql.db_update_client_status(socket, result_einsatz[0].waip_einsaetze_ID);
                 //vorhanden Rückmeldungen verteilen
-                sql.db_get_response(result_einsatz[0].waip_einsaetze_ID, function(result){
+                sql.db_get_response_wache(result_einsatz[0].waip_einsaetze_ID, function(result){
                   if (result) {
                     waip.reuckmeldung_verteilen(result_einsatz[0].waip_einsaetze_ID, result);
                   };
diff --git a/server/sql_qry.js b/server/sql_qry.js
index d831e24..bf811d2 100644
--- a/server/sql_qry.js
+++ b/server/sql_qry.js
@@ -677,7 +677,7 @@ module.exports = function(db, async, app_cfg) {
   };
   
   function db_get_response_wache(waip_einsaetze_id, wachen_nr, callback) {
-    db.all(`SELECT response_json FROM waip_response WHERE waip_einsaetze_id = ?`, [waip_einsaetze_id], function (err, row) {
+    db.all(`SELECT response_json FROM waip_response WHERE waip_einsaetze_id = ?`, [waip_einsaetze_id], function (err, rows) {
       if (err == null && rows) {
         // temporaere Variablen
         var itemsProcessed = 0;
@@ -693,21 +693,23 @@ module.exports = function(db, async, app_cfg) {
         // Zeilen einzelnen durchgehen
         rows.forEach(function (item, index, array) {
           // summiertes JSON-Rueckmeldeobjekt für die angeforderte Wachennummer erstellen
-          if (item.wachen_nr.startsWith(wachen_nr)) {
-            // response_wache aufsummieren
-            if (Number.isInteger(item.einsatzkraft)) {
-              response_wache.einsatzkraft = response_wache.einsatzkraft + item.einsatzkraft;
+          if (item.wachen_nr) {
+            if (item.wachen_nr.startsWith(wachen_nr)) {
+              // response_wache aufsummieren
+              if (Number.isInteger(item.einsatzkraft)) {
+                response_wache.einsatzkraft = response_wache.einsatzkraft + item.einsatzkraft;
+              };
+              if (Number.isInteger(item.maschinist)) {
+                response_wache.maschinist = response_wache.maschinist + item.maschinist;
+              };
+              if (Number.isInteger(item.fuehrungskraft)) {
+                response_wache.fuehrungskraft = response_wache.fuehrungskraft + item.fuehrungskraft;
+              };
+              if (Number.isInteger(item.atemschutz)) {
+                response_wache.atemschutz = response_wache.atemschutz + item.atemschutz;
+              };
             };
-            if (Number.isInteger(item.maschinist)) {
-              response_wache.maschinist = response_wache.maschinist + item.maschinist;
-            };
-            if (Number.isInteger(item.fuehrungskraft)) {
-              response_wache.fuehrungskraft = response_wache.fuehrungskraft + item.fuehrungskraft;
-            };
-            if (Number.isInteger(item.atemschutz)) {
-              response_wache.atemschutz = response_wache.atemschutz + item.atemschutz;
-            };
-          };
+          };  
           // Schleife ggf. beenden
           itemsProcessed++;
           if (itemsProcessed === array.length) {
diff --git a/views/includes/modal_rmld.pug b/views/includes/modal_rmld.pug
index c342d1d..2a531c7 100644
--- a/views/includes/modal_rmld.pug
+++ b/views/includes/modal_rmld.pug
@@ -1,4 +1,11 @@
 // Modal
+
+- if (!einsatzdaten) {
+-    einsatzdaten.uuid = '0';
+-    einsatzdaten.wachen.waip_wachen_ID = null;
+-    einsatzdaten.wachen.wachenname = '';
+-  }
+
 #responseModal.modal.fade(tabindex='-1', role='dialog', aria-hidden='true')
   .modal-dialog.modal-dialog-centered(role='document')
     .modal-content
diff --git a/views/waip.pug b/views/waip.pug
index 23df3b7..4e78eae 100644
--- a/views/waip.pug
+++ b/views/waip.pug
@@ -5,7 +5,7 @@ append head
 
 block content
   include includes/modal_info
-  //include includes/modal_rmld
+  include includes/modal_rmld
   .container-fluid
     #waipclock.d-none
       include includes/master_clock
@@ -13,7 +13,7 @@ block content
       include includes/master_wachalarm
 
   script.
-    var map_tile = !{JSON.stringify(map_tile).replace(/<\//g, '<\\/')}
+    var map_tile = !{JSON.stringify(public.map_tile).replace(/<\//g, '<\\/')}
     var client_id = !{JSON.stringify(app_id).replace(/<\//g, '<\\/')}
   script(src='/js/leaflet.js')
   script(src='/js/textFit.min.js')
@@ -21,4 +21,4 @@ block content
   script.
     wachen_id="#{wachen_id}"
     waip_id=null
-  script(src='/js/waip_client.js')
+  script(src='/js/client_waip.js')