From 599961956f4b21059dd007e98a03677ba70376a0 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Tue, 28 Apr 2020 15:01:01 +0200 Subject: [PATCH] update Di 28. Apr 15:01:01 CEST 2020 --- server/routing.js | 33 +++++++++++++++++---------------- server/sql_qry.js | 26 +++++++++++++++++++++++--- views/home.pug | 15 +++++++++------ 3 files changed, 49 insertions(+), 25 deletions(-) diff --git a/server/routing.js b/server/routing.js index ee9a559..04a3284 100755 --- a/server/routing.js +++ b/server/routing.js @@ -6,21 +6,13 @@ 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) { - 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, - user: req.user - }); - }); + sql.db_get_alle_wachen(function(data) { + var data_kreis = data + res.render('home', { + public: app_cfg.public, + title: 'Startseite', + list_wachen: data, + user: req.user }); }); }); @@ -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/ @@ -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, diff --git a/server/sql_qry.js b/server/sql_qry.js index e94e57d..26f7612 100755 --- a/server/sql_qry.js +++ b/server/sql_qry.js @@ -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,8 +332,27 @@ 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 if (isNaN(waip_id) || isNaN(wachen_nr)) { @@ -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, diff --git a/views/home.pug b/views/home.pug index dbac3f7..9f66b26 100644 --- a/views/home.pug +++ b/views/home.pug @@ -44,8 +44,9 @@ block content button.btn.btn-info.dropdown-toggle(type='button', data-toggle='dropdown', aria-haspopup='true', aria-expanded='false') | bitte auswählen .dropdown-menu - each item in list_wache - a.dropdown-item(href='/waip/'+ item.nr)= item.name + 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 .card-header @@ -57,8 +58,9 @@ block content button.btn.btn-info.dropdown-toggle(type='button', data-toggle='dropdown', aria-haspopup='true', aria-expanded='false') | bitte auswählen .dropdown-menu - each item in list_traeger - a.dropdown-item(href='/waip/'+ item.nr)= item.name + 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 .card-header @@ -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ählen .dropdown-menu - each item in list_kreis - a.dropdown-item(href='/waip/'+ item.nr)= item.name + each item in list_wachen + if item.typ = 'kreis' + a.dropdown-item(href='/waip/'+ item.nr)= item.name