From 23c2cf61a2ec14205c0b5e36a7fe968536d637f5 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Sun, 21 Jun 2020 23:41:07 +0200 Subject: [PATCH] update 21.06.2020 v2 --- databasudo | 0 public/js/client_waip.js | 10 +++++----- server/waip.js | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 databasudo diff --git a/databasudo b/databasudo deleted file mode 100644 index e69de29..0000000 diff --git a/public/js/client_waip.js b/public/js/client_waip.js index cca6f48..52ba234 100644 --- a/public/js/client_waip.js +++ b/public/js/client_waip.js @@ -410,15 +410,15 @@ socket.on('io.new_waip', function (data) { var data_em_weitere = JSON.parse(data.em_weitere); if (data_em_weitere.length > 0) { - var tmp; + var tmp_weitere; for (var i in data_em_weitere) { - if (tmp) { - tmp = tmp + ', ' + data_em_weitere[i].name; + if (tmp_weitere) { + tmp_weitere = tmp_weitere + ', ' + data_em_weitere[i].name; } else { - tmp = data_em_weitere[i].name; + tmp_weitere = data_em_weitere[i].name; }; }; - $('#em_weitere').html(tmp); + $('#em_weitere').html(tmp_weitere); }; } catch (e) { console.log(e); // error in the above string (in this case, yes)! diff --git a/server/waip.js b/server/waip.js index e3c8c49..d7e5707 100755 --- a/server/waip.js +++ b/server/waip.js @@ -13,8 +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 - console.log(socket_rooms); - if (socket_rooms.length > 0) { + if (socket_rooms.length > 1) { 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];