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

Merge branch 'ent-6463-Bug-visual-en-item-SQL-vertical-bar-graph-PDF' into 'develop' 

fixed sql grph

See merge request artica/pandorafms!3525
This commit is contained in:
Daniel Rodriguez 2020-10-14 11:17:05 +02:00
parent 5b1d29e4cb 510a96af8f
commit be011424ff
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pandora_console/images/image_problem_area_150.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

9
pandora_console/include/functions_graph.php
View File

@ -3935,7 +3935,7 @@ function graph_custom_sql_graph(
$options['generals']['pdf']['width'] = $width; $options['generals']['pdf']['width'] = $width;
$options['generals']['pdf']['height'] = $height; $options['generals']['pdf']['height'] = $height;
$output .= '<img style="margin-left:20px;" src="data:image/jpg;base64,'; $output .= '<img src="data:image/jpg;base64,';
$output .= vbar_graph($data, $options, $ttl); $output .= vbar_graph($data, $options, $ttl);
$output .= '" />'; $output .= '" />';
} else { } else {
@ -5112,13 +5112,10 @@ function graph_nodata_image(
$percent=false, $percent=false,
$base64=false $base64=false
) { ) {
global $config;
if ($base64 === true) { if ($base64 === true) {
$dataImg = file_get_contents( $dataImg = file_get_contents(
html_print_image( $config['homedir'].'/images/image_problem_area_150.png'
'images/image_problem_area.png',
false,
['style' => 'width:150px;']
)
); );
return base64_encode($dataImg); return base64_encode($dataImg);
} }

2
pandora_console/include/functions_reporting.php
View File

@ -8608,7 +8608,7 @@ function reporting_set_conf_charts(
$ttl = 2; $ttl = 2;
$only_image = true; $only_image = true;
$height = isset($content['style']['dyn_height']) ? $content['style']['dyn_height'] : 230; $height = isset($content['style']['dyn_height']) ? $content['style']['dyn_height'] : 230;
$width = 780; $width = 650;
break; break;
case 'data': case 'data':

9
pandora_console/include/graphs/fgraph.php
View File

@ -535,7 +535,14 @@ function vbar_graph(
]; ];
if (empty($params['data']) === true) { if (empty($params['data']) === true) {
return graph_nodata_image(0, 0, 'vbar', '', true); return graph_nodata_image(
0,
0,
'vbar',
'',
true,
($ttl === 2) ? true : false
);
} }
if ((int) $ttl === 2) { if ((int) $ttl === 2) {