fernando/luos
1
0
Fork 0
Code Releases Activity

up observation

Browse Source 
HOR-1502

ok

HOR-1502
This commit is contained in:
Ronald Q
2016-08-02 11:22:27 -04:00
committed by Paula V. Quispe
parent 6964d9a06b
commit 124bf8f49b
4 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,4 +11,36 @@ class RoutingScreen extends \Derivation
$this->setRegexpTaskTypeToInclude("GATEWAYTOGATEWAY|END-MESSAGE-EVENT|END-EMAIL-EVENT|SCRIPT-TASK|INTERMEDIATE-CATCH-TIMER-EVENT|INTERMEDIATE-THROW-EMAIL-EVENT");
}
public function mergeDataDerivation($post, $prepareInformation)
{
$count = 1;
$iPost = count($post);
$aDataMerged = array();
$flag = false;
foreach ($prepareInformation as $key => $nextTask) {
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(!$flag){
$aDataMerged = $post;
}
return $aDataMerged;
}
}