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

PMC-399

Browse Source
This commit is contained in:
Paula Quispe
2019-01-30 09:11:57 -04:00
parent e9d5c8ceec
commit ade7020d60
5 changed files with 166 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
workflow/engine/classes/Cases.php
View File

@@ -3484,8 +3484,19 @@ class Cases
* @param string $stepUidObj
* @param string $triggerType
* @param string $labelAssignment
* @param bool $useGlobal, needs to have the value true if the same case in execution is affected with this trigger
*
* @return array
*
* @see Cases::executeTriggers()
* @see Cases::getExecuteTriggerProcess()
* @see WsBase::executeTriggerFromDerivate()
* @see ScriptTask::execScriptByActivityUid()
*
* @link https://wiki.processmaker.com/3.2/Triggers#Custom_Trigger
* @link https://wiki.processmaker.com/3.2/Triggers#When_action_cases
* @link https://wiki.processmaker.com/3.1/Triggers
* @link https://wiki.processmaker.com/3.1/Tasks#ScriptTask
*/
public function executeTriggerFromList(
array $triggersList,
@@ -3493,16 +3504,24 @@ class Cases
$stepType,
$stepUidObj,
$triggerType,
$labelAssignment = ''
$labelAssignment = '',
$useGlobal = true
)
{
if (count($triggersList) > 0) {
global $oPMScript;
if ($useGlobal) {
/**
* The global $oPMScript is necessary when the trigger can be update the appData related to the case
* in execution
*/
global $oPMScript;
}
$this->addTriggerMessageExecution("<br /><b>" . $labelAssignment . "</b><br />");
if (!isset($oPMScript)) {
$oPMScript = new PMScript();
}
$oPMScript->setFields($fieldsCase);
/*----------------------------------********---------------------------------*/
@@ -4338,14 +4357,15 @@ class Cases
* @param string $appUid
* @param integer $delIndex
* @param string $usrUid
* @param bool $executeSameCase
*
* @see Ajax::cancelCase()
* @see cases_Ajax
* @see WsBase::cancelCase()
*
* @return boolean|string
*/
public function cancelCase($appUid, $delIndex = null, $usrUid = null)
public function cancelCase($appUid, $delIndex = null, $usrUid = null, $executeSameCase = true)
{
/** Execute a trigger when a case is cancelled */
$this->getExecuteTriggerProcess($appUid, 'CANCELED');
$caseFields = $this->loadCase($appUid);
$appStatusCurrent = $caseFields['APP_STATUS'];
@@ -4374,6 +4394,9 @@ class Cases
);
$delay->create($rowDelay);
/** Execute a trigger when a case is cancelled */
$this->getExecuteTriggerProcess($appUid, 'CANCELED', $executeSameCase);
/*----------------------------------********---------------------------------*/
$dataList = [
'APP_UID' => $appUid,
@@ -7249,40 +7272,56 @@ class Cases
return $response;
}
public function getExecuteTriggerProcess($appUid, $action)
/**
* Execute triggers when committing an action in cases
*
* @param string $appUid
* @param string $action, can be [OPEN, CANCELED, PAUSED, REASSIGNED, DELETED, CREATE, UNPAUSE]
* @param bool $executeSameCase
*
* @return bool
*
* @see cases_Open.php
* @see cancelCase/Cases.php pauseCase/Cases.php reassignCase/Cases.php removeCase/Cases.php unpauseCase/Cases.php on
* @link https://wiki.processmaker.com/3.2/Triggers#When_action_cases
*/
public function getExecuteTriggerProcess($appUid, $action, $executeSameCase = true)
{
if ((!isset($appUid) && $appUid == '') || (!isset($action) && $action == '')) {
if (empty($appUid) || empty($action)) {
return false;
}
$aFields = $this->loadCase($appUid);
$proUid = $aFields['PRO_UID'];
require_once("classes/model/Process.php");
$fieldsCase = $this->loadCase($appUid);
$proUid = $fieldsCase['PRO_UID'];
//Set some global system variables
$fieldsCase['APP_DATA']['APPLICATION'] = $appUid;
$fieldsCase['APP_DATA']['PROCESS'] = $proUid;
//Get the trigger configured in the process action
$appProcess = new Process();
$arrayWebBotTrigger = $appProcess->getTriggerWebBotProcess($proUid, $action);
$triggersList = $appProcess->getTriggerWebBotProcess($proUid, $action);
if ($arrayWebBotTrigger['TRI_WEBBOT'] != false && $arrayWebBotTrigger['TRI_WEBBOT'] != '') {
global $oPMScript;
$aFields['APP_DATA']['APPLICATION'] = $appUid;
$aFields['APP_DATA']['PROCESS'] = $proUid;
$oPMScript = new PMScript();
$oPMScript->setDataTrigger($arrayWebBotTrigger);
$oPMScript->setFields($aFields['APP_DATA']);
$oPMScript->setScript($arrayWebBotTrigger['TRI_WEBBOT']);
$oPMScript->setExecutedOn(PMScript::PROCESS_ACTION);
$oPMScript->execute();
if (!empty($triggersList)){
//Execute the trigger defined in the process action
$fieldsCase['APP_DATA'] = $this->executeTriggerFromList(
$triggersList,
$fieldsCase['APP_DATA'],
'PROCESS_ACTION',
'',
'',
'',
$executeSameCase
);
$aFields['APP_DATA'] = array_merge($aFields['APP_DATA'], $oPMScript->aFields);
unset($aFields['APP_STATUS']);
unset($aFields['APP_PROC_STATUS']);
unset($aFields['APP_PROC_CODE']);
unset($aFields['APP_PIN']);
$this->updateCase($aFields['APP_UID'], $aFields);
//Update the case
$this->updateCase($appUid, $fieldsCase);
return true;
} else {
return false;
}
return false;
}
/**