From 8df31ff33b060aa111d683d35327aee0ddf79a50 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Tue, 3 Mar 2020 16:01:01 +0100 Subject: [PATCH] =?UTF-8?q?update=20Di=203.=20M=C3=A4r=2016:01:01=20CET=20?= =?UTF-8?q?2020?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/client_waip.js | 6 +++--- server/sql_qry.js | 24 +++++++++++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/public/js/client_waip.js b/public/js/client_waip.js index 59554c7..3a20945 100644 --- a/public/js/client_waip.js +++ b/public/js/client_waip.js @@ -486,9 +486,9 @@ $('#send_response').on('click', function() { socket.on('io.response', function(data) { console.log(data); // neue Rückmeldungen hinterlegen - $('#rueckmeldung').empty(); + //$('#rueckmeldung').empty(); //{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'; switch (data[i]) { case '0': @@ -501,6 +501,6 @@ socket.on('io.response', function(data) { item_class = item_class + ' text-success'; }; $('#rueckmeldung').append('' + data[i] + ' ' + i + ''); - }; + };*/ resize_text(); }); diff --git a/server/sql_qry.js b/server/sql_qry.js index 7b105f2..65cbd7c 100644 --- a/server/sql_qry.js +++ b/server/sql_qry.js @@ -717,11 +717,29 @@ module.exports = function(db, async, app_cfg) { rows.forEach(function (item, index, array) { // summiertes JSON-Rueckmeldeobjekt für die angeforderte Wachennummer erstellen 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 (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 all_responses.push(item) };