From 5b7a87a346e67816500468c52ed58adc15dea97e Mon Sep 17 00:00:00 2001
From: Robert Richter <robertrichter87@web.de>
Date: Sun, 21 Jun 2020 20:31:01 +0200
Subject: [PATCH] update So 21. Jun 20:31:01 CEST 2020

---
 databasudo               |  0
 public/js/client_waip.js | 40 +++++++++++++++++++++++-----------------
 server/waip.js           |  2 +-
 3 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 databasudo

diff --git a/databasudo b/databasudo
new file mode 100644
index 0000000..e69de29
diff --git a/public/js/client_waip.js b/public/js/client_waip.js
index 295d3f9..cca6f48 100644
--- a/public/js/client_waip.js
+++ b/public/js/client_waip.js
@@ -267,12 +267,12 @@ socket.on('io.playtts', function (data) {
   var audio = $('#audio');
   audio.src = (data);
   console.log($('#audio'));
-  
+
   // Audio-Blockade des Browsers erkennen
   var promise = document.querySelector('audio').play();
   console.log(document.querySelector('audio').play());
-  console.log( audio);
-  
+  console.log(audio);
+
   /*if (promise !== undefined) {
     console.log(promise);
     promise.then(function (_) {
@@ -289,10 +289,10 @@ socket.on('io.playtts', function (data) {
   // In browsers that don’t yet support this functionality,
   // playPromise won’t be defined.
   if (playPromise !== undefined) {
-    playPromise.then(function() {
+    playPromise.then(function () {
       // Automatic playback started!
       audio.play();
-    }).catch(function(error) {
+    }).catch(function (error) {
       // Automatic playback failed.
       // Show a UI element to let the user manually start playback.
       $('#volume').addClass('btn-danger');
@@ -405,20 +405,26 @@ socket.on('io.new_waip', function (data) {
   };
   // weitere alarmierte Einsatzmittel setzen
   $('#em_weitere').html('');
-  var data_em_weitere = {};
-  data_em_weitere = JSON.parse(data.em_weitere);
-  
-  if (data_em_weitere.length > 0) {
-    var tmp;
-    for (var i in data_em_weitere) {
-      if (tmp) {
-        tmp = tmp + ', ' + data_em_weitere[i].name;
-      } else {
-        tmp = data_em_weitere[i].name;
+
+  try {
+    var data_em_weitere = JSON.parse(data.em_weitere);
+
+    if (data_em_weitere.length > 0) {
+      var tmp;
+      for (var i in data_em_weitere) {
+        if (tmp) {
+          tmp = tmp + ', ' + data_em_weitere[i].name;
+        } else {
+          tmp = data_em_weitere[i].name;
+        };
       };
+      $('#em_weitere').html(tmp);
     };
-    $('#em_weitere').html(tmp);
+  } catch (e) {
+    console.log(e); // error in the above string (in this case, yes)!
   };
+
+
   // Karte leeren
   map.removeLayer(marker);
   map.removeLayer(geojson);
@@ -494,7 +500,7 @@ var counter_rmld = [];
 function reset_rmld(p_uuid) {
   var bar_uuid = 'bar-' + p_uuid;
   $('#pg-ek').children().each(function (i) {
-    if (!$(this).hasClass(bar_uuid))  {
+    if (!$(this).hasClass(bar_uuid)) {
       $(this).remove();
     };
   });
diff --git a/server/waip.js b/server/waip.js
index d7e5707..7b4db2f 100755
--- a/server/waip.js
+++ b/server/waip.js
@@ -13,7 +13,7 @@ module.exports = function (io, sql, fs, brk, async, app_cfg) {
       // nach dem Speichern anhand der waip_id die beteiligten Wachennummern zum Einsatz ermitteln 
       sql.db_einsatz_get_rooms(waip_id, function (socket_rooms) {
         // socket_rooms muss groesser als 1 sein, da sonst nur der Standard-Raum '0' vorhanden ist
-        if (socket_rooms.length > 1) {
+        if (socket_rooms.length > 0) {
           socket_rooms.forEach(function (rooms) {
             // fuer jede Wache(rooms.room) die verbundenen Sockets(Clients) ermitteln und den Einsatz verteilen
             var room_sockets = io.nsps['/waip'].adapter.rooms[rooms.room];