fernando/luos
1
0
Fork 0
Code Releases Activity

HOR-1502

Browse Source
This commit is contained in:
Paula V. Quispe
2016-08-04 12:00:42 -04:00
parent a7c9f9d081
commit 9229be669d
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
View File

@@ -13,31 +13,22 @@ class RoutingScreen extends \Derivation
public function mergeDataDerivation($post, $prepareInformation)
{
$count = 1;
$iPost = count($post);
$aDataMerged = array();
$flag = false;
$flagJumpTask = false;
foreach ($prepareInformation as $key => $nextTask) {
$aDataMerged[$key] = $nextTask['NEXT_TASK'];
unset($aDataMerged[$key]['USER_ASSIGNED']);
$aDataMerged[$key]['DEL_PRIORITY'] = '';
for ($i = 1; $i <= $iPost; $i++) {
if(isset($post[$i]['SOURCE_UID']) && $nextTask['NEXT_TASK']['TAS_UID'] === $post[$i]['SOURCE_UID']){
if($post[$i]['SOURCE_UID'] !== $post[$i]['TAS_UID']){
$aDataMerged[$count] = $nextTask['NEXT_TASK'];
unset($aDataMerged[$count]['USER_ASSIGNED']);
$aDataMerged[$count]['DEL_PRIORITY'] = '';
$aDataMerged[$count]['NEXT_ROUTING'] = $post[$i];
$count++;
$flag = true;
} else {
$aDataMerged[$count] = \G::array_merges($nextTask['NEXT_TASK'],$post[$i]);
unset($aDataMerged[$count]['USER_ASSIGNED']);
$count++;
$flag = true;
break;
}
if(isset($post[$i]['SOURCE_UID']) && ($nextTask['NEXT_TASK']['TAS_UID'] === $post[$i]['SOURCE_UID']) && ($post[$i]['SOURCE_UID'] !== $post[$i]['TAS_UID'])){
$flagJumpTask = true;
$aDataMerged[$key]['NEXT_ROUTING'][] = $post[$i];
}
}
}
if(!$flag){
//If flagJumpTask is false the template does not Jump Intermediate Events
if(!$flagJumpTask){
$aDataMerged = $post;
}
return $aDataMerged;