From eeb1d13549db30df72d99569f71a6636f5d83096 Mon Sep 17 00:00:00 2001
From: Victor Saisa Lopez <victor@colosa.com>
Date: Tue, 16 Oct 2012 12:24:55 -0400
Subject: [PATCH] BUG 9887 "No se muestra del color correspondiente la
 tarea..." SOLVED

- In the processMap not validate the route type of task (ie for colors)
- For the color of the task now takes into account the type of route
* Available from version 2.0.45
---
 workflow/engine/classes/class.processMap.php | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index 0a4d833fe..6c243430d 100755
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -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
+                                }
+                            }
+                        }
                     }
                 }