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

HOR-2902: SecJoin with subprocess

Browse Source
This commit is contained in:
Paula Quispe
2017-03-23 14:31:29 -04:00
parent 740ba903fc
commit 5603fd6244
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
workflow/engine/classes/class.derivation.php
View File

@@ -950,7 +950,15 @@ class Derivation
$aSP['USR_UID'] = $nextDel['USR_UID']; $aSP['USR_UID'] = $nextDel['USR_UID'];
} }
$aTask = $oTask->load( $nextDel['TAS_PARENT'] ); $aTask = $oTask->load( $nextDel['TAS_PARENT'] );
$nextDel = array ('TAS_UID' => $aTask['TAS_UID'],'USR_UID' => $aSP['USR_UID'],'TAS_ASSIGN_TYPE' => $aTask['TAS_ASSIGN_TYPE'],'TAS_DEF_PROC_CODE' => $aTask['TAS_DEF_PROC_CODE'],'DEL_PRIORITY' => 3,'TAS_PARENT' => '' $nextDel = array (
'TAS_UID' => $aTask['TAS_UID'],
'USR_UID' => $aSP['USR_UID'],
'TAS_ASSIGN_TYPE' => $aTask['TAS_ASSIGN_TYPE'],
'TAS_DEF_PROC_CODE' => $aTask['TAS_DEF_PROC_CODE'],
'DEL_PRIORITY' => 3,
'TAS_PARENT' => '',
'ROU_PREVIOUS_TYPE' => isset($nextDel['ROU_PREVIOUS_TYPE']) ? $nextDel['ROU_PREVIOUS_TYPE'] : '',
'ROU_PREVIOUS_TASK' => isset($nextDel['ROU_PREVIOUS_TASK']) ? $nextDel['ROU_PREVIOUS_TASK'] : ''
); );
} else { } else {
continue; continue;
@@ -1069,7 +1077,12 @@ class Derivation
case "SEC-JOIN": case "SEC-JOIN":
$arrayOpenThread = ($flagTaskIsMultipleInstance && $flagTaskAssignTypeIsMultipleInstance)? $this->case->searchOpenPreviousTasks($currentDelegation["TAS_UID"], $currentDelegation["APP_UID"]) : array(); $arrayOpenThread = ($flagTaskIsMultipleInstance && $flagTaskAssignTypeIsMultipleInstance)? $this->case->searchOpenPreviousTasks($currentDelegation["TAS_UID"], $currentDelegation["APP_UID"]) : array();
if ($flagTaskIsMultipleInstance && $flagTaskAssignTypeIsMultipleInstance && $nextDel["ROU_PREVIOUS_TYPE"] == 'SEC-JOIN') { if (
$flagTaskIsMultipleInstance
&& $flagTaskAssignTypeIsMultipleInstance
&& isset($nextDel["ROU_PREVIOUS_TYPE"])
&& $nextDel["ROU_PREVIOUS_TYPE"] == 'SEC-JOIN'
) {
$appDelegation = new AppDelegation(); $appDelegation = new AppDelegation();
$arraySiblings = $appDelegation->getAllTasksBeforeSecJoin( $arraySiblings = $appDelegation->getAllTasksBeforeSecJoin(
$nextDel["ROU_PREVIOUS_TASK"], $nextDel["ROU_PREVIOUS_TASK"],