From 3c050a4fc1a9d0b56d51fa21afd0d0a7830c1c0a Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Tue, 28 Apr 2020 17:01:01 +0200 Subject: [PATCH] update Di 28. Apr 17:01:01 CEST 2020 --- server/sql_qry.js | 6 +++--- server/waip.js | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/server/sql_qry.js b/server/sql_qry.js index b640368..4d8bbc6 100755 --- a/server/sql_qry.js +++ b/server/sql_qry.js @@ -258,9 +258,9 @@ module.exports = function (db, uuidv4, turf, app_cfg) { function (err, rows) { if (err == null && rows.length > 0) { // falls einsätze vorhanden, auch die null hinzufuegen - //rows.push({ - //"room": 0 - //}); + rows.push({ + "room": 0 + }); callback && callback(rows); } else { callback && callback(null); diff --git a/server/waip.js b/server/waip.js index 72b1215..88a9276 100755 --- a/server/waip.js +++ b/server/waip.js @@ -92,13 +92,19 @@ module.exports = function (io, sql, tw, async, app_cfg) { sql.db_get_waipid_by_uuid(waip_uuid, function (waip_id) { // am Einsatz beteilite Socket-Räume ermitteln sql.db_get_einsatz_rooms(waip_id, function (socket_rooms) { + if (socket_rooms) { // wenn Raum zum Einsatz vorhanden ist, dann Rueckmeldung aus DB laden und an diesen versenden sql.db_get_single_response_by_rmlduuid(rmld_uuid, function (rmld) { + if (rmld) { + // Rückmeldung an Clients/Räume senden socket_rooms.forEach(function (rooms) { - io.to(rooms.room).emit('io.response', rmld); + var room_sockets = io.sockets.adapter.rooms[rooms.room]; + console.log('rooms: ' + JSON.stringify(socket_rooms)); + console.log('rooms: ' + JSON.stringify(rooms)); + room_sockets.emit('io.response', rmld); sql.db_log('RMLD', 'Rückmeldung ' + rmld_uuid + ' für den Einsatz mit der ID ' + waip_id + ' an Raum ' + rooms.room + ' gesendet.'); sql.db_log('RMLD', 'DEBUG: ' + JSON.stringify(rmld)); });