mkrieger/Wachalarm-IP-Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update So 15. Mär 21:01:01 CET 2020

Browse Source
This commit is contained in:
Robert Richter 2020-03-15 21:01:01 +01:00
parent 4f23406fd8
commit dc9f1dc8ee
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/routing.js
View File

@ -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) { app.post('/rmld/:waip_uuid/:rmld_uuid', function(req, res) {
var waip_uuid = req.params.waip_uuid; var waip_uuid = req.params.waip_uuid;
var rmld_uuid = req.params.rmld_uuid; var rmld_uuid = req.params.rmld_uuid;
console.log('req.params: '+JSON.stringify(req.params)); var rmld_obj = Object.assign(req.params, req.body);
console.log('req.params: '+JSON.stringify(req.body));
sql.db_save_rmld(waip_uuid, rmld_uuid, req.body, function(result){ console.log(req.params);
console.log(req.body);
console.log(rmld_obj);
sql.db_save_rmld(rmld_obj, function(result){
if (result) { if (result) {
req.flash('successMessage', 'Rückmeldung erfolgreich gesendet, auf zum Einsatz!'); req.flash('successMessage', 'Rückmeldung erfolgreich gesendet, auf zum Einsatz!');
res.redirect('/rmld/' + waip_uuid + '/' + rmld_uuid ); res.redirect('/rmld/' + waip_uuid + '/' + rmld_uuid );

11
server/sql_qry.js
View File

@ -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 = {}; var reuckmeldung = {};
reuckmeldung.rmld_uuid = rmld_uuid; reuckmeldung.rmld_uuid = responseobj.rmld_uuid;
reuckmeldung.waip_uuid = waip_uuid; reuckmeldung.waip_uuid = responseobj.waip_uuid;
// Typ der Einsatzfunktion festlegen // Typ der Einsatzfunktion festlegen
switch (responseobj.radio_efunction) { switch (responseobj.radio_efunction) {
case 'ek': case 'ek':
@ -662,8 +662,9 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
} else { } else {
reuckmeldung.wache_id = null; 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) { db.get(`select name_wache, nr_wache from waip_wachen where id = ?;`, [reuckmeldung.wache_id], function(err, row) {
if (err == null && row) { if (err == null && row) {

2
server/waip.js
View File

@ -108,7 +108,7 @@ module.exports = function(io, sql, tw, async, app_cfg) {
console.log('vorhandene reuckmeldungen fuer die wache: ' + JSON.stringify(rmld)); console.log('vorhandene reuckmeldungen fuer die wache: ' + JSON.stringify(rmld));
if (rmld) { if (rmld) {
//waip.reuckmeldung_senden(socket.id, rmld); //waip.reuckmeldung_senden(socket.id, rmld);
io.to(row.room).emit('io.response', 'a'); io.to(row.room).emit('io.response', rmld);
}; };
}); });