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:
commit
be011424ff
Binary file not shown.
After Width: | Height: | Size: 14 KiB |
|
@ -3935,7 +3935,7 @@ function graph_custom_sql_graph(
|
|||
$options['generals']['pdf']['width'] = $width;
|
||||
$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 .= '" />';
|
||||
} else {
|
||||
|
@ -5112,13 +5112,10 @@ function graph_nodata_image(
|
|||
$percent=false,
|
||||
$base64=false
|
||||
) {
|
||||
global $config;
|
||||
if ($base64 === true) {
|
||||
$dataImg = file_get_contents(
|
||||
html_print_image(
|
||||
'images/image_problem_area.png',
|
||||
false,
|
||||
['style' => 'width:150px;']
|
||||
)
|
||||
$config['homedir'].'/images/image_problem_area_150.png'
|
||||
);
|
||||
return base64_encode($dataImg);
|
||||
}
|
||||
|
|
|
@ -8608,7 +8608,7 @@ function reporting_set_conf_charts(
|
|||
$ttl = 2;
|
||||
$only_image = true;
|
||||
$height = isset($content['style']['dyn_height']) ? $content['style']['dyn_height'] : 230;
|
||||
$width = 780;
|
||||
$width = 650;
|
||||
break;
|
||||
|
||||
case 'data':
|
||||
|
|
|
@ -535,7 +535,14 @@ function vbar_graph(
|
|||
];
|
||||
|
||||
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) {
|
||||
|
|
Loading…
Reference in New Issue