fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 10158 "No esta realizando el pintado del proceso con..." SOLVED

Browse Source 
- 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
This commit is contained in:
Victor Saisa Lopez
2013-01-23 16:04:42 -04:00
parent 2dcd54213c
commit 745bd76100
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
workflow/engine/classes/class.processMap.php
View File

@@ -114,6 +114,7 @@ class processMap
$oDataset = TaskPeer::doSelectRS( $oCriteria ); $oDataset = TaskPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next(); $oDataset->next();
while ($aRow1 = $oDataset->getRow()) { while ($aRow1 = $oDataset->getRow()) {
$oTask = null; $oTask = null;
$oTask->uid = $aRow1['TAS_UID']; $oTask->uid = $aRow1['TAS_UID'];
@@ -198,6 +199,7 @@ class processMap
$oTask->derivation->to[] = $oTo; $oTask->derivation->to[] = $oTo;
$oDataset2->next(); $oDataset2->next();
} }
if ($bCT) { if ($bCT) {
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( 'COUNT(*) AS CANT' ); $oCriteria->addSelectColumn( 'COUNT(*) AS CANT' );
@@ -243,8 +245,12 @@ class processMap
if (!empty($aRow2["FINISH"])) { if (!empty($aRow2["FINISH"])) {
$oTask->color = "#006633"; //Green $oTask->color = "#006633"; //Green
} else { } else {
if ($aRow2["CANT"] == 0 || $oTask->derivation->type != 5) { if ($oTask->derivation->type != 5) {
$oTask->color = "#939598"; //Gray if ($aRow2["CANT"] != 0) {
$oTask->color = "#FF0000"; //Red
} else {
$oTask->color = "#939598"; //Gray
}
} else { } else {
//$oTask->color = "#FF9900"; //Yellow //$oTask->color = "#FF9900"; //Yellow
$oTask->color = "#FF0000"; //Red $oTask->color = "#FF0000"; //Red
@@ -296,8 +302,12 @@ class processMap
if (!empty($aRow2["FINISH"])) { if (!empty($aRow2["FINISH"])) {
$oTask->color = "#006633"; //Green $oTask->color = "#006633"; //Green
} else { } else {
if ($aRow2["CANT"] == 0 || $oTask->derivation->type != 5) { if ($oTask->derivation->type != 5) {
$oTask->color = "#939598"; //Gray if ($aRow2["CANT"] != 0) {
$oTask->color = "#FF0000"; //Red
} else {
$oTask->color = "#939598"; //Gray
}
} else { } else {
$oTask->color = "#FF9900"; //Yellow $oTask->color = "#FF9900"; //Yellow
} }