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

Merge branch '2573-Graficas_no_se_muestran_bien_Consola_visual' into 'develop' 

fixed error in visual console width and heigth custom graph

See merge request artica/pandorafms!1662
This commit is contained in:
vgilc 2018-08-03 13:07:31 +02:00
parent ab3998e097 4bab741454
commit f8eb5d5d00
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pandora_console/include/functions_graph.php
View File

@ -1501,7 +1501,6 @@ function graphic_combined_module (
//XXX arreglar estas //XXX arreglar estas
$long_index = ''; $long_index = '';
switch ($params_combined['stacked']) { switch ($params_combined['stacked']) {
default: default:
case CUSTOM_GRAPH_STACKED_LINE: case CUSTOM_GRAPH_STACKED_LINE:
@ -1734,6 +1733,8 @@ function graphic_combined_module (
break; break;
case CUSTOM_GRAPH_BULLET_CHART_THRESHOLD: case CUSTOM_GRAPH_BULLET_CHART_THRESHOLD:
case CUSTOM_GRAPH_BULLET_CHART: case CUSTOM_GRAPH_BULLET_CHART:
$number_elements = count($module_list);
if($params_combined['stacked'] == CUSTOM_GRAPH_BULLET_CHART_THRESHOLD){ if($params_combined['stacked'] == CUSTOM_GRAPH_BULLET_CHART_THRESHOLD){
$acumulador = 0; $acumulador = 0;
foreach ($module_list as $module_item) { foreach ($module_list as $module_item) {
@ -1823,8 +1824,13 @@ function graphic_combined_module (
$graph_values = $temp; $graph_values = $temp;
$width = 1024; if(!$params['vconsole']){
$height = 50; $width = 1024;
$height = 50;
}
else{
$height = $height/$number_elements;
}
$color = color_graph_array(); $color = color_graph_array();
@ -1851,6 +1857,7 @@ function graphic_combined_module (
case CUSTOM_GRAPH_GAUGE: case CUSTOM_GRAPH_GAUGE:
$i = 0; $i = 0;
$number_elements = count($module_list);
foreach ($module_list as $module_item) { foreach ($module_list as $module_item) {
$automatic_custom_graph_meta = false; $automatic_custom_graph_meta = false;
if ($config['metaconsole']) { if ($config['metaconsole']) {
@ -1918,8 +1925,14 @@ function graphic_combined_module (
$color = color_graph_array(); $color = color_graph_array();
$width = 200; if(!$params['vconsole']){
$height = 200; $width = 200;
$height = 200;
}
else{
$width = $width/$number_elements;
$height = $height/$number_elements;
}
$output = stacked_gauge( $output = stacked_gauge(
$graph_values, $graph_values,
@ -1988,8 +2001,11 @@ function graphic_combined_module (
$graph_values = $temp; $graph_values = $temp;
$width = 1024; if(!$params['vconsole']){
$height = 500; $width = 1024;
$height = 500;
}
$flash_charts = true; $flash_charts = true;
if($params_combined['stacked'] == CUSTOM_GRAPH_HBARS){ if($params_combined['stacked'] == CUSTOM_GRAPH_HBARS){
@ -2102,8 +2118,11 @@ function graphic_combined_module (
$graph_values = $temp; $graph_values = $temp;
$width = 1024;
$height = 500; if(!$params['vconsole']){
$width = 1024;
$height = 500;
}
$color = color_graph_array(); $color = color_graph_array();