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

Order by agent and module in general reports, fix group reports - #24

This commit is contained in:
enriquecd 2017-01-23 17:39:33 +01:00
parent 823687ae3a
commit 25535445fa
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/include/functions_reporting.php
View File

@ -2148,8 +2148,8 @@ function reporting_group_report($report, $content) {
$return["data"] = array(); $return["data"] = array();
$events = events_get_group_events( $events = events_get_agent(
$content['id_group'], false,
$content['period'], $content['period'],
$report['datetime'], $report['datetime'],
false, false,
@ -2157,7 +2157,9 @@ function reporting_group_report($report, $content) {
false, false,
false, false,
false, false,
$metaconsole_on); false,
$content['id_group'],
true);
if (empty($events)) { if (empty($events)) {
$events = array(); $events = array();

10
pandora_console/include/functions_reporting_html.php
View File

@ -2478,6 +2478,16 @@ function reporting_html_general(&$table, $item) {
$table1->style[2] = 'text-align: left'; $table1->style[2] = 'text-align: left';
$table1->style[3] = 'text-align: left'; $table1->style[3] = 'text-align: left';
/* Begin - Order by agent */
foreach ($item['data'] as $key => $row) {
$aux[$key] = $row['agent'];
}
array_multisort($aux, SORT_ASC, $item['data']);
/* End - Order by agent */
foreach ($item['data'] as $row) { foreach ($item['data'] as $row) {
if ($item['date']['period'] != 0) { if ($item['date']['period'] != 0) {
$table1->data[] = array( $table1->data[] = array(