diff --git a/server/routing.js b/server/routing.js index 1ce173c..47e993d 100755 --- a/server/routing.js +++ b/server/routing.js @@ -250,8 +250,6 @@ module.exports = function (app, sql, uuidv4, app_cfg, passport, auth, udp, saver saver.save_new_rmld(req.body, remote_ip, 'web', function (saved) { var waip_uuid = req.body.waip_uuid; var rmld_uuid = req.body.rmld_uuid; - console.log(saved); - console.log(req); if (saved) { req.flash('successMessage', 'Rückmeldung erfolgreich gesendet, auf zum Einsatz!'); res.redirect('/rmld/' + waip_uuid + '/' + rmld_uuid); diff --git a/server/saver.js b/server/saver.js index d989fe1..2b2e3ab 100755 --- a/server/saver.js +++ b/server/saver.js @@ -81,8 +81,8 @@ module.exports = function (app_cfg, sql, waip, uuidv4, io, remote_api) { }); // RMLD-Daten per API weiterleiten (entweder zum Server oder zum verbunden Client) // TODO TEST: Api WAIP - api_server_to_client_new_rmld(req.body, app_id); - api_client_to_server_new_rmld(req.body, app_id); + api_server_to_client_new_rmld(data, app_id); + api_client_to_server_new_rmld(data, app_id); } else { sql.db_log('RMLD', 'Fehler: Rückmeldung von ' + remote_addr + ' nicht valide: ' + JSON.stringify(waip_data)); callback && callback(false); diff --git a/server/sql_qry.js b/server/sql_qry.js index 9cd4958..d75f4cc 100755 --- a/server/sql_qry.js +++ b/server/sql_qry.js @@ -134,9 +134,12 @@ module.exports = function (db, app_cfg) { delete missiondata.wgs84_y; delete missiondata.wgs84_area; var uuid_einsatzdaten = uuidv5(JSON.stringify(missiondata), custom_namespace); + console.log(waip_id); + console.log(socket_id); // Abfrage ob zu Socket und Waip-ID bereits History-Daten hinterlegt sind db.get('select * from waip_history where waip_id like ? and socket_id like ?', [waip_id, socket_id], function (err, row) { // FIXME Testen + console.log(row); if (err == null && row) { // wenn History-Daten hinterlegt sind, dann pruefen sich etwas verändert hat if (uuid_einsatzdaten !== row.uuid_einsatz_grunddaten || uuid_em_alarmiert !== row.uuid_em_alarmiert) {