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

update Di 3. Mär 16:01:01 CET 2020

Browse Source
This commit is contained in:
Robert Richter 2020-03-03 16:01:01 +01:00
parent 8f1dc032fe
commit 8df31ff33b
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/js/client_waip.js
View File

@ -486,9 +486,9 @@ $('#send_response').on('click', function() {
socket.on('io.response', function(data) { socket.on('io.response', function(data) {
console.log(data); console.log(data);
// neue Rückmeldungen hinterlegen // neue Rückmeldungen hinterlegen
$('#rueckmeldung').empty(); //$('#rueckmeldung').empty();
//{einsatzkraft: "0", maschinist: "0", fuehrungskraft: "0", atemschutz: "0"} //{einsatzkraft: "0", maschinist: "0", fuehrungskraft: "0", atemschutz: "0"}
for (var i in data) { /*for (var i in data) {
var item_class = 'list-group-item flex-fill list-group-item-action tf_singleline'; var item_class = 'list-group-item flex-fill list-group-item-action tf_singleline';
switch (data[i]) { switch (data[i]) {
case '0': case '0':
@ -501,6 +501,6 @@ socket.on('io.response', function(data) {
item_class = item_class + ' text-success'; item_class = item_class + ' text-success';
}; };
$('#rueckmeldung').append('<a class="' + item_class + '">' + data[i] + ' ' + i + '</a>'); $('#rueckmeldung').append('<a class="' + item_class + '">' + data[i] + ' ' + i + '</a>');
}; };*/
resize_text(); resize_text();
}); });

24
server/sql_qry.js
View File

@ -717,11 +717,29 @@ module.exports = function(db, async, app_cfg) {
rows.forEach(function (item, index, array) { rows.forEach(function (item, index, array) {
// summiertes JSON-Rueckmeldeobjekt für die angeforderte Wachennummer erstellen // summiertes JSON-Rueckmeldeobjekt für die angeforderte Wachennummer erstellen
var tmp = JSON.stringify(item.wache_nr); var tmp = JSON.stringify(item.wache_nr);
console.log('item. '+tmp );
console.log(wachen_nr);
console.log(tmp.startsWith(wachen_nr));
if (tmp.startsWith(wachen_nr)) { if (tmp.startsWith(wachen_nr)) {
if (item.einsatzkraft == 1) {
item.einsatzkraft = true;
} else {
item.einsatzkraft = true;
};
if (item.maschinist == 1) {
item.maschinist = true;
} else {
item.maschinist = true;
};
if (item.fuehrungskraft == 1) {
item.fuehrungskraft = true;
} else {
item.fuehrungskraft = true;
};
if (item.agt == 1) {
item.agt = true;
} else {
item.agt = true;
};
// response_wache aufsummieren // response_wache aufsummieren
all_responses.push(item) all_responses.push(item)
}; };