fernando/luos
1
0
Fork 0
Code Releases Activity

HOR-3304

Browse Source
This commit is contained in:
Paula Quispe
2017-05-29 11:05:39 -04:00
committed by Julio Cesar Laura Avendaño
parent 87b94ea620
commit e777d5ba67
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
workflow/engine/classes/class.wsBase.php
View File

@@ -2160,15 +2160,23 @@ class wsBase
* Execute the trigger defined in the steps * Execute the trigger defined in the steps
* This function is used when the case is derived from abe, Soap, PMFDerivateCase * This function is used when the case is derived from abe, Soap, PMFDerivateCase
* *
* @param array $appData contain all the information about the case * @param string $caseId, Uid related to the case
* @param string $tasUid * @param array $appData, contain all the information about the case
* @param string $stepType * @param string $tasUid, Uid related to the task
* @param string $stepUidObj * @param string $stepType, before or after step
* @param string $triggerType * @param string $stepUidObj, can be -1, -2
* @param string $labelAssigment * @param string $triggerType, can be BEFORE, AFTER
* @return string $varTriggers * @param string $labelAssigment, label related to the triggerType
*/ */
function executeTriggerFromDerivate($appData, $tasUid, $stepType, $stepUidObj, $triggerType, $labelAssigment = '') function executeTriggerFromDerivate(
$caseId,
$appData,
$tasUid,
$stepType,
$stepUidObj,
$triggerType,
$labelAssigment = ''
)
{ {
$varTriggers = ""; $varTriggers = "";
$oCase = new Cases(); $oCase = new Cases();
@@ -2321,11 +2329,11 @@ class wsBase
$varTriggers = "\n"; $varTriggers = "\n";
//Execute triggers before assignment //Execute triggers before assignment
if ($bExecuteTriggersBeforeAssignment) { if ($bExecuteTriggersBeforeAssignment) {
$varTriggers .= $this->executeTriggerFromDerivate($appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -1, 'BEFORE', "-= Before Assignment =-"); $varTriggers .= $this->executeTriggerFromDerivate($caseId, $appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -1, 'BEFORE', "-= Before Assignment =-");
} }
//Execute triggers before routing //Execute triggers before routing
$varTriggers .= $this->executeTriggerFromDerivate($appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'BEFORE', "-= Before Derivation =-"); $varTriggers .= $this->executeTriggerFromDerivate($caseId, $appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'BEFORE', "-= Before Derivation =-");
$oDerivation = new Derivation(); $oDerivation = new Derivation();
if (!empty($tasks)) { if (!empty($tasks)) {
@@ -2415,7 +2423,7 @@ class wsBase
$appFields = $oCase->loadCase( $caseId ); $appFields = $oCase->loadCase( $caseId );
//Execute triggers after routing //Execute triggers after routing
$varTriggers .= $this->executeTriggerFromDerivate($appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'AFTER', "-= After Derivation =-"); $varTriggers .= $this->executeTriggerFromDerivate($caseId, $appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'AFTER', "-= After Derivation =-");
$sFromName = ""; $sFromName = "";