From a365a139ea9779788c8fa4ceda70bb8ac4daff07 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Jun 2011 17:04:10 +0000 Subject: [PATCH] Uniformize view of graphics --- htdocs/commande/class/commande.class.php | 12 ++++---- htdocs/commande/index.php | 37 +++++++++++++++--------- htdocs/contrat/index.php | 17 ++++++----- 3 files changed, 40 insertions(+), 26 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 240d094c171..63ad1edcae8 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -2425,7 +2425,7 @@ class Commande extends CommonObject if ($statut==-1) return $langs->trans('StatusOrderCanceled'); if ($statut==0) return $langs->trans('StatusOrderDraft'); if ($statut==1) return $langs->trans('StatusOrderValidated'); - if ($statut==2) return $langs->trans('StatusOrderOnProcess'); + if ($statut==2) return $langs->trans('StatusOrderSentShort'); if ($statut==3 && ! $facturee) return $langs->trans('StatusOrderToBill'); if ($statut==3 && $facturee) return $langs->trans('StatusOrderProcessed'); } @@ -2434,7 +2434,7 @@ class Commande extends CommonObject if ($statut==-1) return $langs->trans('StatusOrderCanceledShort'); if ($statut==0) return $langs->trans('StatusOrderDraftShort'); if ($statut==1) return $langs->trans('StatusOrderValidatedShort'); - if ($statut==2) return $langs->trans('StatusOrderOnProcessShort'); + if ($statut==2) return $langs->trans('StatusOrderSentShort'); if ($statut==3 && ! $facturee) return $langs->trans('StatusOrderToBillShort'); if ($statut==3 && $facturee) return $langs->trans('StatusOrderProcessed'); } @@ -2443,7 +2443,7 @@ class Commande extends CommonObject if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceledShort'),'statut5').' '.$langs->trans('StatusOrderCanceled'); if ($statut==0) return img_picto($langs->trans('StatusOrderDraftShort'),'statut0').' '.$langs->trans('StatusOrderDraft'); if ($statut==1) return img_picto($langs->trans('StatusOrderValidatedShort'),'statut1').' '.$langs->trans('StatusOrderValidated'); - if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcessShort'),'statut3').' '.$langs->trans('StatusOrderOnProcess'); + if ($statut==2) return img_picto($langs->trans('StatusOrderSentShort'),'statut3').' '.$langs->trans('StatusOrderSentShort'); if ($statut==3 && ! $facturee) return img_picto($langs->trans('StatusOrderToBillShort'),'statut7').' '.$langs->trans('StatusOrderToBill'); if ($statut==3 && $facturee) return img_picto($langs->trans('StatusOrderProcessedShort'),'statut6').' '.$langs->trans('StatusOrderProcessed'); } @@ -2452,7 +2452,7 @@ class Commande extends CommonObject if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5'); if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0'); if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1'); - if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3'); + if ($statut==2) return img_picto($langs->trans('StatusOrderSentShort'),'statut3'); if ($statut==3 && ! $facturee) return img_picto($langs->trans('StatusOrderToBill'),'statut7'); if ($statut==3 && $facturee) return img_picto($langs->trans('StatusOrderProcessed'),'statut6'); } @@ -2461,7 +2461,7 @@ class Commande extends CommonObject if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceled'); if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft'); if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidated'); - if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3').' '.$langs->trans('StatusOrderOnProcess'); + if ($statut==2) return img_picto($langs->trans('StatusOrderSentShort'),'statut3').' '.$langs->trans('StatusOrderSentShort'); if ($statut==3 && ! $facturee) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBill'); if ($statut==3 && $facturee) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessed'); } @@ -2470,7 +2470,7 @@ class Commande extends CommonObject if ($statut==-1) return $langs->trans('StatusOrderCanceledShort').' '.img_picto($langs->trans('StatusOrderCanceledShort'),'statut5'); if ($statut==0) return $langs->trans('StatusOrderDraftShort').' '.img_picto($langs->trans('StatusOrderDraftShort'),'statut0'); if ($statut==1) return $langs->trans('StatusOrderValidatedShort').' '.img_picto($langs->trans('StatusOrderValidatedShort'),'statut1'); - if ($statut==2) return $langs->trans('StatusOrderOnProcessShort').' '.img_picto($langs->trans('StatusOrderOnProcessShort'),'statut3'); + if ($statut==2) return $langs->trans('StatusOrderSentShort').' '.img_picto($langs->trans('StatusOrderSentShort'),'statut3'); if ($statut==3 && ! $facturee) return $langs->trans('StatusOrderToBillShort').' '.img_picto($langs->trans('StatusOrderToBillShort'),'statut7'); if ($statut==3 && $facturee) return $langs->trans('StatusOrderProcessedShort').' '.img_picto($langs->trans('StatusOrderProcessedShort'),'statut6'); } diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index e2b5ea21cc0..be576d20a8a 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -100,7 +100,8 @@ if ($resql) $totalinprocess=0; $dataseries=array(); $vals=array(); - // -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not) + $bool=false; + // -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not) while ($i < $num) { $row = $db->fetch_row($resql); @@ -108,7 +109,8 @@ if ($resql) { //if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1)) { - $vals[$row[1]]=$row[0]; + $bool=$row[2]?true:false; + $vals[$row[1].$bool]+=$row[0]; $totalinprocess+=$row[0]; } $total+=$row[0]; @@ -116,22 +118,14 @@ if ($resql) $i++; } $db->free($resql); - print ''; print ''."\n"; $var=true; - $listofstatus=array(0,1,3,3,-1); $bool=false; + $listofstatus=array(0,1,2,3,3,-1); + $bool=false; foreach ($listofstatus as $status) { - $dataseries[]=array('label'=>$commandestatic->LibStatut($status,$bool,0),'values'=>array(0=>(isset($vals[$status])?$vals[$status]:0))); - if (! $conf->use_javascript_ajax) - { - $var=!$var; - print ""; - print ''; - print ''; - print "\n"; - } + $dataseries[]=array('label'=>$commandestatic->LibStatut($status,$bool,0),'values'=>array(0=>(isset($vals[$status.$bool])?$vals[$status.$bool]:0))); if ($status==3 && $bool==false) $bool=true; else $bool=false; } @@ -142,6 +136,23 @@ if ($resql) dol_print_graph('stats',300,180,$data,1,'pie'); print ''; } + $bool=false; + foreach ($listofstatus as $status) + { + if (! $conf->use_javascript_ajax) + { + $var=!$var; + print ""; + print ''; + print ''; + print "\n"; + if ($status==3 && $bool==false) $bool=true; + else $bool=false; + } + } //if ($totalinprocess != $total) //print ''; print ''; diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 352f16b46f4..326f5374a5e 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -197,13 +197,16 @@ $var=true; $listofstatus=array(0,4,4,5); $bool=false; foreach($listofstatus as $status) { - $var=!$var; - print ""; - print ''; - print ''; - if ($status==4 && $bool==false) $bool=true; - else $bool=false; - print "\n"; + if (! $conf->use_javascript_ajax) + { + $var=!$var; + print ""; + print ''; + print ''; + if ($status==4 && $bool==false) $bool=true; + else $bool=false; + print "\n"; + } } //if ($totalinprocess != $total) //print '';
'.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").'
'.$commandestatic->LibStatut($status,$bool,0).''.(isset($vals[$status])?$vals[$status]:0).'
'.$commandestatic->LibStatut($status,$bool,0).''.(isset($vals[$status.$bool])?$vals[$status.$bool]:0).' '; + print $commandestatic->LibStatut($status,$bool,3); + print ''; + print '
'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')'.$totalinprocess.'
'.$langs->trans("Total").''.$total.'
'.$staticcontratligne->LibStatut($status,0,($bool?1:0)).''.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status,3,($bool?1:0)).'
'.$staticcontratligne->LibStatut($status,0,($bool?1:0)).''.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status,3,($bool?1:0)).'
'.$langs->trans("Total").' ('.$langs->trans("ServicesRunning").')'.$totalinprocess.'