From 249e2e730d59d00b74b46e966d233f4180456cc5 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 6 May 2015 13:24:29 +0200 Subject: [PATCH] Working in the refactoring the code of reports (SLA_services). --- pandora_console/include/functions_reporting.php | 7 ++++++- .../include/functions_reporting_html.php | 16 +++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 3cffabf170..b1a9dcc3a4 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -427,7 +427,12 @@ function reporting_make_reporting_data($id_report, $date, $time, $content); break; case 'SLA_services': - + $report['contents'][] = reporting_enterprise_sla_services_refactoriced( + $report, + $content, + $type, + $force_width_chart, + $force_height_chart); break; } } diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index 81a53319e3..8840793a78 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -261,6 +261,9 @@ function reporting_html_print_report($report, $mini = false) { case 'SLA_monthly': reporting_enterprise_html_SLA_monthly($table, $item, $mini); break; + case 'SLA_services': + reporting_enterprise_html_SLA_services($table, $item, $mini); + break; } if ($item['type'] == 'agent_module') @@ -4047,19 +4050,6 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f $item_title = $content['name']; - switch ($content["type"]) { - case 'SLA_services': - if (function_exists("reporting_enterprise_sla_services")) - reporting_enterprise_sla_services($mini, $content, $report, $table, $item_title); - break; - - - - - - - - } //Restore dbconnection if (($config ['metaconsole'] == 1) && $server_name != '' && defined('METACONSOLE') && $remote_connection == 1) { metaconsole_restore_db_force();