vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed task status badge. Refactored LibStatut.

Browse source
This commit is contained in:
William Mead 2025-01-21 10:15:41 +01:00
parent d220277c37
commit cf1ae3a5da
2 changed files with 42 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
htdocs/core/lib/functions.lib.php
View file

@ -3207,18 +3207,8 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
$morehtmlstatus .= $object->getLibStatut(5);
}
} elseif ($object->element == 'project_task') {
$object->fk_statut = 1;
$object->status = 1;
if ($object->progress > 0) {
$object->fk_statut = 2;
$object->status = 2;
}
if ($object->progress >= 100) {
$object->fk_statut = 3;
$object->status = 3;
}
$tmptxt = $object->getLibStatut(5);
$morehtmlstatus .= $tmptxt; // No status on task
$tmptxt = $object->getLibStatut(4);
$morehtmlstatus .= $tmptxt;
} elseif (method_exists($object, 'getLibStatut')) { // Generic case for status
$tmptxt = $object->getLibStatut(6);
if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) {

77
htdocs/projet/class/task.class.php
View file

@ -2516,7 +2516,7 @@ class Task extends CommonObjectLine
// phpcs:enable
global $langs;
// list of Statut of the task
// list of status of the task
$this->labelStatus[0] = 'Draft';
$this->labelStatus[1] = 'Validated';
$this->labelStatus[2] = 'In progress';
@ -2533,46 +2533,49 @@ class Task extends CommonObjectLine
} elseif ($mode == 1) {
return $langs->trans($this->labelStatusShort[$status]);
} elseif ($mode == 2) {
if ($status == 0) {
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut0').' '.$langs->trans($this->labelStatusShort[$status]);
} elseif ($status == 1) {
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut1').' '.$langs->trans($this->labelStatusShort[$status]);
} elseif ($status == 2) {
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut3').' '.$langs->trans($this->labelStatusShort[$status]);
} elseif ($status == 3) {
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6').' '.$langs->trans($this->labelStatusShort[$status]);
} elseif ($status == 4) {
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6').' '.$langs->trans($this->labelStatusShort[$status]);
} elseif ($status == 5) {
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut5').' '.$langs->trans($this->labelStatusShort[$status]);
switch ($status) {
case 0:
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut0').' '.$langs->trans($this->labelStatusShort[$status]);
case 1:
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut1').' '.$langs->trans($this->labelStatusShort[$status]);
case 2:
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut3').' '.$langs->trans($this->labelStatusShort[$status]);
case 3:
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6').' '.$langs->trans($this->labelStatusShort[$status]);
case 4:
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6').' '.$langs->trans($this->labelStatusShort[$status]);
case 5:
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut5').' '.$langs->trans($this->labelStatusShort[$status]);
}
} elseif ($mode == 3) {
if ($status == 0) {
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut0');
} elseif ($status == 1) {
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut1');
} elseif ($status == 2) {
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut3');
} elseif ($status == 3) {
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6');
} elseif ($status == 4) {
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6');
} elseif ($status == 5) {
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut5');
switch ($status) {
case 0:
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut0');
case 1:
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut1');
case 2:
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut3');
case 3:
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6');
case 4:
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6');
case 5:
return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut5');
}
} elseif ($mode == 4) {
if ($status == 0) {
return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status0', $mode);
} elseif ($status == 1) {
return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status1', $mode);
} elseif ($status == 2) {
return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status2', $mode);
} elseif ($status == 3) {
return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status3', $mode);
} elseif ($status == 4) {
return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status4', $mode);
} elseif ($status == 5) {
return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status5', $mode);
switch ($status) {
case 0:
return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status0', $mode);
case 1:
return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status1', $mode);
case 2:
return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status2', $mode);
case 3:
return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status3', $mode);
case 4:
return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status4', $mode);
case 5:
return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status5', $mode);
}
} elseif ($mode == 5) {
/*if ($status==0) return $langs->trans($this->labelStatusShort[$status]).' '.img_picto($langs->trans($this->labelStatusShort[$status]),'statut0');