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

update Mo 15. Jun 01:01:02 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-06-15 01:01:02 +02:00
parent 4106796cdc
commit a32d6adf5a
2 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
public/js/client_waip.js
View File

@ -16,7 +16,7 @@ $(window).on('resize', function () {
var waipAudio = document.getElementById('audio'); var waipAudio = document.getElementById('audio');
waipAudio.addEventListener('ended', function(){ waipAudio.addEventListener('ended', function () {
$('.ion-md-pause').toggleClass('ion-md-play-circle'); $('.ion-md-pause').toggleClass('ion-md-play-circle');
}); });
@ -292,6 +292,7 @@ socket.on('io.standby', function (data) {
$('#em_alarmiert').empty(); $('#em_alarmiert').empty();
$('#em_weitere').html(''); $('#em_weitere').html('');
reset_rmld(); reset_rmld();
recount_rmld();
map.setView(new L.LatLng(0, 0), 14); map.setView(new L.LatLng(0, 0), 14);
// Tareset_responsebleau ausblenden // Tareset_responsebleau ausblenden
$('#waiptableau').addClass('d-none'); $('#waiptableau').addClass('d-none');
@ -463,24 +464,19 @@ var counter_rmld = [];
function reset_rmld(p_uuid) { function reset_rmld(p_uuid) {
var bar_uuid = 'bar-' + p_uuid; var bar_uuid = 'bar-' + p_uuid;
$('#pg-ek').children().each(function(i) { $('#pg-ek').children().each(function (i) {
console.log('ein gefunden'); if (!$(this).hasClass(bar_uuid)) {
console.log(this); $(this).remove();
if ($(this).hasClass(bar_uuid)) {
console.log('hier');
$(this).remove;
}; };
}); });
$('#pg-ma').children().each(function(i) { $('#pg-ma').children().each(function (i) {
if (!$(this).hasClass(bar_uuid)) { if (!$(this).hasClass(bar_uuid)) {
$(this).remove; $(this).remove();
}; };
}); });
$('#pg-fk').children().each(function(i) { $('#pg-fk').children().each(function (i) {
if (!$(this).hasClass(bar_uuid)) { if (!$(this).hasClass(bar_uuid)) {
$(this).remove; $(this).remove();
}; };
}); });
/*$('#pg-ek').empty(); /*$('#pg-ek').empty();
@ -570,7 +566,7 @@ function recount_rmld(p_uuid) {
$('#fk-counter').text(0); $('#fk-counter').text(0);
$('#agt-counter').text(0); $('#agt-counter').text(0);
// EK zählen // EK zählen
$('#pg-ek').children().each(function(i) { $('#pg-ek').children().each(function (i) {
if ($(this).hasClass(bar_uuid)) { if ($(this).hasClass(bar_uuid)) {
var tmp_count = parseInt($('#ek-counter').text()); var tmp_count = parseInt($('#ek-counter').text());
$('#ek-counter').text(tmp_count + 1); $('#ek-counter').text(tmp_count + 1);
@ -580,7 +576,7 @@ function recount_rmld(p_uuid) {
}; };
}); });
// MA zählen // MA zählen
$('#pg-ma').children().each(function(i) { $('#pg-ma').children().each(function (i) {
if ($(this).hasClass(bar_uuid)) { if ($(this).hasClass(bar_uuid)) {
var tmp_count = parseInt($('#ma-counter').text()); var tmp_count = parseInt($('#ma-counter').text());
$('#ma-counter').text(tmp_count + 1); $('#ma-counter').text(tmp_count + 1);
@ -590,7 +586,7 @@ function recount_rmld(p_uuid) {
}; };
}); });
// FK zählen // FK zählen
$('#pg-fk').children().each(function(i) { $('#pg-fk').children().each(function (i) {
if ($(this).hasClass(bar_uuid)) { if ($(this).hasClass(bar_uuid)) {
var tmp_count = parseInt($('#fk-counter').text()); var tmp_count = parseInt($('#fk-counter').text());
$('#fk-counter').text(tmp_count + 1); $('#fk-counter').text(tmp_count + 1);
@ -602,7 +598,7 @@ function recount_rmld(p_uuid) {
// AGT setzen // AGT setzen
$('#agt-counter').text(agt_count); $('#agt-counter').text(agt_count);
// Rückmeldecontainer anzeigen/ausblenden // Rückmeldecontainer anzeigen/ausblenden
if ($('#ek-counter').text() == '0' && $('#ma-counter').text() == '0' && $('#fk-counter').text() == '0' && $('#agt-counter').text() == '0') { if ($('#ek-counter').text() == '0' && $('#ma-counter').text() == '0' && $('#fk-counter').text() == '0' && $('#agt-counter').text() == '0') {
$('#rmld_container').addClass('d-none'); $('#rmld_container').addClass('d-none');
} else { } else {
$('#rmld_container').removeClass('d-none'); $('#rmld_container').removeClass('d-none');

3
server/sql_qry.js
View File

@ -839,7 +839,7 @@ module.exports = function (db, uuidv4, app_cfg) {
function db_rmld_loeschen(waip_uuid) { function db_rmld_loeschen(waip_uuid) {
// Rueckmeldungen löschen // Rueckmeldungen löschen
db.run(`DELETE FROM waip_response WHERE waip_uuid = `, [waip_uuid]); db.run(`DELETE FROM waip_response WHERE waip_uuid = ?`, [waip_uuid]);
}; };
function db_vmtl_get_list(waip_id, callback) { function db_vmtl_get_list(waip_id, callback) {
@ -885,7 +885,6 @@ module.exports = function (db, uuidv4, app_cfg) {
// DEBUG // DEBUG
if (app_cfg.global.development) { if (app_cfg.global.development) {
console.log('Export-Liste RMLD: ' + JSON.stringify(arry_wachen)); console.log('Export-Liste RMLD: ' + JSON.stringify(arry_wachen));
console.log(arry_wachen.join(', '));
}; };
// nur weiter machen wenn arry_wachen nicht leer, weil z.b. keine Rueckmeldungen vorhanden sind // nur weiter machen wenn arry_wachen nicht leer, weil z.b. keine Rueckmeldungen vorhanden sind
if (arry_wachen.length > 0) { if (arry_wachen.length > 0) {