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

update Di 4. Feb 17:01:01 CET 2020

Browse Source
This commit is contained in:
Robert Richter 2020-02-04 17:01:01 +01:00
parent 2244dcb0c5
commit ac931ddaf1
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/rueckmeldung_client.js
View File

@ -41,3 +41,5 @@ $('#rueckmeldung').each(function(index) {
$('#responseModal').modal('show'); $('#responseModal').modal('show');
}); });
}); });
console.log(einsatzdaten);

16
server/routing.js
View File

@ -50,11 +50,17 @@ module.exports = function(app, sql, app_cfg, passport, auth, udp) {
app.get('/rueckmeldung/:waip_uuid', function(req, res, next) { app.get('/rueckmeldung/:waip_uuid', function(req, res, next) {
var waip_uuid = req.params.waip_uuid; var waip_uuid = req.params.waip_uuid;
sql.db_get_einsatzdaten_by_uuid(waip_uuid, function(einsatzdaten) { sql.db_get_einsatzdaten_by_uuid(waip_uuid, function(einsatzdaten) {
res.render('', { if (einsatzdaten) {
//title: 'Einstellungen', res.render('test_rueckmeldung', {
//user: req.user, title: 'Einsatz-Rückmeldung',
//reset_counter: data user: req.user,
}); einsatzdaten: einsatzdaten
});
} else {
var err = new Error('Der angefragte Einsatz ist nicht vorhanden!'+waip_uuid);
err.status = 404;
next(err);
};
}); });
}); });

2
server/sql_qry.js
View File

@ -674,7 +674,7 @@ module.exports = function(db, async, app_cfg) {
}; };
function db_get_einsatzdaten_by_uuid(waip_uuid, callback){ function db_get_einsatzdaten_by_uuid(waip_uuid, callback){
db.get(`SELECT e.id, e.ZEITSTEMPEL e.EINSATZART, e.STICHWORT, e.SONDERSIGNAL, e.OBJEKT, e.ORT, db.get(`SELECT e.id, e.ZEITSTEMPEL, e.EINSATZART, e.STICHWORT, e.SONDERSIGNAL, e.OBJEKT, e.ORT,
e.ORTSTEIL, e.STRASSE, e.BESONDERHEITEN, e.wgs84_x, e.wgs84_y, e.wgs84_area FROM WAIP_EINSAETZE e e.ORTSTEIL, e.STRASSE, e.BESONDERHEITEN, e.wgs84_x, e.wgs84_y, e.wgs84_area FROM WAIP_EINSAETZE e
WHERE e.uuid like ?`, [waip_uuid], function(err, row) { WHERE e.uuid like ?`, [waip_uuid], function(err, row) {
if (err == null && row) { if (err == null && row) {

1
views/test_rueckmeldung.pug
View File

@ -9,6 +9,7 @@ block content
include includes/modal_response include includes/modal_response
.container-fluid .container-fluid
include includes/rueckmeldung include includes/rueckmeldung
a= JSON.stringify(einsatzdaten)
script(src='/js/leaflet.js') script(src='/js/leaflet.js')
// script(src='/js/textFit.min.js') // script(src='/js/textFit.min.js')
script(src='/js/rueckmeldung_client.js') script(src='/js/rueckmeldung_client.js')