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

Fixes in the new code of reports.

This commit is contained in:
mdtrooper 2015-05-19 17:36:47 +02:00
parent c32c167b6e
commit f2683594b5
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_reporting.php
View File

@ -2700,12 +2700,12 @@ function reporting_sql_graph($report, $content, $type,
global $config; global $config;
switch ($type_sql_graph) { switch ($type_sql_graph) {
case 'netflow_area':
$return['type'] = 'sql_graph_vbar';
break;
case 'sql_graph_hbar': case 'sql_graph_hbar':
$return['type'] = 'sql_graph_hbar'; $return['type'] = 'sql_graph_hbar';
break; break;
case 'sql_graph_vbar':
$return['type'] = 'sql_graph_vbar';
break;
case 'sql_graph_pie': case 'sql_graph_pie':
$return['type'] = 'sql_graph_pie'; $return['type'] = 'sql_graph_pie';
break; break;

9
pandora_console/include/functions_reporting_html.php
View File

@ -97,6 +97,9 @@ function reporting_html_header(&$table, $mini, $title, $subtitle,
function reporting_html_print_report($report, $mini = false) { function reporting_html_print_report($report, $mini = false) {
foreach ($report['contents'] as $key => $item) { foreach ($report['contents'] as $key => $item) {
$table->size = array (); $table->size = array ();
$table->style = array (); $table->style = array ();
@ -1206,7 +1209,7 @@ function reporting_html_group_configuration($table, $item) {
foreach ($item['data'] as $agent) { foreach ($item['data'] as $agent) {
$table2->width = '100%'; $table2->width = '100%';
$table2->data = array (); $table2->data = array ();
reporting_html_agent_configuration(&$table2, array('data' => $agent)); reporting_html_agent_configuration($table2, array('data' => $agent));
$cell .= html_print_table($table2, true); $cell .= html_print_table($table2, true);
} }
@ -1522,6 +1525,10 @@ function reporting_html_agent_configuration(&$table, $item) {
} }
} }
function reporting_html_TTRT_value(&$table, $item, $mini, $only_value = false, $check_empty = false) {
reporting_html_value($table, $item, $mini);
}
function reporting_html_TTO_value(&$table, $item, $mini, $only_value = false, $check_empty = false) { function reporting_html_TTO_value(&$table, $item, $mini, $only_value = false, $check_empty = false) {
reporting_html_value($table, $item, $mini); reporting_html_value($table, $item, $mini);
} }