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

2012-11-27 Sergio Martin <sergio.martin@artica.es> 

* include/functions_reporting.php
	operation/reporting/reporting_viewer.php: Fix some bugs of
	reports on metaconsole



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7191 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-11-27 18:20:38 +00:00
parent 2e6fd3e492
commit b836781406
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-11-27 Sergio Martin <sergio.martin@artica.es>
* include/functions_reporting.php
operation/reporting/reporting_viewer.php: Fix some bugs of
reports on metaconsole
2012-11-27 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php: Fixed progress_bar in metaconsole.

15
pandora_console/include/functions_reporting.php
View File

@ -2493,7 +2493,11 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$data_sla = reporting_get_agentmodule_sla_array ($sla['id_agent_module'], $content['period'],
$sla['sla_min'], $sla['sla_max'], $report['datetime'], $content, $content['time_from'],
$content['time_to']);
if($data_sla == false) {
$data_sla = array();
}
//Get the sla_value in % and store it on $sla_value
$data_total = 0;
$data_pass = 0;
@ -2516,8 +2520,13 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
}
}
$sla_value = ($data_pass / $data_total) * 100;
if($data_total == 0) {
$sla_value = 0;
}
else {
$sla_value = ($data_pass / $data_total) * 100;
}
//Do not show right modules if 'only_display_wrong' is active
if ($content['only_display_wrong'] == 1 && $sla_value >= $sla['sla_limit']) continue;

5
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -65,10 +65,7 @@ $enable_init_date = get_parameter('enable_init_date', 0);
// Standard header
// Build link for sort actions: metaconsole and normal console
$variable_link = ui_get_full_url(false);
$url = $variable_link . "index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id=$id_report&date=$date&time=$time";
$url = "index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id=$id_report&date=$date&time=$time";
$options['setup'] = "<a href='index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&action=new&tab=item_editor&id_report=$id_report'>"
. html_print_image ("images/setup.png", true, array ("title" => __('Setup')))