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();
$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']
) );
//$_POST['form']['TASKS'] is the information after the cases_ScreenDerivation
$nextTasks = G::array_merges($aPInformation,$_POST['form']['TASKS']);
$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);
$arrayDerivationResult = $oDerivation->derivate($aCurrentDerivation, $nextTasks);
if (!empty($arrayDerivationResult)) {

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

@@ -1054,6 +1054,9 @@ try {
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'] . '">';
}
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'] . '">';
}
}
}