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

update Di 28. Apr 11:01:01 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-04-28 11:01:01 +02:00
parent 29ec56e113
commit f064c37a80
4 changed files with 169 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
server/routing.js
View File

@ -157,13 +157,33 @@ module.exports = function(app, sql, uuidv4, app_cfg, passport, auth, waip, udp)
sql.db_get_active_waips(function(data) { sql.db_get_active_waips(function(data) {
res.render('overview', { res.render('overview', {
public: app_cfg.public, public: app_cfg.public,
title: 'Einsatzübersicht', title: 'Dashboard',
user: req.user, user: req.user,
dataSet: data dataSet: data
}); });
}); });
}); });
// Dasboard fuer einen Einsatz
app.get('/dbrd/:dbrd_uuid', function(req, res, next) {
var dbrd_uuid = req.params.dbrd_uuid;
sql.db_einsatz_uuid_vorhanden(dbrd_uuid, function(wache) {
if (wache) {
res.render('dbrd', {
public: app_cfg.public,
title: 'Dashboard',
dbrd_uuid: dbrd_uuid,
app_id: app_cfg.global.app_id,
user: req.user
});
} else {
var err = new Error('Dashboard oder Einsatz nicht vorhanden!');
err.status = 404;
next(err);
};
});
});
/* ######################## */ /* ######################## */
/* ##### Rueckmeldung ##### */ /* ##### Rueckmeldung ##### */
/* ######################## */ /* ######################## */

127
server/sql_qry.js
View File

