fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #748 from victorsl/BUG-9887

Browse Source 
BUG 9887 "No se muestra del color correspondiente la tarea..." SOLVED
This commit is contained in:
julceslauhub
2012-10-16 11:24:50 -07:00
parent d282badba7 eeb1d13549
commit f5fd2bd544
1 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -220,6 +220,8 @@ class processMap
if ($aRow3) {
$aRow2['FINISH'] = '';
}
/*
if (($aRow2['FINISH'] == null) && ($aRow1['TAS_UID'] == $sTask)) {
$oTask->color = '#FF0000';
} else {
@@ -234,6 +236,21 @@ class processMap
$oTask->color = "#939598";
}
}
*/
if (empty($aRow2["FINISH"]) && $aRow1["TAS_UID"] == $sTask) {
$oTask->color = "#FF0000"; //Red
} else {
if (!empty($aRow2["FINISH"])) {
$oTask->color = "#006633"; //Green
} else {
if ($aRow2["CANT"] == 0 || $oTask->derivation->type != 5) {
$oTask->color = "#939598"; //Gray
} else {
//$oTask->color = "#FF9900"; //Yellow
$oTask->color = "#FF0000"; //Red
}
}
}
} else {
if ($bView && ($sApplicationUID != '') && ($iDelegation > 0) && ($sTask != '')) {
$oCriteria = new Criteria( 'workflow' );
@@ -257,6 +274,8 @@ class processMap
if ($aRow3) {
$aRow2['FINISH'] = '';
}
/*
if (($aRow2['FINISH'] == null) && ($aRow1['TAS_UID'] == $sTask)) {
$oTask->color = '#FF0000';
} else {
@@ -270,6 +289,20 @@ class processMap
$oTask->color = '#939598';
}
}
*/
if (empty($aRow2["FINISH"]) && $aRow1["TAS_UID"] == $sTask) {
$oTask->color = "#FF0000"; //Red
} else {
if (!empty($aRow2["FINISH"])) {
$oTask->color = "#006633"; //Green
} else {
if ($aRow2["CANT"] == 0 || $oTask->derivation->type != 5) {
$oTask->color = "#939598"; //Gray
} else {
$oTask->color = "#FF9900"; //Yellow
}
}
}
}
}