From b3ffa94b028f5c8bad9256bc8a6a62f8a0a6a60e Mon Sep 17 00:00:00 2001 From: dheeyi Date: Wed, 27 May 2015 16:19:02 -0400 Subject: [PATCH 1/2] PM-2790 0017387: Derivacion en paralelo, una de los hilos llega a la bandeja como leido --- workflow/engine/classes/class.derivation.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index 5ad3d3308..873b8b65b 100755 --- a/workflow/engine/classes/class.derivation.php +++ b/workflow/engine/classes/class.derivation.php @@ -805,7 +805,6 @@ class Derivation unset( $aSP ); } //end foreach - /* Start Block : UPDATES APPLICATION */ //Set THE APP_STATUS @@ -836,6 +835,15 @@ class Derivation //Start Block : UPDATES APPLICATION $this->case->updateCase( $currentDelegation["APP_UID"], $appFields ); //End Block : UPDATES APPLICATION + + if($currentDelegation['ROU_TYPE'] == 'PARALLEL-BY-EVALUATION'){ + $con = Propel::getConnection('workflow'); + $c1 = new Criteria('workflow'); + $c1->add(ListInboxPeer::APP_UID, $currentDelegation["APP_UID"]); + $c2 = new Criteria('workflow'); + $c2->add(ListInboxPeer::DEL_INIT_DATE, null); + BasePeer::doUpdate($c1, $c2, $con); + } } } From 35247643f1fb4710d3c9a9fda76004d7e713a110 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Fri, 29 May 2015 17:31:16 -0400 Subject: [PATCH 2/2] PM-2790 0017387: Derivacion en paralelo, una de los hilos llega a la bandeja como leido --- workflow/engine/classes/class.case.php | 1 + workflow/engine/classes/class.derivation.php | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index 99e9e4479..1e3a1dcf9 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -1078,6 +1078,7 @@ class Cases $Fields['DEL_INDEX'] = 1; } $inbox = new ListInbox(); + unset($Fields['DEL_INIT_DATE']); $inbox->update(array_merge($Fields, $arrayNewCaseTitleAndDescription)); /*----------------------------------********---------------------------------*/ diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index 873b8b65b..3fc95bac3 100755 --- a/workflow/engine/classes/class.derivation.php +++ b/workflow/engine/classes/class.derivation.php @@ -835,15 +835,6 @@ class Derivation //Start Block : UPDATES APPLICATION $this->case->updateCase( $currentDelegation["APP_UID"], $appFields ); //End Block : UPDATES APPLICATION - - if($currentDelegation['ROU_TYPE'] == 'PARALLEL-BY-EVALUATION'){ - $con = Propel::getConnection('workflow'); - $c1 = new Criteria('workflow'); - $c1->add(ListInboxPeer::APP_UID, $currentDelegation["APP_UID"]); - $c2 = new Criteria('workflow'); - $c2->add(ListInboxPeer::DEL_INIT_DATE, null); - BasePeer::doUpdate($c1, $c2, $con); - } } }