diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index 6387bf5442..8024119fdc 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -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; } }); diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index ea72a6d914..700a2026c1 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -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);