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

update So 16. Feb 10:31:01 CET 2020

Browse Source
This commit is contained in:
Robert Richter 2020-02-16 10:31:01 +01:00
parent a2d152caac
commit 6871cb96b4
4 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/socket.js
View File

@ -41,7 +41,7 @@ socket_api.emit('CH01', 'me', 'test msg');
waip.einsatz_verteilen(result_einsatz[0].waip_einsaetze_ID, socket.id, wachen_id); waip.einsatz_verteilen(result_einsatz[0].waip_einsaetze_ID, socket.id, wachen_id);
sql.db_update_client_status(socket, result_einsatz[0].waip_einsaetze_ID); sql.db_update_client_status(socket, result_einsatz[0].waip_einsaetze_ID);
//vorhanden Rückmeldungen verteilen //vorhanden Rückmeldungen verteilen
sql.db_get_response(result_einsatz[0].waip_einsaetze_ID, function(result){ sql.db_get_response_wache(result_einsatz[0].waip_einsaetze_ID, function(result){
if (result) { if (result) {
waip.reuckmeldung_verteilen(result_einsatz[0].waip_einsaetze_ID, result); waip.reuckmeldung_verteilen(result_einsatz[0].waip_einsaetze_ID, result);
}; };

4
server/sql_qry.js
View File

@ -677,7 +677,7 @@ module.exports = function(db, async, app_cfg) {
}; };
function db_get_response_wache(waip_einsaetze_id, wachen_nr, callback) { function db_get_response_wache(waip_einsaetze_id, wachen_nr, callback) {
db.all(`SELECT response_json FROM waip_response WHERE waip_einsaetze_id = ?`, [waip_einsaetze_id], function (err, row) { db.all(`SELECT response_json FROM waip_response WHERE waip_einsaetze_id = ?`, [waip_einsaetze_id], function (err, rows) {
if (err == null && rows) { if (err == null && rows) {
// temporaere Variablen // temporaere Variablen
var itemsProcessed = 0; var itemsProcessed = 0;
@ -693,6 +693,7 @@ module.exports = function(db, async, app_cfg) {
// Zeilen einzelnen durchgehen // Zeilen einzelnen durchgehen
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
if (item.wachen_nr) {
if (item.wachen_nr.startsWith(wachen_nr)) { if (item.wachen_nr.startsWith(wachen_nr)) {
// response_wache aufsummieren // response_wache aufsummieren
if (Number.isInteger(item.einsatzkraft)) { if (Number.isInteger(item.einsatzkraft)) {
@ -708,6 +709,7 @@ module.exports = function(db, async, app_cfg) {
response_wache.atemschutz = response_wache.atemschutz + item.atemschutz; response_wache.atemschutz = response_wache.atemschutz + item.atemschutz;
}; };
}; };
};
// Schleife ggf. beenden // Schleife ggf. beenden
itemsProcessed++; itemsProcessed++;
if (itemsProcessed === array.length) { if (itemsProcessed === array.length) {

7
views/includes/modal_rmld.pug
View File

@ -1,4 +1,11 @@
// Modal // Modal
- if (!einsatzdaten) {
- einsatzdaten.uuid = '0';
- einsatzdaten.wachen.waip_wachen_ID = null;
- einsatzdaten.wachen.wachenname = '';
- }
#responseModal.modal.fade(tabindex='-1', role='dialog', aria-hidden='true') #responseModal.modal.fade(tabindex='-1', role='dialog', aria-hidden='true')
.modal-dialog.modal-dialog-centered(role='document') .modal-dialog.modal-dialog-centered(role='document')
.modal-content .modal-content

6
views/waip.pug
View File

@ -5,7 +5,7 @@ append head
block content block content
include includes/modal_info include includes/modal_info
//include includes/modal_rmld include includes/modal_rmld
.container-fluid .container-fluid
#waipclock.d-none #waipclock.d-none
include includes/master_clock include includes/master_clock
@ -13,7 +13,7 @@ block content
include includes/master_wachalarm include includes/master_wachalarm
script. script.
var map_tile = !{JSON.stringify(map_tile).replace(/<\//g, '<\\/')} var map_tile = !{JSON.stringify(public.map_tile).replace(/<\//g, '<\\/')}
var client_id = !{JSON.stringify(app_id).replace(/<\//g, '<\\/')} var client_id = !{JSON.stringify(app_id).replace(/<\//g, '<\\/')}
script(src='/js/leaflet.js') script(src='/js/leaflet.js')
script(src='/js/textFit.min.js') script(src='/js/textFit.min.js')
@ -21,4 +21,4 @@ block content
script. script.
wachen_id="#{wachen_id}" wachen_id="#{wachen_id}"
waip_id=null waip_id=null
script(src='/js/waip_client.js') script(src='/js/client_waip.js')