tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-13083-alertas-sonoras-no-utilizan-tz-del-usuario' into 'develop' 

Ent 13083 Alertas sonoras no utilizan TZ del usuario

See merge request artica/pandorafms!7242
This commit is contained in:
Kevin Rojas 2024-04-18 14:47:29 +00:00
parent d2c6be5851 bec0c2e495
commit 75acd03568
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/javascript/pandora_events.js
View File

@ -1345,7 +1345,7 @@ function check_event_sound(settings) {
let element_time = $(this) let element_time = $(this)
.children(".li-hidden") .children(".li-hidden")
.val(); .val();
let obj_time = new Date(element_time); let obj_time = new Date(element_time * 1000);
let current_dt = new Date(); let current_dt = new Date();
let timestamp = current_dt.getTime() - obj_time.getTime(); let timestamp = current_dt.getTime() - obj_time.getTime();
timestamp = timestamp / 1000; timestamp = timestamp / 1000;
@ -1427,7 +1427,7 @@ function check_event_sound(settings) {
li.insertAdjacentHTML( li.insertAdjacentHTML(
"beforeend", "beforeend",
'<input type="hidden" value="' + '<input type="hidden" value="' +
element.event_timestamp + element.utimestamp +
'" class="li-hidden"/>' '" class="li-hidden"/>'
); );
$("#tabs-sound-modal .elements-discovered-alerts ul").prepend(li); $("#tabs-sound-modal .elements-discovered-alerts ul").prepend(li);

8
pandora_console/operation/events/sound_events.php
View File

@ -437,7 +437,7 @@ function check_event_sound() {
let element_time = $(this) let element_time = $(this)
.children(".li-hidden") .children(".li-hidden")
.val(); .val();
let obj_time = new Date(element_time); let obj_time = new Date(element_time * 1000);
let current_dt = new Date(); let current_dt = new Date();
let timestamp = current_dt.getTime() - obj_time.getTime(); let timestamp = current_dt.getTime() - obj_time.getTime();
timestamp = timestamp / 1000; timestamp = timestamp / 1000;
@ -492,13 +492,13 @@ function check_event_sound() {
// Remove audio. // Remove audio.
remove_audio(); remove_audio();
var urlSound = '../../include/sounds/'+$('#sound_id :selected').val(); var urlSound = '../../include/sounds/'+$('#sound_id :selected').val();
console.log(urlSound)
// Apend audio. // Apend audio.
add_audio(urlSound); add_audio(urlSound);
// Add elements. // Add elements.
data.forEach(function(element) { data.forEach(function(element) {
console.log(element);
var li = document.createElement("li"); var li = document.createElement("li");
var b64 = btoa(JSON.stringify(element)); var b64 = btoa(JSON.stringify(element));
li.insertAdjacentHTML( li.insertAdjacentHTML(
@ -519,7 +519,7 @@ function check_event_sound() {
); );
li.insertAdjacentHTML( li.insertAdjacentHTML(
"beforeend", "beforeend",
'<input type="hidden" value="' + element.event_timestamp + '" class="li-hidden"/>' '<input type="hidden" value="' + element.utimestamp + '" class="li-hidden"/>'
); );
$("#tabs-sound-modal .elements-discovered-alerts ul").prepend(li); $("#tabs-sound-modal .elements-discovered-alerts ul").prepend(li);
}); });