From 094fba596645c860c8bf3475d5294c104c05fe93 Mon Sep 17 00:00:00 2001
From: Robert Richter <robertrichter87@web.de>
Date: Tue, 7 Jul 2020 16:31:01 +0200
Subject: [PATCH] update Di 7. Jul 16:31:01 CEST 2020

---
 public/js/client_dbrd.js            | 5 ++++-
 server/sql_qry.js                   | 3 ---
 server/waip.js                      | 8 +++++---
 views/includes/master_dashboard.pug | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/public/js/client_dbrd.js b/public/js/client_dbrd.js
index 7d97d60..6f049c8 100755
--- a/public/js/client_dbrd.js
+++ b/public/js/client_dbrd.js
@@ -357,9 +357,12 @@ socket.on('io.Einsatz', function (data) {
   if (data.besonderheiten) {
     $('#einsatzort_list').append('<li class="list-group-item text-warning">' + data.besonderheiten+ '</li>');
   };
+  // Alte Einsatzmittel loeschen
+  var table_em = document.getElementById('table_einsatzmittel');
+  table_em.getElementsByTagName('tbody')[0].innerHTML = '';
   // Einsatzmittel-Tabelle
   for (var i in data.einsatzmittel) {
-    var table_em = document.getElementById('table_einsatzmittel');
+
     var wache_vorhanden = false;
     var wache_zeile = 0;
     var wachen_idstr =data.einsatzmittel[i].wachenname.replace(/[^A-Z0-9]+/ig, '_');
diff --git a/server/sql_qry.js b/server/sql_qry.js
index 7168013..ea03a60 100755
--- a/server/sql_qry.js
+++ b/server/sql_qry.js
@@ -570,10 +570,7 @@ module.exports = function (db, app_cfg) {
 
   function db_socket_get_dbrd(waip_id, callback) {
     // Client-Eintrag per Socket-ID finden
-    console.log(waip_id);
     db.all('select socket_id from waip_clients where client_status = ? and socket_id like \'/dbrd#%\'', [waip_id], function (err, rows) {
-      console.log(rows);
-      console.log(err);
       if (err == null && rows) {
         callback && callback(rows);
       } else {
diff --git a/server/waip.js b/server/waip.js
index ad68811..9ccb772 100755
--- a/server/waip.js
+++ b/server/waip.js
@@ -332,9 +332,11 @@ module.exports = function (io, sql, fs, brk, async, app_cfg) {
           if (socket_ids) {
             socket_ids.forEach(function (row) {
               var socket = io.of('/dbrd').connected[row.socket_id];
-              socket.emit('io.deleted', null);
-              sql.db_log('DBRD', 'Dashboard mit dem  Socket ' + socket.id + ' getrennt, da Einsatz gelöscht.');
-              sql.db_client_update_status(socket, null);
+              if (typeof socket !== 'undefined') {
+                socket.emit('io.deleted', null);
+                sql.db_log('DBRD', 'Dashboard mit dem  Socket ' + socket.id + ' getrennt, da Einsatz gelöscht.');
+                sql.db_client_update_status(socket, null);
+              };
             });
           };
         });
diff --git a/views/includes/master_dashboard.pug b/views/includes/master_dashboard.pug
index f129c53..41226df 100755
--- a/views/includes/master_dashboard.pug
+++ b/views/includes/master_dashboard.pug
@@ -178,7 +178,7 @@ style(type='text/css').
                 th(scope='col').text-info.pl-3 Wache
                 th(scope='col').text-info.pl-3 Einsatzmittel
             tbody
-              //tr
+              tr
                 th(scope='row') CB FW Cottbus 1
                 td
                   div.d-flex.flex-wrap.justify-content-between.align-items-center
@@ -198,7 +198,7 @@ style(type='text/css').
                       div.d-flex.justify-content-between
                         div.pr-2 FL CB 01/85-01
                         div.p-2.badge.badge-info 1
-              //tr
+              tr
                 th(scope='row') CB FW Madlow
                 td 
                   div.d-flex.flex-wrap.justify-content-between.align-items-center