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

update So 5. Jul 22:31:01 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-07-05 22:31:01 +02:00
parent 9e7d9a7d9c
commit 8de29b652d
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
public/js/client_dbrd.js
View File

@ -374,7 +374,12 @@ socket.on('io.Einsatz', function (data) {
var flex_div_wa = document.createElement('div'); var flex_div_wa = document.createElement('div');
flex_div_wa.className = 'd-flex flex-wrap justify-content-between align-items-center'; flex_div_wa.className = 'd-flex flex-wrap justify-content-between align-items-center';
flex_div_wa.id = wachen_idstr; flex_div_wa.id = wachen_idstr;
table_em.rows[wache_zeile].cells[1].appendChild(flex_div_wa);
//Flexelement zur Tabelle hinzuefuegen
var new_td = document.createElement('td');
new_td.appendChild(flex_div_wa);
newRow.appendChild(new_td);
//table_em.rows[wache_zeile].cells[1].appendChild(flex_div_wa);
}; };
//Flex-Element fuer Einsatzmittel erzeugen //Flex-Element fuer Einsatzmittel erzeugen
@ -392,7 +397,27 @@ socket.on('io.Einsatz', function (data) {
//Status-Div erzeugen //Status-Div erzeugen
var status_div = document.createElement('div'); var status_div = document.createElement('div');
switch (data.einsatzmittel[i].status) {
case '1':
status_div.className = 'p-2 badge badge-info';
break;
case '2':
status_div.className = 'p-2 badge badge-success';
break;
case '3':
status_div.className = 'p-2 badge badge-warning';
break;
case '4':
status_div.className = 'p-2 badge badge-danger';
break;
default:
status_div.className = 'p-2 badge badge-dark'; status_div.className = 'p-2 badge badge-dark';
break;
}
status_div.innerHTML = data.einsatzmittel[i].status; status_div.innerHTML = data.einsatzmittel[i].status;
//Erzeugte Div zusammensetzen //Erzeugte Div zusammensetzen
@ -525,6 +550,7 @@ th(scope='row') CB FW Cottbus 1
data.zeitstempel, data.zeitstempel,
alarm_zeit alarm_zeit
); );
timeline.customTimes[timeline.customTimes.length - 1].hammer.off("panstart panmove panend");
timeline.setCustomTimeMarker(markerText, alarm_zeit, false); timeline.setCustomTimeMarker(markerText, alarm_zeit, false);
// Configuration for the Timeline // Configuration for the Timeline

6
views/includes/master_dashboard.pug
View File

@ -176,7 +176,7 @@ style(type='text/css').
th(scope='col').text-info.pl-3 Wache th(scope='col').text-info.pl-3 Wache
th(scope='col').text-info.pl-3 Einsatzmittel th(scope='col').text-info.pl-3 Einsatzmittel
tbody tbody
tr //tr
th(scope='row') CB FW Cottbus 1 th(scope='row') CB FW Cottbus 1
td td
div.d-flex.flex-wrap.justify-content-between.align-items-center div.d-flex.flex-wrap.justify-content-between.align-items-center
@ -195,8 +195,8 @@ style(type='text/css').
div.flex-fill.rounded.bg-secondary.p-2.m-1 div.flex-fill.rounded.bg-secondary.p-2.m-1
div.d-flex.justify-content-between div.d-flex.justify-content-between
div.pr-2 FL CB 01/85-01 div.pr-2 FL CB 01/85-01
div.p-2.badge.badge-info 2 div.p-2.badge.badge-info 1
tr //tr
th(scope='row') CB FW Madlow th(scope='row') CB FW Madlow
td td
div.d-flex.flex-wrap.justify-content-between.align-items-center div.d-flex.flex-wrap.justify-content-between.align-items-center