From d7fa157d074e3bf8de3e9ec276b353abaadf5c2c Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Thu, 11 Aug 2011 17:09:21 +0000 Subject: [PATCH] 2011-08-11 Sergio Martin * include/functions_graph.php operation/incidents/incident_statistics.php: Fixed flash graphs into incidents statistics and added the group All to the Pie by groups into incident statistics git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4721 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/include/functions_graph.php | 11 ++++++++++- .../operation/incidents/incident_statistics.php | 2 ++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2bcdabd6f2..0db6ec792b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2011-08-11 Sergio Martin + + * include/functions_graph.php + operation/incidents/incident_statistics.php: Fixed flash graphs + into incidents statistics and added the group All to the Pie + by groups into incident statistics + 2011-08-11 Juan Manuel Ramon * pandoradb.data.oracle.sql: Removed tskin data from this script. diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 93ce7298d8..331cf60b0c 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -1092,6 +1092,12 @@ function graphic_incident_group () { $max_items); $incidents = db_get_all_rows_sql ($sql); + $sql = sprintf ('SELECT COUNT(id_incidencia) n_incidents + FROM tincidencia + WHERE tincidencia.id_grupo = 0'); + + $incidents_all = db_get_value_sql($sql); + if($incidents == false) { $incidents = array(); } @@ -1099,6 +1105,10 @@ function graphic_incident_group () { $data[$incident['nombre']] = $incident['n_incidents']; } + if($incidents_all > 0) { + $data[__('All')] = $incidents_all; + } + return pie3d_graph($config['flash_charts'], $data, 320, 200, __('Other'), '', $config['homedir'] . "/images/logo_vertical_water.png", $config['fontpath'], $config['font_size']); @@ -1358,7 +1368,6 @@ function graph_custom_sql_graph ($id, $width, $height, $type = 'sql_graph_vbar', $count = 0; foreach ($data_result as $data_item) { - html_debug_print($data_item); $count++; switch ($type) { case 'sql_graph_vbar': // vertical bar diff --git a/pandora_console/operation/incidents/incident_statistics.php b/pandora_console/operation/incidents/incident_statistics.php index 985b345374..d9e6fffa31 100755 --- a/pandora_console/operation/incidents/incident_statistics.php +++ b/pandora_console/operation/incidents/incident_statistics.php @@ -26,6 +26,8 @@ if (! check_acl ($config['id_user'], 0, "IR") == 1) { require ("general/noaccess.php"); exit; } +include_flash_chart_script(); + ui_print_page_header (__('Statistics'), "images/book_edit.png", false, "", false, ""); echo '