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

update Mi 29. Apr 16:01:02 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-04-29 16:01:02 +02:00
parent 99f761356d
commit d290b4fee1
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/waip.css
View File

@ -203,8 +203,8 @@ audio {
} }
} }
******/
**********/
#em_alarmiert { #em_alarmiert {
font-size: 1.5vw; font-size: 1.5vw;
} }

17
public/js/client_waip.js
View File

@ -51,9 +51,10 @@ function resize_text() {
detectMultiLine: false detectMultiLine: false
}); });
textFit(document.getElementsByClassName('tf_test'), { textFit(document.getElementsByClassName('tf_test'), {
detectMultiLine: false, minFontSize: 1,
multiLine: false, maxFontSize: 500,
alignVertWithFlexbox: flase reProcess: true,
alignVertWithFlexbox: false
}); });
map.invalidateSize(); map.invalidateSize();
$("body").css("background-color", "#222"); $("body").css("background-color", "#222");
@ -377,7 +378,15 @@ socket.on('io.neuerEinsatz', function (data) {
$('#em_alarmiert').empty(); $('#em_alarmiert').empty();
var data_em_alarmiert = JSON.parse(data.em_alarmiert); var data_em_alarmiert = JSON.parse(data.em_alarmiert);
for (var i in data_em_alarmiert) { for (var i in data_em_alarmiert) {
$('#em_alarmiert').append('<li class="list-group-item d-flex justify-content-between align-items-center">' + data_em_alarmiert[i].name + '</li>'); var tmp = data_em_alarmiert[i].name.replace(/[^a-z0-9\s]/gi, '').replace(/[_\s]/g, '-');
$('#em_alarmiert').append('<div id="cn_' + tmp + '" class="rounded bg-secondary d-flex justify-content-between flex-fill p-2 m-1"></div>');
$('#cn_' + tmp).append('<div class="pr-2">' + data_em_alarmiert[i].name + '</div>');
//<div class="p-2 badge badge-success">2</div>
// div.rounded.bg-secondary.d-flex.justify-content-between.flex-fill.p-2.m-1
// div.pr-2 FL CB 01/42-01
// div.p-2.badge.badge-success 2
//$('#em_alarmiert').append('<li class="list-group-item d-flex justify-content-between align-items-center">' + data_em_alarmiert[i].name + '</li>');
}; };
// weitere alarmierte Einsatzmittel setzen // weitere alarmierte Einsatzmittel setzen
$('#em_weitere').html(''); $('#em_weitere').html('');

11
views/includes/master_wachalarm.pug
View File

@ -1,11 +1,11 @@
#waiptableau.fullheight.row.no-gutters #waiptableau.fullheight.row.no-gutters
.col-6.h-5.d-flex.align-items-center.py-1.text-muted .col-6.h-5.d-flex.align-items-center.py-1.text-muted.tf_singleline
button#replay.btn.btn-outline-light.h-100.py-1.tf_singleline button#replay.btn.btn-outline-light.h-100.py-1
.ion-md-play-circle .ion-md-play-circle
button#volume.btn.btn-outline-light.h-100.mx-1.tf_singleline button#volume.btn.btn-outline-light.h-100.mx-1
.ion-md-volume-high .ion-md-volume-high
#date-time #date-time
.tf_singleline -Datum- - -Uhrzeit- div -Datum- - -Uhrzeit-
.col-6.h-5.d-flex.flex-row.align-items-center.justify-content-end.py-1.text-muted.tf_singleline .col-6.h-5.d-flex.flex-row.align-items-center.justify-content-end.py-1.text-muted.tf_singleline
#wachenname.ion-md-business=data_wache || ' -Wachenname-' #wachenname.ion-md-business=data_wache || ' -Wachenname-'
.col-10.h-15.h-20_ls.pr-3 .col-10.h-15.h-20_ls.pr-3
@ -63,7 +63,6 @@
| -Straße Hsnr- | -Straße Hsnr-
//.col-6.h-65.d-flex.align-items-around.justify-content-end //.col-6.h-65.d-flex.align-items-around.justify-content-end
#em_alarmiert.col-6.h-60.d-flex.flex-wrap.align-content-end #em_alarmiert.col-6.h-60.d-flex.flex-wrap.align-content-end
//div.flex-fill.rounded.bg-secondary.p-2.m-1
div.rounded.bg-secondary.d-flex.justify-content-between.flex-fill.p-2.m-1 div.rounded.bg-secondary.d-flex.justify-content-between.flex-fill.p-2.m-1
div.pr-2 FL CB 01/42-01 div.pr-2 FL CB 01/42-01
div.p-2.badge.badge-success 2 div.p-2.badge.badge-success 2
@ -99,7 +98,7 @@
// TODO: auflistung vieler Fahrzeuge verbessern. flexfill // TODO: auflistung vieler Fahrzeuge verbessern. flexfill
.col-12.h-5.d-flex.align-items-end.justify-content-center.text-muted.tf_singleline .col-12.h-5.d-flex.align-items-end.justify-content-center.text-muted.tf_singleline
#em_weitere -weiteres Einsatzmittel 1-, -weiteres Einsatzmittel 2-, -weiteres Einsatzmittel n- #em_weitere -weiteres Einsatzmittel 1-, -weiteres Einsatzmittel 2-, -weiteres Einsatzmittel n-
.col-12.h-15.d-flex.align-items-center.rounded.bg-light.font-weight-bold.text-info.tf_singleline .col-12.h-15.d-flex.align-items-center.rounded.bg-dark.font-weight-bold.text-info.tf_singleline
#besonderheiten -Besonderheiten- #besonderheiten -Besonderheiten-
.col-12.h-5.d-flex.align-items-end.justify-content-center.pt-3 .col-12.h-5.d-flex.align-items-end.justify-content-center.pt-3
.progress(style='height: 100%;').flex-fill .progress(style='height: 100%;').flex-fill