diff --git a/server/routing.js b/server/routing.js index 6626a10..3f8a9d4 100755 --- a/server/routing.js +++ b/server/routing.js @@ -199,9 +199,12 @@ module.exports = function(app, sql, uuidv4, app_cfg, passport, auth, waip, udp) app.post('/rmld/:waip_uuid/:rmld_uuid', function(req, res) { var waip_uuid = req.params.waip_uuid; var rmld_uuid = req.params.rmld_uuid; - console.log('req.params: '+JSON.stringify(req.params)); - console.log('req.params: '+JSON.stringify(req.body)); - sql.db_save_rmld(waip_uuid, rmld_uuid, req.body, function(result){ + var rmld_obj = Object.assign(req.params, req.body); + + console.log(req.params); + console.log(req.body); + console.log(rmld_obj); + sql.db_save_rmld(rmld_obj, function(result){ if (result) { req.flash('successMessage', 'Rückmeldung erfolgreich gesendet, auf zum Einsatz!'); res.redirect('/rmld/' + waip_uuid + '/' + rmld_uuid ); diff --git a/server/sql_qry.js b/server/sql_qry.js index a2509b9..4657d43 100755 --- a/server/sql_qry.js +++ b/server/sql_qry.js @@ -616,12 +616,12 @@ module.exports = function(db, uuidv4, turf, app_cfg) { }); };*/ - function db_save_rmld(waip_uuid, rmld_uuid, responseobj, callback) { + function db_save_rmld(responseobj, callback) { - // Rueckmeldung aufarbeiten + // Rueckmeldung aufarbeiten var reuckmeldung = {}; - reuckmeldung.rmld_uuid = rmld_uuid; - reuckmeldung.waip_uuid = waip_uuid; + reuckmeldung.rmld_uuid = responseobj.rmld_uuid; + reuckmeldung.waip_uuid = responseobj.waip_uuid; // Typ der Einsatzfunktion festlegen switch (responseobj.radio_efunction) { case 'ek': @@ -662,8 +662,9 @@ module.exports = function(db, uuidv4, turf, app_cfg) { } else { reuckmeldung.wache_id = null; }; - //console.log(JSON.stringify(reuckmeldung)); - console.log('rmld by post: '+JSON.stringify(reuckmeldung)); + + console.log('reuckmeldung: '+JSON.stringify(reuckmeldung)); + console.log('responseobj: '+JSON.stringify(responseobj)); db.get(`select name_wache, nr_wache from waip_wachen where id = ?;`, [reuckmeldung.wache_id], function(err, row) { if (err == null && row) { diff --git a/server/waip.js b/server/waip.js index d6100d7..30049c9 100755 --- a/server/waip.js +++ b/server/waip.js @@ -108,7 +108,7 @@ module.exports = function(io, sql, tw, async, app_cfg) { console.log('vorhandene reuckmeldungen fuer die wache: ' + JSON.stringify(rmld)); if (rmld) { //waip.reuckmeldung_senden(socket.id, rmld); - io.to(row.room).emit('io.response', 'a'); + io.to(row.room).emit('io.response', rmld); }; });