diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 98cd8deac0b..f5b3083f5e7 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -154,25 +154,27 @@ if ($conf->use_javascript_ajax) $SommeD=0; $dataval=array(); $datalabels=array(); + $i=0; foreach ($AdherentType as $key => $adhtype) { - $datalabels[]=$adhtype->getNomUrl(0,dol_size(16)); - $dataval['draft'][]=isset($MemberToValidate[$key])?$MemberToValidate[$key]:0; - $dataval['notuptodate'][]=isset($MembersValidated[$key])?$MembersValidated[$key]-$MemberUpToDate[$key]:0; - $dataval['uptodate'][]=isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0; - $dataval['resiliated'][]=isset($MembersResiliated[$key])?$MembersResiliated[$key]:0; + $datalabels[]=array($i,$adhtype->getNomUrl(0,dol_size(16))); + $dataval['draft'][]=array($i,isset($MemberToValidate[$key])?$MemberToValidate[$key]:0); + $dataval['notuptodate'][]=array($i,isset($MembersValidated[$key])?$MembersValidated[$key]-$MemberUpToDate[$key]:0); + $dataval['uptodate'][]=array($i,isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0); + $dataval['resiliated'][]=array($i,isset($MembersResiliated[$key])?$MembersResiliated[$key]:0); $SommeA+=isset($MemberToValidate[$key])?$MemberToValidate[$key]:0; $SommeB+=isset($MembersValidated[$key])?$MembersValidated[$key]-$MemberUpToDate[$key]:0; $SommeC+=isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0; $SommeD+=isset($MembersResiliated[$key])?$MembersResiliated[$key]:0; + $i++; } /* $dataseries=array(); - $dataseries[]=array('label'=>$langs->trans("MembersStatusToValid"),'values'=> $dataval['draft']); - $dataseries[]=array('label'=>$langs->trans("MenuMembersNotUpToDate"),'values'=> $dataval['notuptodate']); - $dataseries[]=array('label'=>$langs->trans("MenuMembersUpToDate"),'values'=> $dataval['uptodate']); - $dataseries[]=array('label'=>$langs->trans("MembersStatusResiliated"),'values'=> $dataval['resiliated']); + $dataseries[]=array('label'=>$langs->trans("MembersStatusToValid"),'data'=> $dataval['draft']); + $dataseries[]=array('label'=>$langs->trans("MenuMembersNotUpToDate"),'data'=> $dataval['notuptodate']); + $dataseries[]=array('label'=>$langs->trans("MenuMembersUpToDate"),'data'=> $dataval['uptodate']); + $dataseries[]=array('label'=>$langs->trans("MembersStatusResiliated"),'data'=> $dataval['resiliated']); $data=array('series'=>$dataseries,'seriestype'=>array('bar','bar','bar','bar'),'xlabel'=>$datalabels); dol_print_graph('stats2',300,180,$data,1,'barline'); */ diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 5570fc2d963..eafd2c9cb22 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1602,56 +1602,32 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie', // 'seriestype'=>array('bar','line',...), // 'seriescolor'=>array(0=>'#999999',1=>'#999999',...) // 'xlabel'=>array(0=>labelx1,1=>labelx2,...)); - // serieX is array('label'=>'label', values=>array(0=>y1,1=>y2,...)) with same nb of value than into xlabel + // serieX is array('label'=>'label', data=>array(0=>y1,1=>y2,...)) with same nb of value than into xlabel print '