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

update So 21. Jun 20:31:01 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-06-21 20:31:01 +02:00
parent 12006eb196
commit 5b7a87a346
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
databasudo Normal file
View File

34
public/js/client_waip.js
View File

@ -271,7 +271,7 @@ socket.on('io.playtts', function (data) {
// Audio-Blockade des Browsers erkennen
var promise = document.querySelector('audio').play();
console.log(document.querySelector('audio').play());
console.log( audio);
console.log(audio);
/*if (promise !== undefined) {
console.log(promise);
@ -289,10 +289,10 @@ socket.on('io.playtts', function (data) {
// In browsers that don’t yet support this functionality,
// playPromise won’t be defined.
if (playPromise !== undefined) {
playPromise.then(function() {
playPromise.then(function () {
// Automatic playback started!
audio.play();
}).catch(function(error) {
}).catch(function (error) {
// Automatic playback failed.
// Show a UI element to let the user manually start playback.
$('#volume').addClass('btn-danger');
@ -405,20 +405,26 @@ socket.on('io.new_waip', function (data) {
};
// weitere alarmierte Einsatzmittel setzen
$('#em_weitere').html('');
var data_em_weitere = {};
data_em_weitere = JSON.parse(data.em_weitere);
if (data_em_weitere.length > 0) {
var tmp;
for (var i in data_em_weitere) {
if (tmp) {
tmp = tmp + ', ' + data_em_weitere[i].name;
} else {
tmp = data_em_weitere[i].name;
try {
var data_em_weitere = JSON.parse(data.em_weitere);
if (data_em_weitere.length > 0) {
var tmp;
for (var i in data_em_weitere) {
if (tmp) {
tmp = tmp + ', ' + data_em_weitere[i].name;
} else {
tmp = data_em_weitere[i].name;
};
};
$('#em_weitere').html(tmp);
};
$('#em_weitere').html(tmp);
} catch (e) {
console.log(e); // error in the above string (in this case, yes)!
};
// Karte leeren
map.removeLayer(marker);
map.removeLayer(geojson);
@ -494,7 +500,7 @@ var counter_rmld = [];
function reset_rmld(p_uuid) {
var bar_uuid = 'bar-' + p_uuid;
$('#pg-ek').children().each(function (i) {
if (!$(this).hasClass(bar_uuid)) {
if (!$(this).hasClass(bar_uuid)) {
$(this).remove();
};
});

2
server/waip.js
View File

@ -13,7 +13,7 @@ module.exports = function (io, sql, fs, brk, async, app_cfg) {
// nach dem Speichern anhand der waip_id die beteiligten Wachennummern zum Einsatz ermitteln
sql.db_einsatz_get_rooms(waip_id, function (socket_rooms) {
// socket_rooms muss groesser als 1 sein, da sonst nur der Standard-Raum '0' vorhanden ist
if (socket_rooms.length > 1) {
if (socket_rooms.length > 0) {
socket_rooms.forEach(function (rooms) {
// fuer jede Wache(rooms.room) die verbundenen Sockets(Clients) ermitteln und den Einsatz verteilen
var room_sockets = io.nsps['/waip'].adapter.rooms[rooms.room];