fernando/luos
1
0
Fork 0
Code Releases Activity

HOR-1506

Browse Source
This commit is contained in:
Ronald Q
2016-08-04 15:27:09 -04:00
parent dab227709d 22a4fd6846
commit efc43d0c28
14 changed files with 236 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -415,7 +415,8 @@ class Light
$aData['APP_UID'] = $app_uid;
$aData['DEL_INDEX'] = $del_index;
$aData['USER_UID'] = $usr_uid;
$derive = $oDerivation->prepareInformation( $aData );
$oRoute = new \ProcessMaker\Core\RoutingScreen();
$derive = $oRoute->prepareInformation($aData);
$response = array();
foreach ($derive as $sKey => &$aValues) {
$sPriority = ''; //set priority value

196
workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
View File

@@ -5,187 +5,33 @@ namespace ProcessMaker\Core;
class RoutingScreen extends \Derivation
{
/**
* @param array $arrayData
* @param string $taskUid
* @return array
* @throws \Exception
*/
public function prepareInformation(array $arrayData, $taskUid = "")
public function __construct()
{
try {
$this->case = new \Cases();
$task = new \Task();
$arrayApplicationData = $this->case->loadCase($arrayData["APP_UID"]);
$arrayNextTask = array();
$arrayNextTaskDefault = array();
$i = 0;
$flagDefault = false;
$aSecJoin = array();
$count = 0;
$routeData = $this->getRouteData($arrayData, $taskUid);
foreach ($routeData as $arrayRouteData) {
if ((int)($arrayRouteData["ROU_DEFAULT"]) == 1) {
$arrayNextTaskDefault = $arrayRouteData;
$flagDefault = true;
continue;
}
$flagAddDelegation = $this->executeScript($arrayRouteData, $arrayApplicationData["APP_DATA"]);
if (trim($arrayRouteData['ROU_CONDITION']) == '' && $arrayRouteData['ROU_NEXT_TASK'] != '-1') {
$arrayTaskData = $task->load($arrayRouteData['ROU_NEXT_TASK']);
if ($arrayRouteData['ROU_TYPE'] != 'SEC-JOIN' && $arrayTaskData['TAS_TYPE'] == 'GATEWAYTOGATEWAY') {
$flagAddDelegation = true;
}
if ($arrayRouteData['ROU_TYPE'] == 'SEC-JOIN') {
$aSecJoin[$count]['ROU_PREVIOUS_TASK'] = $arrayRouteData['ROU_NEXT_TASK'];
$aSecJoin[$count]['ROU_PREVIOUS_TYPE'] = 'SEC-JOIN';
$count++;
}
}
if ($arrayRouteData['ROU_TYPE'] == 'EVALUATE' && !empty($arrayNextTask)) {
$flagAddDelegation = false;
}
if ($flagAddDelegation &&
preg_match("/^(?:EVALUATE|PARALLEL-BY-EVALUATION)$/", $arrayRouteData["ROU_TYPE"]) &&
trim($arrayRouteData["ROU_CONDITION"]) == ""
) {
$flagAddDelegation = false;
}
if ($flagAddDelegation) {
$arrayNextTask[++$i] = $this->prepareInformationTask($arrayRouteData);
}
}
if (!$arrayNextTask && count($arrayNextTaskDefault) > 0) {
$arrayNextTask[++$i] = $this->prepareInformationTask($arrayNextTaskDefault);
}
//Check Task GATEWAYTOGATEWAY, END-MESSAGE-EVENT, END-EMAIL-EVENT
$arrayNextTaskBackup = $arrayNextTask;
$arrayNextTask = array();
$i = 0;
foreach ($arrayNextTaskBackup as $value) {
$arrayNextTaskData = $value;
$regexpTaskTypeToInclude = "GATEWAYTOGATEWAY|END-MESSAGE-EVENT|END-EMAIL-EVENT|SCRIPT-TASK|INTERMEDIATE-CATCH-TIMER-EVENT|INTERMEDIATE-THROW-EMAIL-EVENT";
if ($arrayNextTaskData["NEXT_TASK"]["TAS_UID"] != "-1" &&
preg_match("/^(?:" . $regexpTaskTypeToInclude . ")$/", $arrayNextTaskData["NEXT_TASK"]["TAS_TYPE"])
) {
$arrayAux = $this->prepareInformation($arrayData, $arrayNextTaskData["NEXT_TASK"]["TAS_UID"]);
foreach ($arrayAux as $value2) {
$arrayNextTask[++$i] = $value2;
foreach ($aSecJoin as $rsj) {
$arrayNextTask[$i]["NEXT_TASK"]["ROU_PREVIOUS_TASK"] = $rsj["ROU_PREVIOUS_TASK"];
$arrayNextTask[$i]["NEXT_TASK"]["ROU_PREVIOUS_TYPE"] = "SEC-JOIN";
}
}
} else {
$regexpTaskTypeToInclude = "END-MESSAGE-EVENT|END-EMAIL-EVENT|INTERMEDIATE-THROW-EMAIL-EVENT";
if ($arrayNextTaskData["NEXT_TASK"]["TAS_UID"] == "-1" &&
preg_match("/^(?:" . $regexpTaskTypeToInclude . ")$/", $arrayNextTaskData["TAS_TYPE"])
) {
$arrayNextTaskData["NEXT_TASK"]["TAS_UID"] = $arrayNextTaskData["TAS_UID"] . "/" . $arrayNextTaskData["NEXT_TASK"]["TAS_UID"];
}
$arrayNextTask[++$i] = $arrayNextTaskData;
foreach ($aSecJoin as $rsj) {
$arrayNextTask[$i]["NEXT_TASK"]["ROU_PREVIOUS_TASK"] = $rsj["ROU_PREVIOUS_TASK"];
$arrayNextTask[$i]["NEXT_TASK"]["ROU_PREVIOUS_TYPE"] = "SEC-JOIN";
}
//Start-Timer with Script-task
$criteriaE = new \Criteria("workflow");
$criteriaE->addSelectColumn(\ElementTaskRelationPeer::ELEMENT_UID);
$criteriaE->addJoin(\BpmnEventPeer::EVN_UID, \ElementTaskRelationPeer::ELEMENT_UID, \Criteria::LEFT_JOIN);
$criteriaE->add(\ElementTaskRelationPeer::TAS_UID, $arrayNextTaskData["TAS_UID"], \Criteria::EQUAL);
$criteriaE->add(\BpmnEventPeer::EVN_TYPE, 'START', \Criteria::EQUAL);
$criteriaE->add(\BpmnEventPeer::EVN_MARKER, 'TIMER', \Criteria::EQUAL);
$rsCriteriaE = \AppDelegationPeer::doSelectRS($criteriaE);
$rsCriteriaE->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
while ($rsCriteriaE->next()) {
if ($arrayNextTaskData["NEXT_TASK"]["TAS_TYPE"] == "SCRIPT-TASK") {
if (isset($arrayNextTaskData["NEXT_TASK"]["USER_ASSIGNED"]["USR_UID"]) && $arrayNextTaskData["NEXT_TASK"]["USER_ASSIGNED"]["USR_UID"] == "") {
$useruid = "00000000000000000000000000000001";
$userFields = $this->getUsersFullNameFromArray($useruid);
$arrayNextTask[$i]["NEXT_TASK"]["USER_ASSIGNED"] = $userFields;
}
}
}
}
}
//1. There is no rule
if (empty($arrayNextTask)) {
$bpmn = new \ProcessMaker\Project\Bpmn();
throw new \Exception(\G::LoadTranslation(
'ID_NO_DERIVATION_' . (($bpmn->exists($arrayApplicationData['PRO_UID'])) ? 'BPMN_RULE' : 'RULE')
));
}
//Return
return $arrayNextTask;
} catch (\Exception $e) {
throw $e;
}
parent::__construct();
$this->setRegexpTaskTypeToInclude("GATEWAYTOGATEWAY|END-MESSAGE-EVENT|END-EMAIL-EVENT|SCRIPT-TASK|INTERMEDIATE-CATCH-TIMER-EVENT|INTERMEDIATE-THROW-EMAIL-EVENT");
}
public function getRouteData($arrayData, $taskUid)
public function mergeDataDerivation($post, $prepareInformation)
{
$criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\RoutePeer::TAS_UID);
$criteria->addSelectColumn(\RoutePeer::ROU_NEXT_TASK);
$criteria->addSelectColumn(\RoutePeer::ROU_TYPE);
$criteria->addSelectColumn(\RoutePeer::ROU_DEFAULT);
$criteria->addSelectColumn(\RoutePeer::ROU_CONDITION);
if ($taskUid != "") {
$criteria->add(\RoutePeer::TAS_UID, $taskUid, \Criteria::EQUAL);
$criteria->addAscendingOrderByColumn(\RoutePeer::ROU_CASE);
$rsCriteria = \RoutePeer::doSelectRS($criteria);
} else {
$criteria->addJoin(\AppDelegationPeer::TAS_UID, \TaskPeer::TAS_UID, \Criteria::LEFT_JOIN);
$criteria->addJoin(\AppDelegationPeer::TAS_UID, \RoutePeer::TAS_UID, \Criteria::LEFT_JOIN);
$criteria->add(\AppDelegationPeer::APP_UID, $arrayData["APP_UID"], \Criteria::EQUAL);
$criteria->add(\AppDelegationPeer::DEL_INDEX, $arrayData["DEL_INDEX"], \Criteria::EQUAL);
$criteria->addAscendingOrderByColumn(\RoutePeer::ROU_CASE);
$rsCriteria = \AppDelegationPeer::doSelectRS($criteria);
$iPost = count($post);
$aDataMerged = array();
$flagJumpTask = false;
foreach ($prepareInformation as $key => $nextTask) {
$aDataMerged[$key] = $nextTask['NEXT_TASK'];
unset($aDataMerged[$key]['USER_ASSIGNED']);
$aDataMerged[$key]['DEL_PRIORITY'] = '';
for ($i = 1; $i <= $iPost; $i++) {
if(isset($post[$i]['SOURCE_UID']) && ($nextTask['NEXT_TASK']['TAS_UID'] === $post[$i]['SOURCE_UID']) && ($post[$i]['SOURCE_UID'] !== $post[$i]['TAS_UID'])){
$flagJumpTask = true;
$aDataMerged[$key]['NEXT_ROUTING'][] = $post[$i];
}
}
}
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$array = array();
while ($rsCriteria->next()) {
$array[] = \G::array_merges($rsCriteria->getRow(), $arrayData);
//If flagJumpTask is false the template does not Jump Intermediate Events
if(!$flagJumpTask){
$aDataMerged = $post;
}
return $array;
}
public function executeScript($arrayRouteData, $appData)
{
//Evaluate the condition if there are conditions defined
$flagAddDelegation = true;
if (trim($arrayRouteData["ROU_CONDITION"]) != "" && $arrayRouteData["ROU_TYPE"] != "SELECT") {
\G::LoadClass("pmScript");
$pmScript = new \PMScript();
$pmScript->setFields($appData);
$pmScript->setScript($arrayRouteData["ROU_CONDITION"]);
$flagAddDelegation = $pmScript->evaluate();
}
return $flagAddDelegation;
return $aDataMerged;
}
}

2
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -2106,7 +2106,7 @@ class BpmnWorkflow extends Project\Bpmn
//Update Process
$process = \ProcessPeer::retrieveByPk($this->wp->getUid());
$arrayActionDone = ($process->getProActionDone() != '')? unserialize($process->getProActionDone()) : [];
$arrayActionDone = (!is_null($process->getProActionDone()) && $process->getProActionDone() != '')? unserialize($process->getProActionDone()) : [];
$arrayActionDone[] = $actionDone;
$this->wp->update(['PRO_ACTION_DONE' => serialize($arrayActionDone)]);