diff --git a/public/css/waip.css b/public/css/waip.css
index 9e81598..4f77c32 100644
--- a/public/css/waip.css
+++ b/public/css/waip.css
@@ -203,8 +203,8 @@ audio {
}
}
+******/
-**********/
#em_alarmiert {
font-size: 1.5vw;
}
diff --git a/public/js/client_waip.js b/public/js/client_waip.js
index 3c06238..84a1bfa 100644
--- a/public/js/client_waip.js
+++ b/public/js/client_waip.js
@@ -51,9 +51,10 @@ function resize_text() {
detectMultiLine: false
});
textFit(document.getElementsByClassName('tf_test'), {
- detectMultiLine: false,
- multiLine: false,
- alignVertWithFlexbox: flase
+ minFontSize: 1,
+ maxFontSize: 500,
+ reProcess: true,
+ alignVertWithFlexbox: false
});
map.invalidateSize();
$("body").css("background-color", "#222");
@@ -377,7 +378,15 @@ socket.on('io.neuerEinsatz', function (data) {
$('#em_alarmiert').empty();
var data_em_alarmiert = JSON.parse(data.em_alarmiert);
for (var i in data_em_alarmiert) {
- $('#em_alarmiert').append('
' + data_em_alarmiert[i].name + '');
+ var tmp = data_em_alarmiert[i].name.replace(/[^a-z0-9\s]/gi, '').replace(/[_\s]/g, '-');
+ $('#em_alarmiert').append('');
+ $('#cn_' + tmp).append('' + data_em_alarmiert[i].name + '
');
+
+//2
+ // 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('' + data_em_alarmiert[i].name + '');
};
// weitere alarmierte Einsatzmittel setzen
$('#em_weitere').html('');
diff --git a/views/includes/master_wachalarm.pug b/views/includes/master_wachalarm.pug
index bb716f9..74df43e 100644
--- a/views/includes/master_wachalarm.pug
+++ b/views/includes/master_wachalarm.pug
@@ -1,11 +1,11 @@
#waiptableau.fullheight.row.no-gutters
- .col-6.h-5.d-flex.align-items-center.py-1.text-muted
- button#replay.btn.btn-outline-light.h-100.py-1.tf_singleline
+ .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
.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
- #date-time
- .tf_singleline -Datum- - -Uhrzeit-
+ #date-time
+ div -Datum- - -Uhrzeit-
.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-'
.col-10.h-15.h-20_ls.pr-3
@@ -63,7 +63,6 @@
| -Straße Hsnr-
//.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
- //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.pr-2 FL CB 01/42-01
div.p-2.badge.badge-success 2
@@ -99,7 +98,7 @@
// TODO: auflistung vieler Fahrzeuge verbessern. flexfill
.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-
- .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-
.col-12.h-5.d-flex.align-items-end.justify-content-center.pt-3
.progress(style='height: 100%;').flex-fill