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

update Di 7. Jul 17:31:01 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-07-07 17:31:01 +02:00
parent 094fba5966
commit 6fa6bfbf6e
4 changed files with 144 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/css/waip.css
View File

@ -24,7 +24,7 @@ body {
}
.fullheight {
height: calc(100vh - 60px - 5rem);
height: calc(100vh - 60px - 5rem - 3rem);
}
/*** Anpassungen an Bootstrap ******************/
@ -210,5 +210,5 @@ audio {
}
#headline {
font-size: 1vw;
height: 3rem;
}

2
public/js/client_waip.js
View File

@ -746,8 +746,6 @@ function set_clock() {
$('#time').html(element_time);
// Datum (Text) anzeigen
$('#day').html(element_day);
// Datum anzeigen, sofern sichtbar
$('#date-time').html(element_date_time);
// Textgröße neu setzen
resize_text();
};

17
server/routing.js
View File

@ -166,7 +166,19 @@ module.exports = function (app, sql, uuidv4, app_cfg, passport, auth, udp, saver
/* ######################## */
// Dasboard-Uebersicht
app.get('/dbrd', function (req, res) {
app.get('/dbrd', function (req, res, next) {
// pruefen ob ein Paramater fuer die Einsatznummer angegeben wurde, dann Dashboard direkt oeffnen
if (req.query.enr_str) {
sql.db_einsatz_get_uuid_by_enr(req.query.enr_str, function (data) {
if (data) {
res.redirect('/dbrd/' + data);
} else {
var err = new Error('Dashboard oder Einsatz nicht (mehr) vorhanden!');
err.status = 404;
next(err);
};
});
} else {
sql.db_einsatz_get_active(function (data) {
res.render('overviews/overview_dbrd', {
public: app_cfg.public,
@ -175,6 +187,7 @@ module.exports = function (app, sql, uuidv4, app_cfg, passport, auth, udp, saver
dataSet: data
});
});
};
});
// Dasboard fuer einen Einsatz
@ -190,7 +203,7 @@ module.exports = function (app, sql, uuidv4, app_cfg, passport, auth, udp, saver
user: req.user
});
} else {
var err = new Error('Dashboard oder Einsatz nicht vorhanden!');
var err = new Error('Dashboard oder Einsatz nicht (mehr) vorhanden!');
err.status = 404;
next(err);
};

12
views/includes/master_wachalarm.pug
View File

@ -1,14 +1,13 @@
// BUG: Darstellung in Safari-Mobil fehlerhaft (generell Mobil, ggf. extra Darstellung)
#waiptableau.fullheight.row.no-gutters
.col-12.h-5.d-flex.py-1.text-muted
#waiptableau
.row.no-gutters
#headline.col-12.d-flex.justify-content-between.py-1.text-muted
.btn-group.h-100.mr-1
label#replay.btn.btn-outline-light
.ion-md-play-circle
label#volume.btn.btn-outline-light
.ion-md-volume-high
.flex-grow-1.h-100
#headline.d-flex.justify-content-between
#date-time.align-self-center || -Datum- - -Uhrzeit-
#date-time || -Datum- - -Uhrzeit-
#wachenname.ion-md-business= data_wache || ' -Wachenname-'
//.col-6.h-5.d-flex.flex-row.align-items-center.justify-content-end.py-1.text-muted.tf_singleline
// TODO Information in Wachalarm-Bild ob alle Rechte, oder ob reduzierte Version
@ -26,6 +25,7 @@
//.col-6.h-5.d-flex.flex-row.align-items-center.justify-content-end.py-1.text-muted.tf_singleline
// TODO Information in Wachalarm-Bild ob alle Rechte, oder ob reduzierte Version
#wachenname.ion-md-business=data_wache || ' -Wachenname-'
.row.no-gutters.fullheight
.col-10.h-15.h-20_ls.pr-3
#einsatz_art.h-100.w-100.d-flex.align-items-center.font-weight-bold.p-3.rounded.bg-dark.tf_singleline
#einsatz_stichwort.ion-md-apps -Stichwort-
@ -33,7 +33,7 @@
#sondersignal.ion-md-apps
.col-12.col-5_ls.h-35.h-70_ls.pt-3_pt.ptr-3_ls
#map.h-100.rounded
.col-12.col-7_ls.h-40.h-70_ls
.col-12.col-7_ls.h-45.h-70_ls
.row.no-gutters.h-100.pt-3
.col-12.h-20.h-100.w-100#rmld_container
// TODO: Rueckmedlung ohne Rueckmeldung ausbleden