From 371a3c66e31a18259614a30bcac9694db18ef5fa Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Thu, 6 Feb 2020 17:01:01 +0100 Subject: [PATCH] update Do 6. Feb 17:01:01 CET 2020 --- TODO.md | 1 + server/routing.js | 13 +++++++++++++ server/sql_qry.js | 4 ++-- views/includes/modal_response.pug | 25 +++++++++++++------------ views/includes/rueckmeldung.pug | 8 ++++---- views/show_active_waip.pug | 3 ++- 6 files changed, 35 insertions(+), 19 deletions(-) diff --git a/TODO.md b/TODO.md index bd15137..198bce4 100644 --- a/TODO.md +++ b/TODO.md @@ -10,6 +10,7 @@ - Absturz bei unbekannter/falscher Wachennummer in Alarmmonitor-URL - openstreetmap credit - name, leitstelle, version immer mitgeben +- Eingaben auf validität prüfen ## 2. Priorität (notwendige Anpassungen) diff --git a/server/routing.js b/server/routing.js index ffb071a..d3e829f 100644 --- a/server/routing.js +++ b/server/routing.js @@ -64,6 +64,19 @@ module.exports = function(app, sql, app_cfg, passport, auth, udp) { }); }); + app.post('/rueckmeldung/:waip_uuid', function(req, res) { + sql.db_save_response(waip_id, responseobj, function(result){ + if (result) { + res.redirect('/rueckmeldung/' + req.params.waip_uuid); + } else { + var err = new Error('Fehler beim senden der Rückmeldung!'); + err.status = 500; + next(err); + }; + }); + res.redirect('/rueckmeldung/:waip_uuid'); + }); + // get /config app.get('/config', auth.ensureAuthenticated, function(req, res) { sql.db_get_userconfig(req.user.id, function(data) { diff --git a/server/sql_qry.js b/server/sql_qry.js index bd8b052..5be992b 100644 --- a/server/sql_qry.js +++ b/server/sql_qry.js @@ -611,7 +611,7 @@ module.exports = function(db, async, app_cfg) { \'` + waip_id + `\', \'` + responseobj + `\')`), function(err) { if (err == null) { - callback && callback(); + callback && callback('OK'); } else { callback && callback(null); }; @@ -685,7 +685,7 @@ module.exports = function(db, async, app_cfg) { if (err == null && rows) { var einsatzdaten = row; einsatzdaten.einsatzmittel = rows; - db.all(`SELECT DISTINCT e.wachenname FROM waip_einsatzmittel e + db.all(`SELECT DISTINCT e.waip_wachen_ID, e.wachenname FROM waip_einsatzmittel e WHERE e.waip_einsaetze_id = ?`, [row.id], function(err, wachen) { if (err == null && wachen) { einsatzdaten.wachen = wachen; diff --git a/views/includes/modal_response.pug b/views/includes/modal_response.pug index 3c2b2ee..19b5c8c 100644 --- a/views/includes/modal_response.pug +++ b/views/includes/modal_response.pug @@ -7,8 +7,9 @@ button.close(type='button', data-dismiss='modal', aria-label='Close') span(aria-hidden='true') × #responseModalBody.modal-body - p.text-muted Ich komme als ... + form#send_response(action="/rueckmeldung", method="POST") .form-group + p.text-muted Ich komme als ... .custom-control.custom-radio.form-control-lg input#radios_res_ek.custom-control-input(type='radio', name='radios_res', value='1') label.custom-control-label(for='radios_res_ek') @@ -21,29 +22,29 @@ input#radios_res_fk.custom-control-input(type='radio', name='radios_res', value='1') label.custom-control-label(for='radios_res_fk') | Führungskraft - div.border-top.my-3 - .form-group - .custom-control.custom-switch - input#cb_res_agt.custom-control-input(type='checkbox') - label.custom-control-label.text-warning(for='cb_res_agt') - | und bin Atemschutzgeräteträger! - div.border-top.my-3 - p.text-muted in ungefähr ... + div.border-top.my-3 .form-group + .custom-control.custom-switch + input#cb_res_agt.custom-control-input(type='checkbox') + label.custom-control-label.text-warning(for='cb_res_agt') + | und bin Atemschutzgeräteträger! + div.border-top.my-3 + .form-group + label(for='eintreffzeit').text-muted in ungefähr ... select#eintreffzeit.form-control.form-control-lg option(value=null) bitte Eintreffzeit wählen option(value='5') 5 Minuten option(value='10') 10 Minuten option(value='15') 15 Minuten option(value='20') 20 Minuten - p.text-muted zur Wache ... .form-group + label(for='wachenauswahl').text-muted zur Wache ... select#wachenauswahl.form-control.form-control-lg option(value=null) bitte Wache wählen each val in einsatzdaten.wachen - option(value='#{val.wachenname}') #{val.wachenname} + option(value='#{val.waip_wachen_ID}') #{val.wachenname} //option(value='2') CB FW Cottbus 3 //option(value='3') CB FW Madlow //option(value='4') CB FW Kieckebusch .modal-footer - button#send_response.btn.btn-lg.btn-block.btn-warning.btn-outline-primary.ion-md-paper-plane(type='button', data-dismiss='modal') Rückmeldung absenden! + button.btn.btn-lg.btn-block.btn-warning.btn-outline-primary.p-3.ion-md-paper-plane(type='submit', form="send_response", value='submit') Rückmeldung absenden! diff --git a/views/includes/rueckmeldung.pug b/views/includes/rueckmeldung.pug index 484b328..a81ca5b 100755 --- a/views/includes/rueckmeldung.pug +++ b/views/includes/rueckmeldung.pug @@ -68,13 +68,13 @@ div.pr-2 #{val.einsatzmittel} unless val.status == null case val.status - when 1 + when '1' div.p-2.badge.badge-info #{val.status} - when 2 + when '2' div.p-2.badge.badge-success #{val.status} - when 3 + when '3' div.p-2.badge.badge-warning #{val.status} - when 4 + when '4' div.p-2.badge.badge-danger #{val.status} default div.p-2.badge.badge-dark #{val.status} diff --git a/views/show_active_waip.pug b/views/show_active_waip.pug index 734799d..7d01c1c 100644 --- a/views/show_active_waip.pug +++ b/views/show_active_waip.pug @@ -9,7 +9,8 @@ block content .col-12 ol each val in dataSet - li= val.einsatzart + ', ' + val.stichwort + ', ' + val.ort + ' ' + val.ortsteil + ' (' + val.uuid + ')' + li= val.einsatzart + ', ' + val.stichwort + ', ' + val.ort + ' ' + val.ortsteil + a(href="/rueckmeldung/" + val.uuid)= val.uuid ul if val.a each val_a in (val.a).split(",")