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

update Do 6. Feb 12:31:01 CET 2020

Browse Source
This commit is contained in:
Robert Richter 2020-02-06 12:31:01 +01:00
parent ac931ddaf1
commit 3d249aa3db
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/rueckmeldung_client.js
View File

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

8
server/sql_qry.js
View File

@ -468,7 +468,7 @@ module.exports = function(db, async, app_cfg) {
}; };
function db_get_active_waips(callback) { function db_get_active_waips(callback) {
db.all(`select we.einsatzart, we.stichwort, we.ort, we.ortsteil, db.all(`select we.uuid, we.einsatzart, we.stichwort, we.ort, we.ortsteil,
GROUP_concat(DISTINCT substr( wa.nr_wache, 0, 3 )) a, GROUP_concat(DISTINCT substr( wa.nr_wache, 0, 3 )) a,
GROUP_concat(DISTINCT substr( wa.nr_wache, 0, 5 )) b, GROUP_concat(DISTINCT substr( wa.nr_wache, 0, 5 )) b,
GROUP_concat(DISTINCT wa.nr_wache) c GROUP_concat(DISTINCT wa.nr_wache) c
@ -674,11 +674,13 @@ 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.uuid, 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) {
db.all(`SELECT e.wachenname, e.einsatzmittel, e.status FROM waip_einsaztmittel e console.log(row.uuid);
console.log(row.id);
db.all(`SELECT e.wachenname, e.einsatzmittel, e.status FROM waip_einsatzmittel e
WHERE e.waip_einsaetze_id = ?`, [row.id], function(err, rows) { WHERE e.waip_einsaetze_id = ?`, [row.id], function(err, rows) {
if (err == null && rows) { if (err == null && rows) {
var einsatzdaten = row; var einsatzdaten = row;

2
views/show_active_waip.pug
View File

@ -9,7 +9,7 @@ block content
.col-12 .col-12
ol ol
each val in dataSet each val in dataSet
li= val.einsatzart + ', ' + val.stichwort + ', ' + val.ort + ' ' + val.ortsteil li= val.einsatzart + ', ' + val.stichwort + ', ' + val.ort + ' ' + val.ortsteil + ' (' + val.uuid + ')'
ul ul
if val.a if val.a
each val_a in (val.a).split(",") each val_a in (val.a).split(",")