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-4897-Filtro-erroneo-de-eventos-al-clickar-en-grafica-Events-24h-de-agente-2' into 'develop' 

Ent 4897 filtro erroneo de eventos al clickar en grafica events 24h de agente 2

See merge request artica/pandorafms!2946
This commit is contained in:
vgilc 2019-12-10 15:29:35 +01:00
parent f9c4a826d5 9d3426c0e9
commit 9055cf41b1
2 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pandora_console/include/graphs/flot/pandora.flot.js
View File

@ -933,44 +933,29 @@ function pandoraFlotSlicebar(
to = "23:59";
}
var url_filters = {
id_agent: id_agent,
date_from: newdate,
time_from: from + ":00",
status: "-1",
group_rep: "1"
};
if (full_legend != "") {
if (newdate2 == undefined) {
window.location =
"index.php?sec=eventos&sec2=operation/events/events&id_agent=" +
id_agent +
"&date_from=" +
newdate +
"&time_from=" +
from +
"&status=-1";
} else {
window.location =
"index.php?sec=eventos&sec2=operation/events/events&id_agent=" +
id_agent +
"&date_from=" +
newdate +
"&time_from=" +
from +
"&date_to=" +
newdate2 +
"&time_to=" +
to +
"&status=-1";
if (newdate2 != undefined) {
url_filters.date_to = newdate2;
url_filters.time_to = to + ":00";
}
} else {
window.location =
"index.php?sec=eventos&sec2=operation/events/events&id_agent=" +
id_agent +
"&date_from=" +
newdate +
"&time_from=" +
from +
"&date_to=" +
newdate +
"&time_to=" +
to +
"&status=-1";
url_filters.date_to = newdate;
url_filters.time_to = to + ":00";
}
var url_filters_fb64 = btoa(JSON.stringify(url_filters));
window.location =
"index.php?sec=eventos&sec2=operation/events/events&fb64=" +
url_filters_fb64;
}
});

13
pandora_console/operation/events/events.php
View File

@ -179,6 +179,14 @@ $date_to = get_parameter(
'filter[date_to]',
$filter['date_to']
);
$time_from = get_parameter(
'filter[time_from]',
$filter['time_from']
);
$time_to = get_parameter(
'filter[time_to]',
$filter['time_to']
);
$source = get_parameter(
'filter[source]',
$filter['source']
@ -201,6 +209,11 @@ $id_source_event = get_parameter(
'filter[id_source_event]',
$filter['id_source_event']
);
if (empty($text_agent) && !empty($id_agent)) {
$text_agent = agents_get_alias($id_agent);
}
// Ajax responses.
if (is_ajax()) {
$get_events = get_parameter('get_events', 0);