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

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

Browse Source
This commit is contained in:
Robert Richter 2020-03-15 18:01:01 +01:00
parent 78b1357aa1
commit 8e2d923812
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/routing.js
View File

@ -199,8 +199,7 @@ 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('rmld by post: '+rmld_uuid); sql.db_save_rmld(waip_uuid, rmld_uuid, req.body, function(result){
sql.db_save_rmld(req.body, 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,13 +616,12 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}); });
};*/ };*/
function db_save_rmld(responseobj, callback) { function db_save_rmld(waip_uuid, rmld_uuid, responseobj, callback) {
console.log('rmld by post: '+JSON.stringify(responseobj.rmld_uuid)); // Rueckmeldung aufarbeiten
// Rueckmeldung aufarbeiten
var reuckmeldung = {}; var reuckmeldung = {};
reuckmeldung.rmld_uuid = responseobj.rmld_uuid; reuckmeldung.rmld_uuid = rmld_uuid;
reuckmeldung.waip_uuid = responseobj.waip_uuid; reuckmeldung.waip_uuid = waip_uuid;
// Typ der Einsatzfunktion festlegen // Typ der Einsatzfunktion festlegen
switch (responseobj.radio_efunction) { switch (responseobj.radio_efunction) {
case 'ek': case 'ek':
@ -664,7 +663,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
reuckmeldung.wache_id = null; reuckmeldung.wache_id = null;
}; };
//console.log(JSON.stringify(reuckmeldung)); //console.log(JSON.stringify(reuckmeldung));
console.log('rmld by post: '+JSON.stringify(reuckmeldung));
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) {

1
views/includes/modal_rmld.pug
View File

@ -17,7 +17,6 @@
span(aria-hidden='true') × span(aria-hidden='true') ×
#responseModalBody.modal-body #responseModalBody.modal-body
form#send_response.was-validated(action=einsatzdaten.uuid, method="POST") form#send_response.was-validated(action=einsatzdaten.uuid, method="POST")
input(type="hidden" name="waip_uuid" value=einsatzdaten.uuid)
.form-group .form-group
p.text-muted Ich komme als ... p.text-muted Ich komme als ...
.custom-control.custom-radio.form-control-lg .custom-control.custom-radio.form-control-lg