Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support stack bars for flot graphs

Browse Source
This commit is contained in:
Laurent Destailleur
2011-05-21 14:24:43 +00:00
parent 106a956889
commit 29dc82f97f
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/lib/functions.lib.php
View File

@@ -1240,6 +1240,7 @@ function dolibarr_trunc($string,$size=40,$trunc='right',$stringencoding='')
function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie')
{
global $conf,$langs;
global $theme_datacolor; // To have var kept when function is called several times
if (empty($conf->use_javascript_ajax)) return;
$jsgraphlib='flot';
$datacolor=array();
@@ -1285,7 +1286,8 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie')
function plotWithOptions() {
jQuery.plot(jQuery("#'.$htmlid.'"), data,
{
series: {pie: {
series: {
pie: {
show: true,
radius: 3/4,
label: {
@@ -1300,10 +1302,16 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie')
},
background: {
opacity: 0.5,
color: \'#000\'
color: \'#000000\'
}
}
} },
zoom: {
interactive: true
},
pan: {
interactive: true
},
';
if (sizeof($datacolor))
{
@@ -1317,7 +1325,7 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie')
}
print '], ';
}
print 'legend: {show: '.($showlegend?'true':'false').'}
print 'legend: {show: '.($showlegend?'true':'false').', position: \'ne\' }
});
}
plotWithOptions();
@@ -1366,7 +1374,14 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie')
series: {
stack: stack,
lines: { show: lines, fill: true, steps: steps },
bars: { show: bars, barWidth: 0.9, align: \'center\' }
bars: { show: bars, barWidth: 0.9, align: \'center\' },
shadowSize: 5
},
zoom: {
interactive: true
},
pan: {
interactive: true
},
';
if (sizeof($datacolor))