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

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

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

75
public/js/client_dbrd.js
View File

@ -348,6 +348,7 @@ socket.on('io.Einsatz', function (data) {
var table_em = document.getElementById('table_einsatzmittel');
var wache_vorhanden = false;
var wache_zeile = 0;
var wachen_idstr =data.einsatzmittel[i].wachenname.replace(/[^A-Z0-9]+/ig, '_');
for (var j = 0, row; row = table_em.rows[j]; j++) {
//console.log(row.cells[0].innerHTML);
if (row.cells[0].innerHTML == data.einsatzmittel[i].wachenname) {
@ -355,7 +356,66 @@ socket.on('io.Einsatz', function (data) {
wache_zeile = j;
};
};
if (wache_vorhanden) {
if (!wache_vorhanden){
// Zeile fuer Wache anlegen, falls diese noch nicht hinterlegt
var tableRef = document.getElementById('table_einsatzmittel').getElementsByTagName('tbody')[0];
var newRow = tableRef.insertRow();
//var newCell = newRow.insertCell(0);
// Wachennamen hinterlegen
var new_th = document.createElement('th');
new_th.innerHTML = data.einsatzmittel[i].wachenname;
//var newText = document.createTextNode(data.einsatzmittel[i].wachenname);
//newCell.outerHTML = "<th></th>";
//newCell.appendChild(newText);
newRow.appendChild(new_th);
//Flex-Element fuer Einsatzmittel der Wache erzeugen
var flex_div_wa = document.createElement('div');
flex_div_wa.className = 'd-flex flex-wrap justify-content-between align-items-center';
flex_div_wa.id = wachen_idstr;
table_em.rows[wache_zeile].cells[1].appendChild(flex_div_wa);
};
//Flex-Element fuer Einsatzmittel erzeugen
var flex_div_em = document.createElement('div');
flex_div_em.className = 'flex-fill rounded bg-secondary p-2 m-1';
//Justify-Rahmen feuer Einsatzmittel erzeugen
var justify_div = document.createElement('div');
justify_div.className = 'd-flex justify-content-between';
//Einsatzmittel-Div erzeugen
var em_div = document.createElement('div');
em_div.className = 'pr-2';
em_div.innerHTML = data.einsatzmittel[i].einsatzmittel;
//Status-Div erzeugen
var status_div = document.createElement('div');
status_div.className = 'p-2 badge badge-dark';
status_div.innerHTML = data.einsatzmittel[i].status;
//Erzeugte Div zusammensetzen
flex_div_em.appendChild(justify_div);
justify_div.appendChild(em_div);
justify_div.appendChild(status_div);
// Einsatzmittel hinzuefuegen
document.getElementById(wachen_idstr).appendChild(flex_div_em);
//var newText2 = document.createTextNode(data.einsatzmittel[i].einsatzmittel);
//newCell2.appendChild(newText2);
//table_em.rows[wache_zeile].cells[1].appendChild(newText2);
//table_em.rows[wache_zeile].cells[1].setAttribute('pr-2');
/* if (wache_vorhanden) {
var flex_div = document.createElement('div');
flex_div.className = 'd-flex flex-wrap justify-content-between align-items-center';
@ -387,19 +447,8 @@ socket.on('io.Einsatz', function (data) {
//table_em.rows[wache_zeile].cells[1].appendChild(newText2);
//table_em.rows[wache_zeile].cells[1].setAttribute('pr-2');
} else {
//var tableRef = document.getElementById('table_einsatzmittel').getElementsByTagName('tbody')[0];
//var newRow = tableRef.insertRow();
//var newCell = newRow.insertCell(0);
//var newText = document.createTextNode(data.einsatzmittel[i].wachenname);
//newCell.outerHTML = "<th></th>";
//newCell.appendChild(newText);
var tr = document.getElementById('tatable_einsatzmittelble').tHead.children[0],
th = document.createElement('th');
th.innerHTML = data.einsatzmittel[i].wachenname;
tr.appendChild(th);
var flex_div = document.createElement('div');
flex_div.className = 'd-flex flex-wrap justify-content-between align-items-center';
@ -430,7 +479,7 @@ socket.on('io.Einsatz', function (data) {
var newCell2 = newRow.insertCell(1);
var newText2 = document.createTextNode(data.einsatzmittel[i].einsatzmittel);
newCell2.appendChild(flex_div);
};
};/*
/*

2
server/app_cfg.js
View File

@ -25,7 +25,7 @@ app_cfg.public = {
url: 'https://wachalarm.mooo.com',
app_name: 'Wachalarm IP-Web',
company: 'Leitstelle Lausitz',
version: 'Version 1.2',
version: 'Version 1.2.1',
map_tile: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
map_attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
ext_imprint: false,