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

update Di 4. Feb 16:31:01 CET 2020

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

4
server/routing.js
View File

@ -49,8 +49,8 @@ module.exports = function(app, sql, app_cfg, passport, auth, udp) {
// get /rueckmeldung
app.get('/rueckmeldung/:waip_uuid', function(req, res, next) {
var waip_uuid = req.params.waip_uuid;
sql.db_get_userconfig(req.user.id, function(data) {
res.render('config', {
sql.db_get_einsatzdaten_by_uuid(waip_uuid, function(einsatzdaten) {
res.render('', {
//title: 'Einstellungen',
//user: req.user,
//reset_counter: data

2
server/sql_cfg.js
View File

@ -46,7 +46,7 @@ module.exports = function (fs, bcrypt, app_cfg) {
wachenfolge INTEGER,
wgs84_x TEXT,
wgs84_y TEXT,
wgs84_area,
wgs84_area TEXT,
UNIQUE (id, uuid))`);
// Einsatzmittel-Tabelle erstellen
// TODO: Erweitern um Status, Staerke, AGT

24
server/sql_qry.js
View File

@ -673,6 +673,27 @@ module.exports = function(db, async, app_cfg) {
});
};
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,
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) {
if (err == null && row) {
db.all(`SELECT e.wachenname, e.einsatzmittel, e.status FROM waip_einsaztmittel e
WHERE e.waip_einsaetze_id = ?`, [row.id], function(err, rows) {
if (err == null && rows) {
var einsatzdaten = row;
einsatzdaten.einsatzmittel = rows;
callback && callback(einsatzdaten);
} else {
callback && callback(null);
};
});
} else {
callback && callback(null);
};
});
};
return {
db_einsatz_speichern: db_einsatz_speichern,
db_einsatz_laden: db_einsatz_laden,
@ -706,7 +727,8 @@ module.exports = function(db, async, app_cfg) {
//db_update_response: db_update_response,
db_save_response: db_save_response,
db_get_response_gesamter_einsatz: db_get_response_gesamter_einsatz,
db_get_response_wache: db_get_response_wache
db_get_response_wache: db_get_response_wache,
db_get_einsatzdaten_by_uuid: db_get_einsatzdaten_by_uuid
};
};