lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Graph js librairie can accept percents with pie.

Browse Source
This commit is contained in:
Laurent Destailleur 2011-06-06 22:23:24 +00:00
parent 66df4de8be
commit a3755324c0
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/index.php
View File

@ -183,7 +183,7 @@ if ($conf->use_javascript_ajax)
$dataseries[]=array('label'=>$langs->trans("MembersStatusResiliated"),'values'=>array(round($SommeD))); $dataseries[]=array('label'=>$langs->trans("MembersStatusResiliated"),'values'=>array(round($SommeD)));
$dataseries[]=array('label'=>$langs->trans("MembersStatusToValid"),'values'=>array(round($SommeA))); $dataseries[]=array('label'=>$langs->trans("MembersStatusToValid"),'values'=>array(round($SommeA)));
$data=array('series'=>$dataseries); $data=array('series'=>$dataseries);
dol_print_graph('stats',300,180,$data,1,'pie'); dol_print_graph('stats',300,180,$data,1,'pie',1);
print '</td></tr>'; print '</td></tr>';
print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td align="right">'; print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td align="right">';
print $SommeA+$SommeB+$SommeC+$SommeD; print $SommeA+$SommeB+$SommeC+$SommeD;

2
htdocs/comm/propal/index.php
View File

@ -137,7 +137,7 @@ if ($resql)
{ {
print '<tr><td align="center" colspan="2">'; print '<tr><td align="center" colspan="2">';
$data=array('series'=>$dataseries); $data=array('series'=>$dataseries);
dol_print_graph('stats',300,180,$data,1,'pie'); dol_print_graph('stats',300,180,$data,1,'pie',1);
print '</td></tr>'; print '</td></tr>';
} }
//if ($totalinprocess != $total) //if ($totalinprocess != $total)

2
htdocs/commande/index.php
View File

@ -133,7 +133,7 @@ if ($resql)
{ {
print '<tr><td align="center" colspan="2">'; print '<tr><td align="center" colspan="2">';
$data=array('series'=>$dataseries); $data=array('series'=>$dataseries);
dol_print_graph('stats',300,180,$data,1,'pie'); dol_print_graph('stats',300,180,$data,1,'pie',1);
print '</td></tr>'; print '</td></tr>';
} }
$bool=false; $bool=false;

2
htdocs/contrat/index.php
View File

@ -190,7 +190,7 @@ if ($conf->use_javascript_ajax)
{ {
print '<tr><td align="center" colspan="2">'; print '<tr><td align="center" colspan="2">';
$data=array('series'=>$dataseries); $data=array('series'=>$dataseries);
dol_print_graph('stats',300,180,$data,1,'pie'); dol_print_graph('stats',300,180,$data,1,'pie',1);
print '</td></tr>'; print '</td></tr>';
} }
$var=true; $var=true;

2
htdocs/fourn/commande/index.php
View File

@ -134,7 +134,7 @@ if ($resql)
{ {
print '<tr><td align="center" colspan="2">'; print '<tr><td align="center" colspan="2">';
$data=array('series'=>$dataseries); $data=array('series'=>$dataseries);
dol_print_graph('stats',300,180,$data,1,'pie'); dol_print_graph('stats',300,180,$data,1,'pie',1);
print '</td></tr>'; print '</td></tr>';
} }
//if ($totalinprocess != $total) //if ($totalinprocess != $total)

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

@ -1236,9 +1236,10 @@ function dolibarr_trunc($string,$size=40,$trunc='right',$stringencoding='')
* @param height Height in pixel * @param height Height in pixel
* @param data Data array * @param data Data array
* @param showlegend Show legend * @param showlegend Show legend
* @param type Type of graph (pie, bar, line) * @param type Type of graph ('pie', 'barline')
* @param showpercent Show percent (with type='pie' only)
*/ */
function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie') function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',$showpercent=0)
{ {
global $conf,$langs; global $conf,$langs;
global $theme_datacolor; // To have var kept when function is called several times global $theme_datacolor; // To have var kept when function is called several times
@ -1301,7 +1302,7 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie')
var percent=Math.round(series.percent); var percent=Math.round(series.percent);
var number=series.data[0][1]; var number=series.data[0][1];
return \'<div style="font-size:8pt;text-align:center;padding:2px;color:white;">\'+'.($showlegend?'number':'label+\'<br/>\'+number'); return \'<div style="font-size:8pt;text-align:center;padding:2px;color:white;">\'+'.($showlegend?'number':'label+\'<br/>\'+number');
if (! empty($showpercent)) print '+\'<br/>\'+percent'; if (! empty($showpercent)) print '+\'<br/>\'+percent+\'%\'';
print '+\'</div>\'; print '+\'</div>\';
}, },
background: { background: {

2
htdocs/societe/index.php
View File

@ -108,7 +108,7 @@ if ($conf->use_javascript_ajax && ((round($third['prospect'])?1:0)+(round($third
if ($conf->societe->enabled && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Customers"),'values'=>array(round($third['customer']))); if ($conf->societe->enabled && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Customers"),'values'=>array(round($third['customer'])));
if ($conf->fournisseur->enabled && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Suppliers"),'values'=>array(round($third['supplier']))); if ($conf->fournisseur->enabled && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Suppliers"),'values'=>array(round($third['supplier'])));
$data=array('series'=>$dataseries); $data=array('series'=>$dataseries);
dol_print_graph('stats',300,180,$data,1,'pie'); dol_print_graph('stats',300,180,$data,1,'pie',0);
print '</td></tr>'; print '</td></tr>';
} }
else else