@ -1,4 +1,4 @@
module.exports = function(db, uuidv4, turf, app_cfg) { module.exports = function (db, uuidv4, turf, app_cfg) {
// ermittelt den letzten vorhanden Einsatz zu einer Wache // ermittelt den letzten vorhanden Einsatz zu einer Wache
function db_einsatz_ermitteln(wachen_id, user_id, callback) { function db_einsatz_ermitteln(wachen_id, user_id, callback) {
@ -28,7 +28,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
) )
WHERE DATETIME(zeitstempel, \'+\' || ` + select_reset_counter + ` || \' minutes\') WHERE DATETIME(zeitstempel, \'+\' || ` + select_reset_counter + ` || \' minutes\')
> DATETIME(\'now\')`, [wachen_id], > DATETIME(\'now\')`, [wachen_id],
function(err, rows) { function (err, rows) {
if (err == null && rows.length > 0) { if (err == null && rows.length > 0) {
//callback && callback(row.waip_einsaetze_ID); ALT //callback && callback(row.waip_einsaetze_ID); ALT
callback && callback(rows); callback && callback(rows);
@ -49,16 +49,24 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
var wgs_x = parseFloat(content.ortsdaten.wgs84_x); var wgs_x = parseFloat(content.ortsdaten.wgs84_x);
var wgs_y = parseFloat(content.ortsdaten.wgs84_y); var wgs_y = parseFloat(content.ortsdaten.wgs84_y);
var point = turf.point([wgs_y, wgs_x]); var point = turf.point([wgs_y, wgs_x]);
var buffered = turf.buffer(point, 1, {steps: 5, units: 'kilometers'}); var buffered = turf.buffer(point, 1, {
steps: 5,
units: 'kilometers'
});
var bbox = turf.bbox(buffered); var bbox = turf.bbox(buffered);
var new_point = turf.randomPoint(1, {bbox: bbox}); var new_point = turf.randomPoint(1, {
var new_buffer = turf.buffer(new_point, 1, {steps: 5, units: 'kilometers'}) bbox: bbox
});
var new_buffer = turf.buffer(new_point, 1, {
steps: 5,
units: 'kilometers'
})
content.ortsdaten.wgs84_area = JSON.stringify(new_buffer); content.ortsdaten.wgs84_area = JSON.stringify(new_buffer);
}; };
db.serialize(function() { db.serialize(function () {
// Einsatzdaten speichern // Einsatzdaten speichern
db.run(`INSERT OR REPLACE INTO waip_einsaetze ( db.run(`INSERT OR REPLACE INTO waip_einsaetze (
id, uuid, einsatznummer, alarmzeit, einsatzart, stichwort, sondersignal, besonderheiten, ort, ortsteil, strasse, objekt, objektnr, objektart, wachenfolge, wgs84_x, wgs84_y, wgs84_area) id, uuid, einsatznummer, alarmzeit, einsatzart, stichwort, sondersignal, besonderheiten, ort, ortsteil, strasse, objekt, objektnr, objektart, wachenfolge, wgs84_x, wgs84_y, wgs84_area)
@ -81,7 +89,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
\'` + content.ortsdaten.wgs84_x + `\', \'` + content.ortsdaten.wgs84_x + `\',
\'` + content.ortsdaten.wgs84_y + `\', \'` + content.ortsdaten.wgs84_y + `\',
\'` + content.ortsdaten.wgs84_area + `\')`, \'` + content.ortsdaten.wgs84_area + `\')`,
function(err) { function (err) {
if (err == null) { if (err == null) {
// Einsatzmittel zum Einsatz speichern // Einsatzmittel zum Einsatz speichern
var id = this.lastID; var id = this.lastID;
@ -148,7 +156,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
'ON em0.waip_einsaetze_id = e.ID ' + 'ON em0.waip_einsaetze_id = e.ID ' +
'WHERE e.id LIKE ? ' + 'WHERE e.id LIKE ? ' +
'ORDER BY e.id DESC LIMIT 1', [waip_id, wachen_id, waip_id, wachen_id, waip_id], 'ORDER BY e.id DESC LIMIT 1', [waip_id, wachen_id, waip_id, wachen_id, waip_id],
function(err, row) { function (err, row) {
if (err == null && row) { if (err == null && row) {
callback && callback(row); callback && callback(row);
} else { } else {
@ -171,7 +179,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
} else { } else {
// je nach laenge andere SQL ausfuehren // je nach laenge andere SQL ausfuehren
if (parseInt(content) == 0) { if (parseInt(content) == 0) {
db.get('select \'1\' length, nr_wache nr, name_wache name from waip_wachen where nr_wache like ?', [content], function(err, row) { db.get('select \'1\' length, nr_wache nr, name_wache name from waip_wachen where nr_wache like ?', [content], function (err, row) {
if (err == null && row) { if (err == null && row) {
callback && callback(row); callback && callback(row);
} else { } else {
@ -180,7 +188,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}); });
}; };
if (len == 2) { if (len == 2) {
db.get('select \'2\' length, nr_kreis nr, name_kreis name from waip_wachen where nr_kreis like SUBSTR(?,-2, 2) group by name_kreis LIMIT 1', [content], function(err, row) { db.get('select \'2\' length, nr_kreis nr, name_kreis name from waip_wachen where nr_kreis like SUBSTR(?,-2, 2) group by name_kreis LIMIT 1', [content], function (err, row) {
if (err == null && row) { if (err == null && row) {
callback && callback(row); callback && callback(row);
} else { } else {
@ -189,7 +197,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}); });
}; };
if (len == 4) { if (len == 4) {
db.get('select \'4\' length, nr_kreis || nr_traeger nr, name_traeger name from waip_wachen where nr_kreis like SUBSTR(?,-4, 2) and nr_traeger like SUBSTR(?,-2, 2) group by name_traeger LIMIT 1', [content, content], function(err, row) { db.get('select \'4\' length, nr_kreis || nr_traeger nr, name_traeger name from waip_wachen where nr_kreis like SUBSTR(?,-4, 2) and nr_traeger like SUBSTR(?,-2, 2) group by name_traeger LIMIT 1', [content, content], function (err, row) {
if (err == null && row) { if (err == null && row) {
callback && callback(row); callback && callback(row);
} else { } else {
@ -198,7 +206,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}); });
}; };
if (len == 6) { if (len == 6) {
db.get('select \'6\' length, nr_wache nr, name_wache name from waip_wachen where nr_wache like ?', [content], function(err, row) { db.get('select \'6\' length, nr_wache nr, name_wache name from waip_wachen where nr_wache like ?', [content], function (err, row) {
if (err == null && row) { if (err == null && row) {
callback && callback(row); callback && callback(row);
} else { } else {
@ -210,10 +218,22 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}; };
}; };
function db_einsatz_uuid_vorhanden(uuid, callback) {
// Einsatz mit dieser UUID vorhanden?
db.get('select uuid from waip_einsaetze where uuid like ?', [uuid], function (err, row) {
if (err == null && row) {
callback && callback(row);
} else {
callback && callback(null);
};
});
};
function db_wache_id_ermitteln(content, callback) { function db_wache_id_ermitteln(content, callback) {
db.each('select waip_wachen_ID from waip_einsatzmittel where waip_einsaetze_ID = ? ' + db.each('select waip_wachen_ID from waip_einsatzmittel where waip_einsaetze_ID = ? ' +
'and waip_wachen_ID not null group by waip_wachen_ID', [content], 'and waip_wachen_ID not null group by waip_wachen_ID', [content],
function(err, row) { function (err, row) {
if (err == null && row) { if (err == null && row) {
callback && callback(row.waip_wachen_ID); callback && callback(row.waip_wachen_ID);
} else { } else {
@ -234,7 +254,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
select w.nr_wache room from waip_wachen w select w.nr_wache room from waip_wachen w
left join waip_einsatzmittel em on em.wachenname = w.name_wache left join waip_einsatzmittel em on em.wachenname = w.name_wache
where em.waip_einsaetze_ID = ? group by w.nr_wache`, [waip_id, waip_id, waip_id], where em.waip_einsaetze_ID = ? group by w.nr_wache`, [waip_id, waip_id, waip_id],
function(err, rows) { function (err, rows) {
if (err == null && rows.length > 0) { if (err == null && rows.length > 0) {
// falls einsätze vorhanden, auch die null hinzufuegen // falls einsätze vorhanden, auch die null hinzufuegen
//rows.push({ //rows.push({
@ -248,7 +268,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}; };
function db_wache_nr_ermitteln(content, callback) { function db_wache_nr_ermitteln(content, callback) {
db.get('select nr_wache from waip_wachen where id = ? ', [content], function(err, row) { db.get('select nr_wache from waip_wachen where id = ? ', [content], function (err, row) {
if (err == null && row) { if (err == null && row) {
callback && callback(row.nr_wache); callback && callback(row.nr_wache);
} else { } else {
@ -258,7 +278,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}; };
function db_letzten_einsatz_ermitteln(callback) { function db_letzten_einsatz_ermitteln(callback) {
db.get('select id from waip_einsaetze order by id DESC LIMIT 1', function(err, row) { db.get('select id from waip_einsaetze order by id DESC LIMIT 1', function (err, row) {
if (err == null && row) { if (err == null && row) {
callback && callback(row.id); callback && callback(row.id);
} else { } else {
@ -269,7 +289,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
// alte Inhalte loeschen / aufräumen alle 15 Minuten // alte Inhalte loeschen / aufräumen alle 15 Minuten
function db_get_alte_einsaetze(minuten, callback) { function db_get_alte_einsaetze(minuten, callback) {
db.each('SELECT id FROM waip_einsaetze WHERE zeitstempel <= datetime(\'now\',\'-' + minuten + ' minutes\')', function(err, row) { db.each('SELECT id FROM waip_einsaetze WHERE zeitstempel <= datetime(\'now\',\'-' + minuten + ' minutes\')', function (err, row) {
if (err == null && row) { if (err == null && row) {
callback && callback(row.id); callback && callback(row.id);
} else { } else {
@ -284,7 +304,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}; };
function db_list_wachen(callback) { function db_list_wachen(callback) {
db.all('select nr_wache nr, name_wache name from waip_wachen order by name_wache', function(err, rows) { db.all('select nr_wache nr, name_wache name from waip_wachen order by name_wache', function (err, rows) {
if (err == null && rows.length > 0) { if (err == null && rows.length > 0) {
callback && callback(rows); callback && callback(rows);
} else { } else {
@ -294,7 +314,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}; };
function db_list_traeger(callback) { function db_list_traeger(callback) {
db.all('select nr_kreis || nr_traeger nr, name_traeger name from waip_wachen group by name_traeger order by name_traeger', function(err, rows) { db.all('select nr_kreis || nr_traeger nr, name_traeger name from waip_wachen group by name_traeger order by name_traeger', function (err, rows) {
if (err == null && rows.length > 0) { if (err == null && rows.length > 0) {
callback && callback(rows); callback && callback(rows);
} else { } else {
@ -304,7 +324,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}; };
function db_list_kreis(callback) { function db_list_kreis(callback) {
db.all('select nr_kreis nr, name_kreis name from waip_wachen group by name_kreis order by name_kreis', function(err, rows) { db.all('select nr_kreis nr, name_kreis name from waip_wachen group by name_kreis order by name_kreis', function (err, rows) {
if (err == null && rows.length > 0) { if (err == null && rows.length > 0) {
callback && callback(rows); callback && callback(rows);
} else { } else {
@ -353,7 +373,8 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
) em0 ON em0.waip_einsaetze_id = e.ID ) em0 ON em0.waip_einsaetze_id = e.ID
WHERE e.id LIKE ? WHERE e.id LIKE ?
ORDER BY e.id DESC LIMIT 1`, ORDER BY e.id DESC LIMIT 1`,
[app_cfg.global.default_time_for_standby, user_id, waip_id, wachen_nr, waip_id, wachen_nr, waip_id], function(err, row) { [app_cfg.global.default_time_for_standby, user_id, waip_id, wachen_nr, waip_id, wachen_nr, waip_id],
function (err, row) {
if (err == null && row) { if (err == null && row) {
callback && callback(row); callback && callback(row);
} else { } else {
@ -377,7 +398,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
var typ = tmp.toString().substring(0, 2); var typ = tmp.toString().substring(0, 2);
var nr = tmp.toString().slice(4); var nr = tmp.toString().slice(4);
nr = nr.toString().replace(/^0+/, ''); nr = nr.toString().replace(/^0+/, '');
db.get('SELECT einsatzmittel_rufname name FROM waip_ttsreplace WHERE einsatzmittel_typ = ?', [typ], function(err, row) { db.get('SELECT einsatzmittel_rufname name FROM waip_ttsreplace WHERE einsatzmittel_typ = ?', [typ], function (err, row) {
if (err == null && row) { if (err == null && row) {
callback(null, row.name + ' ' + nr); callback(null, row.name + ' ' + nr);
} else { } else {
@ -390,7 +411,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}; };
function db_get_socket_by_id(content, callback) { function db_get_socket_by_id(content, callback) {
db.get('select * from waip_clients where socket_id = ? ', [content], function(err, row) { db.get('select * from waip_clients where socket_id = ? ', [content], function (err, row) {
if (err == null && row) { if (err == null && row) {
callback && callback(row); callback && callback(row);
} else { } else {
@ -452,7 +473,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}; };
function db_check_client_waipid(socketId, waip_id, callback) { function db_check_client_waipid(socketId, waip_id, callback) {
db.get('SELECT client_status id from waip_clients where socket_id like ?', [socketId], function(err, row) { db.get('SELECT client_status id from waip_clients where socket_id like ?', [socketId], function (err, row) {
if (err == null && row) { if (err == null && row) {
if (row.id == waip_id) { if (row.id == waip_id) {
callback && callback(row); callback && callback(row);
@ -474,7 +495,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}; };
function db_get_log(callback) { function db_get_log(callback) {
db.all(`select * from waip_log order by id desc LIMIT 5000`, function(err, rows) { db.all(`select * from waip_log order by id desc LIMIT 5000`, function (err, rows) {
if (err == null && rows) { if (err == null && rows) {
callback && callback(rows); callback && callback(rows);
} else { } else {
@ -484,7 +505,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}; };
function db_get_active_clients(callback) { function db_get_active_clients(callback) {
db.all(`select * from waip_clients`, function(err, rows) { db.all(`select * from waip_clients`, function (err, rows) {
if (err == null && rows) { if (err == null && rows) {
callback && callback(rows); callback && callback(rows);
} else { } else {
@ -502,7 +523,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
left join waip_einsatzmittel em on em.waip_einsaetze_ID = we.id left join waip_einsatzmittel em on em.waip_einsaetze_ID = we.id
left join waip_wachen wa on wa.id = em.waip_wachen_ID left join waip_wachen wa on wa.id = em.waip_wachen_ID
GROUP by we.id GROUP by we.id
ORDER by we.einsatzart, we.stichwort`, function(err, rows) { ORDER by we.einsatzart, we.stichwort`, function (err, rows) {
if (err == null && rows) { if (err == null && rows) {
callback && callback(rows); callback && callback(rows);
} else { } else {
@ -512,7 +533,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}; };
function db_get_users(callback) { function db_get_users(callback) {
db.all('SELECT id, user, permissions, ip_address FROM waip_users', function(err, rows) { db.all('SELECT id, user, permissions, ip_address FROM waip_users', function (err, rows) {
if (err == null && rows) { if (err == null && rows) {
callback && callback(rows); callback && callback(rows);
} else { } else {
@ -529,7 +550,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
//permissions -> 52,62,6690,.... //permissions -> 52,62,6690,....
db.get(`select group_concat(DISTINCT wa.nr_wache) wache from waip_einsatzmittel em db.get(`select group_concat(DISTINCT wa.nr_wache) wache from waip_einsatzmittel em
left join waip_wachen wa on wa.id = em.waip_wachen_ID left join waip_wachen wa on wa.id = em.waip_wachen_ID
where waip_einsaetze_ID = ?`, [waip_id], function(err, row) { where waip_einsaetze_ID = ?`, [waip_id], function (err, row) {
if (err == null && row) { if (err == null && row) {
var permission_arr = user_obj.permissions.split(","); var permission_arr = user_obj.permissions.split(",");
var wachen_arr = row.wache.split(","); var wachen_arr = row.wache.split(",");
@ -551,7 +572,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
function db_get_userconfig(user_id, callback) { function db_get_userconfig(user_id, callback) {
db.get(`SELECT reset_counter FROM waip_user_config db.get(`SELECT reset_counter FROM waip_user_config
WHERE user_id = ?`, [user_id], function(err, row) { WHERE user_id = ?`, [user_id], function (err, row) {
if (err == null && row) { if (err == null && row) {
callback && callback(row.reset_counter); callback && callback(row.reset_counter);
} else { } else {
@ -570,7 +591,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
VALUES ( VALUES (
(select ID from waip_user_config where user_id like \'` + user_id + `\'), (select ID from waip_user_config where user_id like \'` + user_id + `\'),
\'` + user_id + `\', \'` + user_id + `\',
\'` + reset_counter + `\')`), function(err) { \'` + reset_counter + `\')`), function (err) {
if (err == null) { if (err == null) {
callback && callback(); callback && callback();
} else { } else {
@ -581,7 +602,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
function db_get_sockets_to_standby(callback) { function db_get_sockets_to_standby(callback) {
db.all(`select socket_id from waip_clients db.all(`select socket_id from waip_clients
where reset_timestamp < DATETIME(\'now\')`, function(err, rows) { where reset_timestamp < DATETIME(\'now\')`, function (err, rows) {
if (err == null && rows) { if (err == null && rows) {
callback && callback(rows); callback && callback(rows);
} else { } else {
@ -677,10 +698,10 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
reuckmeldung.wache_id = null; reuckmeldung.wache_id = null;
}; };
console.log('reuckmeldung: '+JSON.stringify(reuckmeldung)); console.log('reuckmeldung: ' + JSON.stringify(reuckmeldung));
console.log('responseobj: '+JSON.stringify(responseobj)); console.log('responseobj: ' + JSON.stringify(responseobj));
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) {
reuckmeldung.wache_name = row.name_wache; reuckmeldung.wache_name = row.name_wache;
reuckmeldung.wache_nr = row.nr_wache; reuckmeldung.wache_nr = row.nr_wache;
@ -698,7 +719,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
\'` + reuckmeldung.arrival_time + `\', \'` + reuckmeldung.arrival_time + `\',
\'` + reuckmeldung.wache_id + `\', \'` + reuckmeldung.wache_id + `\',
\'` + reuckmeldung.wache_nr + `\', \'` + reuckmeldung.wache_nr + `\',
\'` + reuckmeldung.wache_name + `\')`), function(err) { \'` + reuckmeldung.wache_name + `\')`), function (err) {
//console.log(err); //console.log(err);
if (err == null) { if (err == null) {
// TODO: Rueckmeldung-UUID zurückgeben // TODO: Rueckmeldung-UUID zurückgeben
@ -718,9 +739,9 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}; };
function db_get_response_gesamter_einsatz(waip_einsaetze_id, callback){ function db_get_response_gesamter_einsatz(waip_einsaetze_id, callback) {
db.all(`SELECT response_json FROM waip_response db.all(`SELECT response_json FROM waip_response
WHERE waip_einsaetze_id = ?`, [waip_einsaetze_id], function(err, rows) { WHERE waip_einsaetze_id = ?`, [waip_einsaetze_id], function (err, rows) {
if (err == null && rows) { if (err == null && rows) {
callback && callback(rows); callback && callback(rows);
} else { } else {
@ -741,7 +762,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
callback && callback(all_responses); callback && callback(all_responses);
}; };
// Zeilen einzelnen durchgehen // Zeilen einzelnen durchgehen
console.log('rows: '+JSON.stringify(rows)); console.log('rows: ' + JSON.stringify(rows));
rows.forEach(function (item, index, array) { rows.forEach(function (item, index, array) {
// summiertes JSON-Rueckmeldeobjekt für die angeforderte Wachennummer erstellen // summiertes JSON-Rueckmeldeobjekt für die angeforderte Wachennummer erstellen
var tmp = JSON.stringify(item.wache_nr); var tmp = JSON.stringify(item.wache_nr);
@ -777,7 +798,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
// Schleife ggf. beenden // Schleife ggf. beenden
itemsProcessed++; itemsProcessed++;
if (itemsProcessed === array.length) { if (itemsProcessed === array.length) {
console.log('get_response_wache: '+JSON.stringify(all_responses)); console.log('get_response_wache: ' + JSON.stringify(all_responses));
loop_done(all_responses); loop_done(all_responses);
}; };
}); });
@ -790,7 +811,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
function db_get_single_response_by_rmlduuid(rmld_uuid, callback) { function db_get_single_response_by_rmlduuid(rmld_uuid, callback) {
db.all(`SELECT * FROM waip_response WHERE rmld_uuid like ?`, [rmld_uuid], function (err, row) { db.all(`SELECT * FROM waip_response WHERE rmld_uuid like ?`, [rmld_uuid], function (err, row) {
if (err == null && row) { if (err == null && row) {
console.log('single_rmld_uuid '+row); console.log('single_rmld_uuid ' + row);
if (row.einsatzkraft == 1) { if (row.einsatzkraft == 1) {
row.einsatzkraft = true; row.einsatzkraft = true;
} else { } else {
@ -820,20 +841,20 @@ module.exports = function(db, uuidv4, turf, 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.uuid, 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) {
console.log(row.uuid); console.log(row.uuid);
console.log(row.id); console.log(row.id);
db.all(`SELECT e.einsatzmittel, e.status FROM waip_einsatzmittel e db.all(`SELECT 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;
einsatzdaten.einsatzmittel = rows; einsatzdaten.einsatzmittel = rows;
db.all(`SELECT DISTINCT e.waip_wachen_ID, 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) { WHERE e.waip_einsaetze_id = ?`, [row.id], function (err, wachen) {
if (err == null && wachen) { if (err == null && wachen) {
einsatzdaten.wachen = wachen; einsatzdaten.wachen = wachen;
callback && callback(einsatzdaten); callback && callback(einsatzdaten);
@ -851,8 +872,8 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}); });
}; };
function db_get_waipid_by_uuid(waip_uuid, callback){ function db_get_waipid_by_uuid(waip_uuid, callback) {
db.get(`SELECT id FROM WAIP_EINSAETZE WHERE uuid like ?`, [waip_uuid], function(err, row) { db.get(`SELECT id FROM WAIP_EINSAETZE WHERE uuid like ?`, [waip_uuid], function (err, row) {
if (err == null && row) { if (err == null && row) {
callback && callback(row.id); callback && callback(row.id);
} else { } else {
@ -861,17 +882,17 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
}); });
}; };
function db_get_twitter_list(waip_id, callback){ function db_get_twitter_list(waip_id, callback) {
// Pruefen ob fuer eine Wache in diesem Einsatz ein Twitter-Account mit Liste hinterlegt ist // Pruefen ob fuer eine Wache in diesem Einsatz ein Twitter-Account mit Liste hinterlegt ist
db.get(`select t.waip_wachen_id, t.tw_account_id, t.tw_account_list from waip_twitter_wachen t db.get(`select t.waip_wachen_id, t.tw_account_id, t.tw_account_list from waip_twitter_wachen t
where waip_wachen_id = (select distinct w.id wachen_id from waip_wachen w left join waip_einsatzmittel em on em.wachenname = w.name_wache where waip_wachen_id = (select distinct w.id wachen_id from waip_wachen w left join waip_einsatzmittel em on em.wachenname = w.name_wache
where em.waip_einsaetze_ID = ?)`, [waip_id], function(err, twitter_liste) { where em.waip_einsaetze_ID = ?)`, [waip_id], function (err, twitter_liste) {
if (err == null && twitter_liste) { if (err == null && twitter_liste) {
console.log(twitter_liste); console.log(twitter_liste);
// Falls Account und Liste hinterlegt ist, die Account-Zugangsdaten, Einsatz-UUID, Einsatzart und Wachenname auslesen // Falls Account und Liste hinterlegt ist, die Account-Zugangsdaten, Einsatz-UUID, Einsatzart und Wachenname auslesen
db.get(`select tw.tw_screen_name, tw_consumer_key, tw.tw_consumer_secret, tw.tw_access_token_key, tw.tw_access_token_secret, we.uuid, we.einsatzart, wa.name_wache db.get(`select tw.tw_screen_name, tw_consumer_key, tw.tw_consumer_secret, tw.tw_access_token_key, tw.tw_access_token_secret, we.uuid, we.einsatzart, wa.name_wache
from waip_twitter_accounts tw, waip_einsaetze we, waip_wachen wa from waip_twitter_accounts tw, waip_einsaetze we, waip_wachen wa
where tw.id = ? AND we.id = ? AND wa.id = ?`, [twitter_liste.tw_account_id, waip_id, twitter_liste.waip_wachen_id], function(err, twitter_daten) { where tw.id = ? AND we.id = ? AND wa.id = ?`, [twitter_liste.tw_account_id, waip_id, twitter_liste.waip_wachen_id], function (err, twitter_daten) {
console.log(twitter_daten); console.log(twitter_daten);
console.log(err); console.log(err);
if (err == null && twitter_daten) { if (err == null && twitter_daten) {
@ -893,6 +914,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
db_einsatz_laden: db_einsatz_laden, db_einsatz_laden: db_einsatz_laden,
db_einsatz_ermitteln: db_einsatz_ermitteln, db_einsatz_ermitteln: db_einsatz_ermitteln,
db_wache_vorhanden: db_wache_vorhanden, db_wache_vorhanden: db_wache_vorhanden,
db_einsatz_uuid_vorhanden: db_einsatz_uuid_vorhanden,
db_wache_id_ermitteln: db_wache_id_ermitteln, db_wache_id_ermitteln: db_wache_id_ermitteln,
db_wache_nr_ermitteln: db_wache_nr_ermitteln, db_wache_nr_ermitteln: db_wache_nr_ermitteln,
db_get_einsatzdaten: db_get_einsatzdaten, db_get_einsatzdaten: db_get_einsatzdaten,
@ -923,8 +945,9 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
db_get_response_gesamter_einsatz: db_get_response_gesamter_einsatz, db_get_response_gesamter_einsatz: db_get_response_gesamter_einsatz,
db_get_response_for_wache: db_get_response_for_wache, db_get_response_for_wache: db_get_response_for_wache,
db_get_einsatzdaten_by_uuid: db_get_einsatzdaten_by_uuid, db_get_einsatzdaten_by_uuid: db_get_einsatzdaten_by_uuid,
db_get_waipid_by_uuid:db_get_waipid_by_uuid, db_get_waipid_by_uuid: db_get_waipid_by_uuid,
db_get_single_response_by_rmlduuid, db_get_single_response_by_rmlduuid, db_get_single_response_by_rmlduuid,
db_get_single_response_by_rmlduuid,
db_get_twitter_list: db_get_twitter_list db_get_twitter_list: db_get_twitter_list
}; };

3
views/dbrd.pug
View File

@ -4,8 +4,7 @@ append head
link(rel='stylesheet', href='/css/leaflet.css') link(rel='stylesheet', href='/css/leaflet.css')
block content block content
//include includes/modal_info include includes/modal_info
//include includes/modal_rmld
.container-fluid .container-fluid
include includes/master_dashboard include includes/master_dashboard
//script. //script.

6
views/overview.pug
View File

@ -14,14 +14,14 @@ block content
when 'Hilfeleistungseinsatz' when 'Hilfeleistungseinsatz'
h5.font-weight-bold.text-info.ion-md-construct= ' ' + val.einsatzart + ' - ' + val.stichwort h5.font-weight-bold.text-info.ion-md-construct= ' ' + val.einsatzart + ' - ' + val.stichwort
when 'Rettungseinsatz' when 'Rettungseinsatz'
h5.font-weight-bold.text-warning.ion-md-midikit= ' ' + val.einsatzart + ' - ' + val.stichwort h5.font-weight-bold.text-warning.ion-md-medkit= ' ' + val.einsatzart + ' - ' + val.stichwort
when 'Krankentransport' when 'Krankentransport'
h5.font-weight-bold.text-success.ion-md-medical= ' ' + val.einsatzart + ' - ' + val.stichwort h5.font-weight-bold.text-success.ion-md-medical= ' ' + val.einsatzart + ' - ' + val.stichwort
default default
h5.font-weight-bold.ion-md-information-circle= ' ' + val.einsatzart + ' - ' + val.stichwort h5.font-weight-bold.ion-md-information-circle= ' ' + val.einsatzart + ' - ' + val.stichwort
.card-body.d-flex.justify-content-between .card-body.d-flex.justify-content-between
if val.ortsteil if val.ortsteil
p= val.ort + ', ' + val.ortsteil a= val.ort + ', ' + val.ortsteil
else else
p= val.ort p= val.ort
p.btn.btn-primary.mx-2.ion-md-arrow-round-forward(href='/dbrd/' + val.uuid, role='button') Dashboard aufrufen a.btn.btn-primary.btn-lg.mx-2.ion-md-arrow-round-forward(href='/dbrd/' + val.uuid, role='button') Dashboard aufrufen