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

Qual: Truncation is longuer

Browse Source
This commit is contained in:
Laurent Destailleur 2011-06-01 08:24:26 +00:00
parent 9e0e6e13df
commit 531b0da990
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/comm/action/class/actioncomm.class.php
View File

@ -519,7 +519,7 @@ class ActionComm extends CommonObject
/** /**
* Return label of action status * Return label of action status
* @param percent Percent * @param percent Percent
* @param mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @param mode 0=Long label, 1=Short label, 2=Picto+Short label, 3=Picto, 4=Picto+Short label, 5=Short label+Picto, 6=Very short label+Picto
* @param hidenastatus 1=Show nothing if status is "Not applicable" * @param hidenastatus 1=Show nothing if status is "Not applicable"
* @return string Label * @return string Label
*/ */
@ -566,9 +566,16 @@ class ActionComm extends CommonObject
{ {
if ($percent==-1 && ! $hidenastatus) return img_picto($langs->trans('StatusNotApplicable'),'statut9'); if ($percent==-1 && ! $hidenastatus) return img_picto($langs->trans('StatusNotApplicable'),'statut9');
if ($percent==0) return '0% '.img_picto($langs->trans('StatusActionToDo'),'statut1'); 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 > 0 && $percent < 100) return $percent.'% '.img_picto($langs->trans('StatusActionInProcess').' - '.$percent.'%','statut3');
if ($percent >= 100) return $langs->trans('StatusActionDone').' '.img_picto($langs->trans('StatusActionDone'),'statut6'); if ($percent >= 100) return $langs->trans('StatusActionDone').' '.img_picto($langs->trans('StatusActionDone'),'statut6');
} }
if ($mode == 6)
{
if ($percent==-1 && ! $hidenastatus) return img_picto($langs->trans('StatusNotApplicable'),'statut9');
if ($percent==0) return '0% '.img_picto($langs->trans('StatusActionToDo'),'statut1');
if ($percent > 0 && $percent < 100) return $percent.'% '.img_picto($langs->trans('StatusActionInProcess').' - '.$percent.'%','statut3');
if ($percent >= 100) return img_picto($langs->trans('StatusActionDone'),'statut6');
}
return ''; return '';
} }

8
htdocs/comm/action/listactions.php
View File

@ -243,7 +243,7 @@ if ($resql)
$actionstatic->id=$obj->id; $actionstatic->id=$obj->id;
$actionstatic->type_code=$obj->acode; $actionstatic->type_code=$obj->acode;
$actionstatic->libelle=$obj->label; $actionstatic->libelle=$obj->label;
print $actionstatic->getNomUrl(1,20); print $actionstatic->getNomUrl(1,28);
print '</td>'; print '</td>';
// Titre // Titre
@ -272,7 +272,7 @@ if ($resql)
$societestatic->id=$obj->socid; $societestatic->id=$obj->socid;
$societestatic->client=$obj->client; $societestatic->client=$obj->client;
$societestatic->nom=$obj->societe; $societestatic->nom=$obj->societe;
print $societestatic->getNomUrl(1,'',6); print $societestatic->getNomUrl(1,'',10);
} }
else print '&nbsp;'; else print '&nbsp;';
print '</td>'; print '</td>';
@ -284,7 +284,7 @@ if ($resql)
$contactstatic->name=$obj->name; $contactstatic->name=$obj->name;
$contactstatic->firstname=$obj->firstname; $contactstatic->firstname=$obj->firstname;
$contactstatic->id=$obj->fk_contact; $contactstatic->id=$obj->fk_contact;
print $contactstatic->getNomUrl(1,'',6); print $contactstatic->getNomUrl(1,'',10);
} }
else else
{ {
@ -329,7 +329,7 @@ if ($resql)
print '</td>'; print '</td>';
// Status/Percent // Status/Percent
print '<td align="right" nowrap="nowrap">'.$actionstatic->LibStatut($obj->percent,5).'</td>'; print '<td align="right" nowrap="nowrap">'.$actionstatic->LibStatut($obj->percent,6).'</td>';
print "</tr>\n"; print "</tr>\n";
$i++; $i++;