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

IMPROVEMENT in PMFunction PMFGetNextAssignedUser

Browse Source
This commit is contained in:
Julio Cesar Laura
2013-02-19 11:36:10 -04:00
parent dcbc663b34
commit b986dd1a7d
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,6 +84,9 @@ class Derivation
$taskInfo = array ();
$oUser = new Users();
if (!class_exists('Cases')) {
G::LoadClass('case');
}
$this->case = new Cases();
// 1. there is no rule
if (is_null( $aDerivation['ROU_NEXT_TASK'] )) {

14
workflow/engine/classes/class.pmFunctions.php
View File

@@ -2395,7 +2395,7 @@ function PMFRedirectToStep ($sApplicationUID, $iDelegation, $sStepType, $sStepUi
* @return array | $array | List of users | Return a list of users
*
*/
function PMFGetNextAssignedUser ($application, $task)
function PMFGetNextAssignedUser ($application, $task, $delIndex = null, $userUid = null)
{
require_once 'classes/model/AppDelegation.php';
@@ -2409,7 +2409,14 @@ function PMFGetNextAssignedUser ($application, $task)
$TaskFields = $oTask->load( $task );
$typeTask = $TaskFields['TAS_ASSIGN_TYPE'];
if ($typeTask == 'BALANCED') {
$g = new G();
$g->sessionVarSave();
$_SESSION['INDEX'] = (!is_null($delIndex) ? $delIndex : (isset($_SESSION['INDEX']) ? $_SESSION['INDEX'] : null));
$_SESSION['USER_LOGGED'] = (!is_null($userUid) ? $userUid : (isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : null));
if ($typeTask == 'BALANCED' && !is_null($_SESSION['INDEX']) && !is_null($_SESSION['USER_LOGGED'])) {
G::LoadClass( 'derivation' );
$oDerivation = new Derivation();
@@ -2423,6 +2430,8 @@ function PMFGetNextAssignedUser ($application, $task)
$aUsers[] = $aUser;
}
$g->sessionVarRestore();
if (count( $aUsers ) == 1) {
return $aUser;
} else {
@@ -2430,6 +2439,7 @@ function PMFGetNextAssignedUser ($application, $task)
}
} else {
$g->sessionVarRestore();
return false;
}
}