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

Fix color selection for ticket graph

Browse Source
This commit is contained in:
Laurent Destailleur 2021-05-30 20:19:02 +02:00
parent 356e349944
commit ea21e1dbfb
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
htdocs/core/boxes/box_graph_nb_tickets_type.php
View File

@ -66,6 +66,10 @@ class box_graph_nb_tickets_type extends ModeleBoxes
public function loadBox($max = 5) public function loadBox($max = 5)
{ {
global $conf, $user, $langs; global $conf, $user, $langs;
global $theme_datacolor, $badgeStatus8;
require_once DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php";
$badgeStatus0 = '#cbd3d3'; // draft $badgeStatus0 = '#cbd3d3'; // draft
$badgeStatus1 = '#bc9526'; // validated $badgeStatus1 = '#bc9526'; // validated
@ -98,29 +102,22 @@ class box_graph_nb_tickets_type extends ModeleBoxes
if ($resql) { if ($resql) {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
$i = 0; $i = 0;
$newcolorkey = 0;
$colorused = array();
while ($i < $num) { while ($i < $num) {
$objp = $this->db->fetch_object($resql); $objp = $this->db->fetch_object($resql);
$listofoppcode[$objp->rowid] = $objp->code; $listofoppcode[$objp->rowid] = $objp->code;
$listofopplabel[$objp->rowid] = $objp->label; $listofopplabel[$objp->rowid] = $objp->label;
switch ($objp->code) { if (empty($colorused[$objp->code])) {
case 'COM': if ($objp->code == 'ISSUE') {
$colorseriesstat[$objp->rowid] = $badgeStatus1; $colorused[$objp->code] = $badgeStatus8;
break; } else {
case 'HELP': $colorused[$objp->code] = colorArrayToHex($theme_datacolor[$newcolorkey]);
$colorseriesstat[$objp->rowid] = $badgeStatus2; $newcolorkey++;
break;
case 'ISSUE':
$colorseriesstat[$objp->rowid] = $badgeStatus3;
break;
case 'REQUEST':
$colorseriesstat[$objp->rowid] = $badgeStatus4;
break;
case 'OTHER':
$colorseriesstat[$objp->rowid] = $badgeStatus5;
break;
default:
break;
} }
}
$colorseriesstat[$objp->rowid] = $colorused[$objp->code];
$i++; $i++;
} }
} else { } else {