fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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

11
workflow/engine/methods/cases/cases_Derivate.php
View File

@@ -122,13 +122,10 @@ try {
$oDerivation = new Derivation(); $oDerivation = new Derivation();
$aCurrentDerivation = array ('APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'],'APP_STATUS' => $sStatus,'TAS_UID' => $_SESSION['TASK'],'ROU_TYPE' => $_POST['form']['ROU_TYPE'] $aCurrentDerivation = array ('APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'],'APP_STATUS' => $sStatus,'TAS_UID' => $_SESSION['TASK'],'ROU_TYPE' => $_POST['form']['ROU_TYPE']
); );
$aPInformation = $oDerivation->prepareInformation( array ('USER_UID' => $_SESSION['USER_LOGGED'],'APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'])
$aPInformation = $oDerivation->prepareInformation( array ('USER_UID' => $_SESSION['USER_LOGGED'],'APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'] );
) ); $oRoute = new \ProcessMaker\Core\RoutingScreen();
$nextTasks = $oRoute->mergeDataDerivation($_POST['form']['TASKS'], $aPInformation);
//$_POST['form']['TASKS'] is the information after the cases_ScreenDerivation
$nextTasks = G::array_merges($aPInformation,$_POST['form']['TASKS']);
$arrayDerivationResult = $oDerivation->derivate($aCurrentDerivation, $nextTasks); $arrayDerivationResult = $oDerivation->derivate($aCurrentDerivation, $nextTasks);
if (!empty($arrayDerivationResult)) { if (!empty($arrayDerivationResult)) {

3
workflow/engine/methods/cases/cases_Step.php
View File

@@ -1054,6 +1054,9 @@ try {
if(isset($aValues['ROU_CONDITION'])){ if(isset($aValues['ROU_CONDITION'])){
$aFields['TASK'][$sKey]['NEXT_TASK']['ROU_CONDITION'] = '<input type="hidden" name="' . $hiddenName . '[ROU_CONDITION]" id="' . $hiddenName . '[ROU_CONDITION]" value="' . $aValues['ROU_CONDITION'] . '">'; $aFields['TASK'][$sKey]['NEXT_TASK']['ROU_CONDITION'] = '<input type="hidden" name="' . $hiddenName . '[ROU_CONDITION]" id="' . $hiddenName . '[ROU_CONDITION]" value="' . $aValues['ROU_CONDITION'] . '">';
} }
if(isset($aValues['SOURCE_UID'])){
$aFields['TASK'][$sKey]['NEXT_TASK']['SOURCE_UID'] = '<input type="hidden" name="' . $hiddenName . '[SOURCE_UID]" id="' . $hiddenName . '[SOURCE_UID]" value="' . $aValues['SOURCE_UID'] . '">';
}
} }
} }

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"); $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;
}
} }

2
workflow/engine/templates/cases/cases_ScreenDerivation.html
View File

@@ -148,7 +148,7 @@
<tr height="0"> <tr height="0">
<td colspan="2"> <td colspan="2">
{$data.NEXT_TASK.TAS_ASSIGN_TYPE}{$data.NEXT_TASK.TAS_DEF_PROC_CODE}{$data.NEXT_TASK.DEL_PRIORITY}{$data.NEXT_TASK.TAS_PARENT}{$data.NEXT_TASK.ROU_PREVIOUS_TASK}{$data.NEXT_TASK.ROU_PREVIOUS_TYPE}{$data.NEXT_TASK.ROU_CONDITION} {$data.NEXT_TASK.TAS_ASSIGN_TYPE}{$data.NEXT_TASK.TAS_DEF_PROC_CODE}{$data.NEXT_TASK.DEL_PRIORITY}{$data.NEXT_TASK.TAS_PARENT}{$data.NEXT_TASK.ROU_PREVIOUS_TASK}{$data.NEXT_TASK.ROU_PREVIOUS_TYPE}{$data.NEXT_TASK.ROU_CONDITION}{$data.NEXT_TASK.SOURCE_UID}
</td> </td>
</tr> </tr>