tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cherry-pick-5bb4e747' into 'pandora_6.0'

Browse Source 
Merge branch '24-general-report-ordenar-por-nombre-de-agente-y-luego-por-nombre-…

See merge request !74
This commit is contained in:
vgilc 2017-01-25 12:43:46 +01:00
commit 1f16f67ca0
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/functions_reporting.php
View File

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

10
pandora_console/include/functions_reporting_html.php
View File

@ -2479,6 +2479,16 @@ function reporting_html_general(&$table, $item) {
$table1->style[2] = '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) {
if ($item['date']['period'] != 0) {
$table1->data[] = array(