From c7f5863d9be9bb8b871466cf76c1ed9498bc645d Mon Sep 17 00:00:00 2001 From: Ronald Q Date: Fri, 29 Jul 2016 15:33:55 -0400 Subject: [PATCH 1/2] HOR-1545 --- workflow/engine/classes/model/AppEvent.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/model/AppEvent.php b/workflow/engine/classes/model/AppEvent.php index a88113fae..2f5b421c6 100755 --- a/workflow/engine/classes/model/AppEvent.php +++ b/workflow/engine/classes/model/AppEvent.php @@ -146,9 +146,13 @@ class AppEvent extends BaseAppEvent $aConditions[] = array (AppEventPeer::DEL_INDEX,AppDelegationPeer::DEL_INDEX ); $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN ); - $oCriteria->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN); + $aConditions = array (); + $aConditions[] = array (AppDelegationPeer::TAS_UID,TaskPeer::TAS_UID); + $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN ); $oCriteria->addJoin(AppEventPeer::APP_UID, ApplicationPeer::APP_UID, Criteria::LEFT_JOIN); - $oCriteria->addJoin(AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); + $aConditions = array (); + $aConditions[] = array (AppDelegationPeer::PRO_UID,ProcessPeer::PRO_UID); + $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN ); $oCriteria->add( AppEventPeer::EVN_UID, '', Criteria::NOT_EQUAL ); if ($sProcessUid != '') { $oCriteria->add( EventPeer::PRO_UID, $sProcessUid ); From 11d972b391268eeb6b1cb3ee3abbb993fb1c5fbc Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Fri, 29 Jul 2016 16:27:55 -0400 Subject: [PATCH 2/2] HOR-1502 add HOR-1502 --- workflow/engine/methods/cases/cases_Derivate.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/workflow/engine/methods/cases/cases_Derivate.php b/workflow/engine/methods/cases/cases_Derivate.php index c0fe09090..5c313961b 100755 --- a/workflow/engine/methods/cases/cases_Derivate.php +++ b/workflow/engine/methods/cases/cases_Derivate.php @@ -123,7 +123,13 @@ try { $aCurrentDerivation = array ('APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'],'APP_STATUS' => $sStatus,'TAS_UID' => $_SESSION['TASK'],'ROU_TYPE' => $_POST['form']['ROU_TYPE'] ); - $arrayDerivationResult = $oDerivation->derivate($aCurrentDerivation, $_POST['form']['TASKS']); + $aPInformation = $oDerivation->prepareInformation( array ('USER_UID' => $_SESSION['USER_LOGGED'],'APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'] + ) ); + + //$_POST['form']['TASKS'] is the information after the cases_ScreenDerivation + $nextTasks = G::array_merges($aPInformation,$_POST['form']['TASKS']); + + $arrayDerivationResult = $oDerivation->derivate($aCurrentDerivation, $nextTasks); if (!empty($arrayDerivationResult)) { foreach ($_POST['form']['TASKS'] as $key => $value) {