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

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

Browse Source
This commit is contained in:
Robert Richter 2020-04-28 15:01:01 +02:00
parent e0449d94ea
commit 599961956f
3 changed files with 49 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/routing.js
View File

@ -6,24 +6,16 @@ module.exports = function(app, sql, uuidv4, app_cfg, passport, auth, waip, udp)
// Startseite
app.get('/', function(req, res) {
sql.db_list_wachen(function(data) {
var data_wachen = data
sql.db_list_traeger(function(data) {
var data_traeger = data
sql.db_list_kreis(function(data) {
sql.db_get_alle_wachen(function(data) {
var data_kreis = data
res.render('home', {
public: app_cfg.public,
title: 'Startseite',
list_wache: data_wachen,
list_traeger: data_traeger,
list_kreis: data_kreis,
list_wachen: data,
user: req.user
});
});
});
});
});
// Ueber die Anwendung
app.get('/about', function(req, res) {
@ -125,6 +117,15 @@ module.exports = function(app, sql, uuidv4, app_cfg, passport, auth, waip, udp)
// /waip nach /waip/0 umleiten
app.get('/waip', function(req, res) {
res.redirect('/waip/0');
sql.db_get_active_waips(function(data) {
res.render('overviews/overview_dbrd', {
public: app_cfg.public,
title: 'Dashboard',
user: req.user,
dataSet: data
});
});
});
// Alarmmonitor aufloesen /waip/<wachennummer>
@ -153,7 +154,7 @@ module.exports = function(app, sql, uuidv4, app_cfg, passport, auth, waip, udp)
/* ######################## */
// Dasboard-Uebersicht
app.get('/dbrd', function(req, res, next) {
app.get('/dbrd', function(req, res) {
sql.db_get_active_waips(function(data) {
res.render('overviews/overview_dbrd', {
public: app_cfg.public,

26
server/sql_qry.js
View File

@ -304,7 +304,7 @@ module.exports = function (db, uuidv4, turf, app_cfg) {
db.run(`DELETE FROM waip_einsaetze WHERE id = ?`, [id]);
};
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) {
if (err == null && rows.length > 0) {
callback && callback(rows);
@ -332,7 +332,26 @@ module.exports = function (db, uuidv4, turf, app_cfg) {
callback && callback(null);
};
});
};*/
function db_get_alle_wachen(callback) {
db.all(`select 'wache' typ, nr_wache nr, name_wache name from waip_wachen
union all
select 'traeger' typ, nr_kreis || nr_traeger nr, name_traeger name from waip_wachen group by name_traeger
union all
select 'kreis' typ, nr_kreis nr, name_kreis name from waip_wachen group by name_kreis
order by typ, name`, function (err, rows) {
if (err == null && rows.length > 0) {
callback && callback(rows);
} else {
callback && callback(null);
};
});
};
;
function db_get_einsatzdaten(waip_id, wachen_nr, user_id, callback) {
// vorsichtshalber nochmals id pruefen
@ -920,9 +939,10 @@ module.exports = function (db, uuidv4, turf, app_cfg) {
db_wache_nr_ermitteln: db_wache_nr_ermitteln,
db_get_einsatzdaten: db_get_einsatzdaten,
db_get_einsatz_rooms: db_get_einsatz_rooms,
db_list_wachen: db_list_wachen,
/*db_list_wachen: db_list_wachen,
db_list_traeger: db_list_traeger,
db_list_kreis: db_list_kreis,
db_list_kreis: db_list_kreis,*/
db_get_alle_wachen: db_get_alle_wachen,
db_letzten_einsatz_ermitteln: db_letzten_einsatz_ermitteln,
db_einsatz_loeschen: db_einsatz_loeschen,
db_get_alte_einsaetze: db_get_alte_einsaetze,

9
views/home.pug
View File

@ -44,7 +44,8 @@ block content
button.btn.btn-info.dropdown-toggle(type='button', data-toggle='dropdown', aria-haspopup='true', aria-expanded='false')
| bitte ausw&auml;hlen
.dropdown-menu
each item in list_wache
each item in list_wachen
if item.typ = 'wache'
a.dropdown-item(href='/waip/'+ item.nr)= item.name
.col-md-4.p-3
.card.h-100
@ -57,7 +58,8 @@ block content
button.btn.btn-info.dropdown-toggle(type='button', data-toggle='dropdown', aria-haspopup='true', aria-expanded='false')
| bitte ausw&auml;hlen
.dropdown-menu
each item in list_traeger
each item in list_wachen
if item.typ = 'traeger'
a.dropdown-item(href='/waip/'+ item.nr)= item.name
.col-md-4.p-3
.card.h-100
@ -70,5 +72,6 @@ block content
button.btn.btn-info.dropdown-toggle(type='button', data-toggle='dropdown', aria-haspopup='true', aria-expanded='false')
| bitte ausw&auml;hlen
.dropdown-menu
each item in list_kreis
each item in list_wachen
if item.typ = 'kreis'
a.dropdown-item(href='/waip/'+ item.nr)= item.name