tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-13356-sql-vertical-graph-en-pdf-se-corta-valor-del-porcentaje-de-la-top-bar' into 'develop'

Browse Source 
Ent 13356 sql vertical graph en pdf se corta valor del porcentaje de la top bar

See merge request artica/pandorafms!7262
This commit is contained in:
Jose Martin 2024-04-25 06:33:38 +00:00
commit b30db22736
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/functions_graph.php
View File

@ -3308,7 +3308,8 @@ function graph_custom_sql_graph(
$only_image=false, $only_image=false,
$homeurl='', $homeurl='',
$ttl=1, $ttl=1,
$max_num_elements=8 $max_num_elements=8,
$layout=false
) { ) {
global $config; global $config;
@ -3509,6 +3510,10 @@ function graph_custom_sql_graph(
if ((int) $ttl === 2) { if ((int) $ttl === 2) {
$options['dataLabel'] = ['display' => 'auto']; $options['dataLabel'] = ['display' => 'auto'];
if ($layout !== false && is_array($layout) === true) {
$options['layout'] = $layout;
}
} }
$output .= vbar_graph( $output .= vbar_graph(

5
pandora_console/include/functions_reporting.php
View File

@ -6686,6 +6686,7 @@ function reporting_sql_graph(
$type_sql_graph $type_sql_graph
) { ) {
global $config; global $config;
$layout = false;
switch ($type_sql_graph) { switch ($type_sql_graph) {
case 'sql_graph_hbar': case 'sql_graph_hbar':
@ -6694,6 +6695,7 @@ function reporting_sql_graph(
break; break;
case 'sql_graph_vbar': case 'sql_graph_vbar':
$layout = ['padding' => ['top' => '40']];
$return['type'] = 'sql_graph_vbar'; $return['type'] = 'sql_graph_vbar';
break; break;
@ -6768,7 +6770,8 @@ function reporting_sql_graph(
$only_image, $only_image,
ui_get_full_url(false, false, false, false), ui_get_full_url(false, false, false, false),
$ttl, $ttl,
$content['top_n_value'] $content['top_n_value'],
$layout
); );
break; break;