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

update Fr 3. Jul 15:31:01 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-07-03 15:31:01 +02:00
parent 745d68c4f1
commit cfbbbf5305
2 changed files with 55 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
public/js/client_dbrd.js
View File

@ -283,7 +283,7 @@ socket.on('io.Einsatz', function (data) {
// Einsatz-ID speichern // Einsatz-ID speichern
waip_id = data.id; waip_id = data.id;
// DBRD-ID und Zeit setzten // DBRD-ID und Zeit setzten
$('#dbrd_id').html(' ' + data.uuid); $('#dbrd_id').html(data.uuid);
$('#einsatz_datum').html(data.zeitstempel); $('#einsatz_datum').html(data.zeitstempel);
// Hintergrund der Einsatzart zunächst entfernen // Hintergrund der Einsatzart zunächst entfernen
@ -356,10 +356,34 @@ socket.on('io.Einsatz', function (data) {
}; };
}; };
if (wache_vorhanden) { if (wache_vorhanden) {
//var newCell2 = newRow.insertCell(1); var flex_div = document.createElement('div');
var newText2 = document.createTextNode(data.einsatzmittel[i].einsatzmittel); flex_div.className = 'd-flex flex-wrap justify-content-between align-items-center';
var flex_under_div = document.createElement('div');
flex_under_div.className = 'flex-fill rounded bg-secondary p-2 m-1';
var justify_div = document.createElement('div');
justify_div.className = 'd-flex justify-content-between';
var em_div = document.createElement('div');
em_div.className = 'pr-2';
em_div.innerHTML = data.einsatzmittel[i].einsatzmittel;
flex_div.appendChild(flex_under_div);
flex_under_div.appendChild(justify_div);
justify_div.appendChild(em_div);
table_em.rows[wache_zeile].cells[1].appendChild(flex_div);
//var newText2 = document.createTextNode(data.einsatzmittel[i].einsatzmittel);
//newCell2.appendChild(newText2); //newCell2.appendChild(newText2);
table_em.rows[wache_zeile].cells[1].appendChild(newText2); //table_em.rows[wache_zeile].cells[1].appendChild(newText2);
//table_em.rows[wache_zeile].cells[1].setAttribute('pr-2');
} else { } else {
var tableRef = document.getElementById('table_einsatzmittel').getElementsByTagName('tbody')[0]; var tableRef = document.getElementById('table_einsatzmittel').getElementsByTagName('tbody')[0];
var newRow = tableRef.insertRow(); var newRow = tableRef.insertRow();
@ -370,7 +394,26 @@ socket.on('io.Einsatz', function (data) {
var newText2 = document.createTextNode(data.einsatzmittel[i].einsatzmittel); var newText2 = document.createTextNode(data.einsatzmittel[i].einsatzmittel);
newCell2.appendChild(newText2); newCell2.appendChild(newText2);
}; };
/*
th(scope='row') CB FW Cottbus 1
td
div
div.flex-fill.rounded.bg-secondary.p-2.m-1
div.d-flex.justify-content-between
div.pr-2 FL CB 01/42-01
div.p-2.badge.badge-success 2
div.flex-fill.rounded.bg-secondary.p-2.m-1
div.d-flex.justify-content-between
div.pr-2 FL CB 01/82-01
div.p-2.badge.badge-warning 3
*/
}; };
// Karte leeren // Karte leeren
map.removeLayer(marker); map.removeLayer(marker);

10
views/includes/master_dashboard.pug
View File

@ -49,6 +49,10 @@ style(type='text/css').
.vis-custom-time { .vis-custom-time {
background: #3498DB; background: #3498DB;
} }
/*.vis-custom-time > .vis-custom-time-marker*/
.vis-custom-time-marker {
right: 2px;
}
.row .row
@ -57,8 +61,8 @@ style(type='text/css').
.col-4 .col-4
.row.no-gutters .row.no-gutters
.col-12.d-flex.justify-content-start .col-12.d-flex.justify-content-start
.text-muted Dashboard-ID: .text-muted Alarmierung: 
#dbrd_id.text-muted.text-right   2345 #einsatz_datum.text-muted.text-right   2345
.col-10.mt-2 .col-10.mt-2
#einsatz_art.align-items-center.font-weight-bold.rounded.bg-secondary.p-3.mr-2 #einsatz_art.align-items-center.font-weight-bold.rounded.bg-secondary.p-3.mr-2
#einsatz_stichwort.ion-md-apps -Stichwort- #einsatz_stichwort.ion-md-apps -Stichwort-
@ -152,7 +156,7 @@ style(type='text/css').
.col-8 .col-8
.row.no-gutters .row.no-gutters
.col-12.d-flex.justify-content-end .col-12.d-flex.justify-content-end
#einsatz_datum.text-muted 01.01.2020 - 11:22:33 #dbrd_id.text-muted 2341234345453
.col-12 .col-12
//.card.bg-dark.mt-2 //.card.bg-dark.mt-2
.card-header.bg-secondary.p-2 .card-header.bg-secondary.p-2