From 745bd7610053f4ba337a22581114738c006d4645 Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Wed, 23 Jan 2013 16:04:42 -0400 Subject: [PATCH] BUG 10158 "No esta realizando el pintado del proceso con..." SOLVED - The task in progress does not take the corresponding color - Solved problem, added validation when task is in progress * Available from version ProcessMaker-2.0.46 --- workflow/engine/classes/class.processMap.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index 31df9f57e..24dbb939c 100755 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -114,6 +114,7 @@ class processMap $oDataset = TaskPeer::doSelectRS( $oCriteria ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->next(); + while ($aRow1 = $oDataset->getRow()) { $oTask = null; $oTask->uid = $aRow1['TAS_UID']; @@ -198,6 +199,7 @@ class processMap $oTask->derivation->to[] = $oTo; $oDataset2->next(); } + if ($bCT) { $oCriteria = new Criteria( 'workflow' ); $oCriteria->addSelectColumn( 'COUNT(*) AS CANT' ); @@ -243,8 +245,12 @@ class processMap if (!empty($aRow2["FINISH"])) { $oTask->color = "#006633"; //Green } else { - if ($aRow2["CANT"] == 0 || $oTask->derivation->type != 5) { - $oTask->color = "#939598"; //Gray + if ($oTask->derivation->type != 5) { + if ($aRow2["CANT"] != 0) { + $oTask->color = "#FF0000"; //Red + } else { + $oTask->color = "#939598"; //Gray + } } else { //$oTask->color = "#FF9900"; //Yellow $oTask->color = "#FF0000"; //Red @@ -296,8 +302,12 @@ class processMap if (!empty($aRow2["FINISH"])) { $oTask->color = "#006633"; //Green } else { - if ($aRow2["CANT"] == 0 || $oTask->derivation->type != 5) { - $oTask->color = "#939598"; //Gray + if ($oTask->derivation->type != 5) { + if ($aRow2["CANT"] != 0) { + $oTask->color = "#FF0000"; //Red + } else { + $oTask->color = "#939598"; //Gray + } } else { $oTask->color = "#FF9900"; //Yellow }