From c477dcad2cc707dcd0a12eb45f6e28f53b15ecd3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 2 Jul 2006 12:50:05 +0000 Subject: [PATCH] Look: Ajout picto statut action sur liste des actions --- htdocs/actioncomm.class.php | 20 ++++++++++---------- htdocs/comm/action/fiche.php | 2 +- htdocs/comm/action/index.php | 18 +++++++----------- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/htdocs/actioncomm.class.php b/htdocs/actioncomm.class.php index 65d11d3ad02..115d015608d 100644 --- a/htdocs/actioncomm.class.php +++ b/htdocs/actioncomm.class.php @@ -329,37 +329,37 @@ class ActionComm if ($mode == 0) { if ($percent==0) return $langs->trans('StatusActionToDo'); - if ($percent > 0 && $percent < 100) return $langs->trans('StatusActionInProcess'); - if ($percent >= 100) return $langs->trans('StatusActionDone'); + if ($percent > 0 && $percent < 100) return $langs->trans('StatusActionInProcess').' ('.$percent.'%)'; + if ($percent >= 100) return $langs->trans('StatusActionDone').' (100%)'; } if ($mode == 1) { if ($percent==0) return $langs->trans('StatusActionToDo'); - if ($percent > 0 && $percent < 100) return $langs->trans('StatusActionInProcess'); + if ($percent > 0 && $percent < 100) return $percent.'%'; if ($percent >= 100) return $langs->trans('StatusActionDone'); } if ($mode == 2) { if ($percent==0) return img_picto($langs->trans('StatusActionToDo'),'statut1').' '.$langs->trans('StatusActionToDo'); - if ($percent > 0 && $percent < 100) return img_picto($langs->trans('StatusActionInProcess'),'statut3').' '.$langs->trans('StatusActionInProcess'); + if ($percent > 0 && $percent < 100) return img_picto($langs->trans('StatusActionInProcess'),'statut3').' '. $percent.'%'; if ($percent >= 100) return img_picto($langs->trans('StatusActionDone'),'statut6').' '.$langs->trans('StatusActionDone'); } if ($mode == 3) { if ($percent==0) return img_picto($langs->trans('StatusActionToDo'),'statut1'); - if ($percent > 0 && $percent < 100) return img_picto($langs->trans('StatusActionInProcess'),'statut3'); + if ($percent > 0 && $percent < 100) return img_picto($langs->trans('StatusActionInProcess').' ('.$percent.'%)','statut3'); if ($percent >= 100) return img_picto($langs->trans('StatusActionDone'),'statut6'); } if ($mode == 4) { - if ($percent==0) return img_picto($langs->trans('StatusActionToDo'),'statut1').' '.$langs->trans('StatusActionToDo'); - if ($percent > 0 && $percent < 100) return img_picto($langs->trans('StatusActionInProcess'),'statut3').' '.$langs->trans('StatusActionInProcess'); - if ($percent >= 100) return img_picto($langs->trans('StatusActionDone'),'statut6').' '.$langs->trans('StatusActionDone'); + if ($percent==0) return img_picto($langs->trans('StatusActionToDo'),'statut1').' '.$langs->trans('StatusActionToDo').' (0%)'; + if ($percent > 0 && $percent < 100) return img_picto($langs->trans('StatusActionInProcess'),'statut3').' '.$langs->trans('StatusActionInProcess').' ('.$percent.'%)';; + if ($percent >= 100) return img_picto($langs->trans('StatusActionDone'),'statut6').' '.$langs->trans('StatusActionDone').' (100%)'; } if ($mode == 5) { - if ($percent==0) return $langs->trans('StatusActionToDo').' '.img_picto($langs->trans('StatusActionToDo'),'statut1'); - if ($percent > 0 && $percent < 100) return $langs->trans('StatusActionInProcess').' '.img_picto($langs->trans('StatusActionInProcess'),'statut3'); + if ($percent==0) return '0% '.img_picto($langs->trans('StatusActionToDo'),'statut1'); + if ($percent > 0 && $percent < 100) return $percent.'% '.img_picto($langs->trans('StatusActionInProcess'),'statut3'); if ($percent >= 100) return $langs->trans('StatusActionDone').' '.img_picto($langs->trans('StatusActionDone'),'statut6'); } } diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 69e4daa61a8..9ab58d5b157 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -510,7 +510,7 @@ if ($_GET["id"]) // Statut print ''.$langs->trans("Status").' / '.$langs->trans("Percentage").''; print $act->getLibStatut(4); - print ' ('.$act->percent.' %)'; + print ''; // Objet lié if ($act->objet_url) diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 3ef29f9e284..9cdbe010dc3 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Éric Seigne - * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2004-2006 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,6 @@ * * $Id$ * $Source$ - * */ /** @@ -94,6 +93,8 @@ $sql .= $db->plimit( $limit + 1, $offset); $resql=$db->query($sql); if ($resql) { + $actionstatic=new ActionComm($db); + $num = $db->num_rows($resql); $title="DoneAndToDoActions"; if ($status == 'done') $title="DoneActions"; @@ -115,12 +116,12 @@ if ($resql) print ''; // print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"a.datep","&status=$status",'','colspan="4"',$sortfield); print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"a.datep","&status=$status",'','',$sortfield); - print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent","&status=$status","","",$sortfield); print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"acode","&status=$status","","",$sortfield); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","&status=$status","","",$sortfield); print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"a.fk_contact","&status=$status","","",$sortfield); print ''.$langs->trans("Comments").''; print_liste_field_titre($langs->trans("Author"),$_SERVER["PHP_SELF"],"u.code","&status=$status","","",$sortfield); + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent","&status=$status","","",$sortfield); print "\n"; $var=true; while ($i < min($num,$limit)) @@ -164,14 +165,6 @@ if ($resql) // print ''.dolibarr_print_date($obj->dp)."\n"; - // Status/Percent - if ($obj->percent < 100) { - print "".$obj->percent."%"; - } - else { - print "".$langs->trans("Done").""; - } - // Action print ''.img_object($langs->trans("ShowTask"),"task").' '; $transcode=$langs->trans("Action".$obj->acode); @@ -206,6 +199,9 @@ if ($resql) // Auteur print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->code.''; + // Status/Percent + print ''.$actionstatic->LibStatut($obj->percent,5).''; + print "\n"; $i++; }