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

Merge branch '417-Labels-de-las-gráficas-en-Informes-PDF-se-ven-muy-pequeños-fix' into 'develop' 

Fix PDF reports labels - #417

See merge request artica/pandorafms!1023
This commit is contained in:
vgilc 2017-11-06 17:29:44 +01:00
parent b0638cf996 b6d3444212
commit 1001b78ec2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,12 +192,12 @@ function vbar_graph($flash_chart, $chart_data, $width, $height,
} }
else { else {
foreach ($chart_data as $key => $value) { foreach ($chart_data as $key => $value) {
if(strlen($key) > 25){ if(strlen($key) > 20){
if(strpos($key, ' - ') != -1){ if(strpos($key, ' - ') != -1){
$key_temp = explode(" - ",$key); $key_temp = explode(" - ",$key);
$key_temp[0] = $key_temp[0]." \n"; $key_temp[0] = $key_temp[0]." \n";
$key_temp[1]= '...'.substr($key_temp[1],-15); $key_temp[1]= '...'.substr($key_temp[1],-10);
$key2 = $key_temp[0].$key_temp[1]; $key2 = $key_temp[0].$key_temp[1];
io_safe_output($key2); io_safe_output($key2);
} }

2
pandora_console/include/graphs/functions_pchart.php
View File

@ -737,7 +737,7 @@ function pch_bar_graph ($graph_type, $index, $data, $width, $height, $font,
$margin_left = 40+50; $margin_left = 40+50;
$margin_right = 90; $margin_right = 90;
$margin_top = 10; $margin_top = 10;
$margin_bottom = (3 * $max_chars)+40; $margin_bottom = (3 * $max_chars)+80;
break; break;
case "hbar": case "hbar":
$scaleSettings = array("GridR"=>1000,"GridG"=>1000,"GridB"=>1000,"DrawSubTicks"=>TRUE, $scaleSettings = array("GridR"=>1000,"GridG"=>1000,"GridB"=>1000,"DrawSubTicks"=>TRUE,