From a4450bcd7fa551ff1a64042d55514034d7eab489 Mon Sep 17 00:00:00 2001 From: Esteban Sanchez Date: Fri, 4 Jul 2008 08:56:11 +0000 Subject: [PATCH] 2008-07-04 Esteban Sanchez * operation/reporting/reporting_viewer.php: Fixed error when showing final SLA result. * include/functions_reporting_pdf.php: Added final SLA result. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@933 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/include/functions_reporting_pdf.php | 12 +++++++++++- .../operation/reporting/reporting_viewer.php | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 3eb9b4439e..96daefcd1a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2008-07-04 Esteban Sanchez + + * operation/reporting/reporting_viewer.php: Fixed error when showing + final SLA result. + + * include/functions_reporting_pdf.php: Added final SLA result. + 2008-07-02 Esteban Sanchez * operation/agentes/estado_grupo.php: Fixed missing variable on lag diff --git a/pandora_console/include/functions_reporting_pdf.php b/pandora_console/include/functions_reporting_pdf.php index 037ee6dab7..60777fe94d 100644 --- a/pandora_console/include/functions_reporting_pdf.php +++ b/pandora_console/include/functions_reporting_pdf.php @@ -174,6 +174,7 @@ function get_pdf_report ($report) { $table->data = array (); $table->head = array (lang_string ('Info'), lang_string ('sla_result')); + $sla_failed = false; foreach ($slas as $sla) { $data = array (); @@ -187,14 +188,23 @@ function get_pdf_report ($report) { if ($sla_value === false) { $data[1] = lang_string ('unknown'); } else { - if ($sla_value < $sla['sla_limit']) + if ($sla_value < $sla['sla_limit']) { $pdf->setColor (0, 1, 0, 0); // Red + $sla_failed = true; + } $data[1] = format_numeric ($sla_value). " %"; $pdf->setColor (0, 0, 0, 1); // Black } + array_push ($table->data, $data); } $pdf->ezTable ($table->data, $table->head, "", $table_options); + + if (! $sla_failed) { + $pdf->ezText (''.lang_string ('ok').'', 8); + } else { + $pdf->ezText (''.lang_string ('fail').'', 8); + } unset ($slas); break; diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php index 98f5ad8359..8ce849ee55 100644 --- a/pandora_console/operation/reporting/reporting_viewer.php +++ b/pandora_console/operation/reporting/reporting_viewer.php @@ -221,7 +221,7 @@ foreach ($contents as $content) { } if (sizeof ($slas)) { $data = array (); - if ($sla_failed) + if (! $sla_failed) $data[0] = ''.lang_string ('Ok').''; else $data[0] = ''.lang_string ('Fail').'';