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

2011-08-11 Sergio Martin <sergio.martin@artica.es> 

* 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
This commit is contained in:
zarzuelo 2011-08-11 17:09:21 +00:00
parent bf4ce9106b
commit d7fa157d07
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2011-08-11 Sergio Martin <sergio.martin@artica.es>
* 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 <juanmanuel.ramon@artica.es> 2011-08-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* pandoradb.data.oracle.sql: Removed tskin data from this script. * pandoradb.data.oracle.sql: Removed tskin data from this script.

11
pandora_console/include/functions_graph.php
View File

@ -1092,6 +1092,12 @@ function graphic_incident_group () {
$max_items); $max_items);
$incidents = db_get_all_rows_sql ($sql); $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) { if($incidents == false) {
$incidents = array(); $incidents = array();
} }
@ -1099,6 +1105,10 @@ function graphic_incident_group () {
$data[$incident['nombre']] = $incident['n_incidents']; $data[$incident['nombre']] = $incident['n_incidents'];
} }
if($incidents_all > 0) {
$data[__('All')] = $incidents_all;
}
return pie3d_graph($config['flash_charts'], $data, 320, 200, return pie3d_graph($config['flash_charts'], $data, 320, 200,
__('Other'), '', $config['homedir'] . "/images/logo_vertical_water.png", __('Other'), '', $config['homedir'] . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size']); $config['fontpath'], $config['font_size']);
@ -1358,7 +1368,6 @@ function graph_custom_sql_graph ($id, $width, $height, $type = 'sql_graph_vbar',
$count = 0; $count = 0;
foreach ($data_result as $data_item) { foreach ($data_result as $data_item) {
html_debug_print($data_item);
$count++; $count++;
switch ($type) { switch ($type) {
case 'sql_graph_vbar': // vertical bar case 'sql_graph_vbar': // vertical bar

2
pandora_console/operation/incidents/incident_statistics.php
View File

@ -26,6 +26,8 @@ if (! check_acl ($config['id_user'], 0, "IR") == 1) {
require ("general/noaccess.php"); require ("general/noaccess.php");
exit; exit;
} }
include_flash_chart_script();
ui_print_page_header (__('Statistics'), "images/book_edit.png", false, "", false, ""); ui_print_page_header (__('Statistics'), "images/book_edit.png", false, "", false, "");
echo '<table width="90%"> echo '<table width="90%">