diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index 6433852fa..d5278eb8a 100644 --- a/workflow/engine/classes/class.derivation.php +++ b/workflow/engine/classes/class.derivation.php @@ -52,7 +52,7 @@ class Derivation protected $flagControlMulInstance; protected $sys; protected $context; - private $regexpTaskTypeToInclude; + protected $regexpTaskTypeToInclude; public $node; public $userLogged = null; @@ -85,7 +85,7 @@ class Derivation * * @return array Return array */ - private function prepareInformationTask(array $arrayTaskData) + protected function prepareInformationTask(array $arrayTaskData) { try { $task = new Task(); @@ -152,7 +152,7 @@ class Derivation } } - /** + /** * prepareInformation * * @param array $arrayData Data @@ -950,7 +950,15 @@ class Derivation $aSP['USR_UID'] = $nextDel['USR_UID']; } $aTask = $oTask->load( $nextDel['TAS_PARENT'] ); - $nextDel = array ('TAS_UID' => $aTask['TAS_UID'],'USR_UID' => $aSP['USR_UID'],'TAS_ASSIGN_TYPE' => $aTask['TAS_ASSIGN_TYPE'],'TAS_DEF_PROC_CODE' => $aTask['TAS_DEF_PROC_CODE'],'DEL_PRIORITY' => 3,'TAS_PARENT' => '' + $nextDel = array ( + 'TAS_UID' => $aTask['TAS_UID'], + 'USR_UID' => $aSP['USR_UID'], + 'TAS_ASSIGN_TYPE' => $aTask['TAS_ASSIGN_TYPE'], + 'TAS_DEF_PROC_CODE' => $aTask['TAS_DEF_PROC_CODE'], + 'DEL_PRIORITY' => 3, + 'TAS_PARENT' => '', + 'ROU_PREVIOUS_TYPE' => isset($nextDel['ROU_PREVIOUS_TYPE']) ? $nextDel['ROU_PREVIOUS_TYPE'] : '', + 'ROU_PREVIOUS_TASK' => isset($nextDel['ROU_PREVIOUS_TASK']) ? $nextDel['ROU_PREVIOUS_TASK'] : '' ); } else { continue; @@ -1068,7 +1076,28 @@ class Derivation switch ($routeType) { case "SEC-JOIN": $arrayOpenThread = ($flagTaskIsMultipleInstance && $flagTaskAssignTypeIsMultipleInstance)? $this->case->searchOpenPreviousTasks($currentDelegation["TAS_UID"], $currentDelegation["APP_UID"]) : array(); - $arraySiblings = $this->case->getOpenSiblingThreads($nextDel["TAS_UID"], $currentDelegation["APP_UID"], $currentDelegation["DEL_INDEX"], $currentDelegation["TAS_UID"]); + + if ( + $flagTaskIsMultipleInstance + && $flagTaskAssignTypeIsMultipleInstance + && isset($nextDel["ROU_PREVIOUS_TYPE"]) + && $nextDel["ROU_PREVIOUS_TYPE"] == 'SEC-JOIN' + ) { + $appDelegation = new AppDelegation(); + $arraySiblings = $appDelegation->getAllTasksBeforeSecJoin( + $nextDel["ROU_PREVIOUS_TASK"], + $currentDelegation["APP_UID"], + $appFields['DEL_PREVIOUS'], + 'OPEN' + ); + } else { + $arraySiblings = $this->case->getOpenSiblingThreads( + $nextDel["TAS_UID"], + $currentDelegation["APP_UID"], + $currentDelegation["DEL_INDEX"], + $currentDelegation["TAS_UID"] + ); + } if(is_array($arrayOpenThread) && is_array($arraySiblings)){ $arrayOpenThread = array_merge($arrayOpenThread, $arraySiblings); } @@ -1561,17 +1590,36 @@ class Derivation //If not is SYNCHRONOUS derivate one more time if ($aSP['SP_SYNCHRONOUS'] == 0) { $this->case->setDelInitDate( $currentDelegation['APP_UID'], $iNewDelIndex ); - $aDeriveTasks = $this->prepareInformation( array ('USER_UID' => -1,'APP_UID' => $currentDelegation['APP_UID'],'DEL_INDEX' => $iNewDelIndex - ) ); + $aDeriveTasks = $this->prepareInformation( + array ( + 'USER_UID' => -1, + 'APP_UID' => $currentDelegation['APP_UID'], + 'DEL_INDEX' => $iNewDelIndex + ) + ); if (isset($aDeriveTasks[1])) { if ($aDeriveTasks[1]['ROU_TYPE'] != 'SELECT') { $nextDelegations2 = array(); foreach ($aDeriveTasks as $aDeriveTask) { - $nextDelegations2[] = array('TAS_UID' => $aDeriveTask['NEXT_TASK']['TAS_UID'], 'USR_UID' => $aDeriveTask['NEXT_TASK']['USER_ASSIGNED']['USR_UID'], 'TAS_ASSIGN_TYPE' => $aDeriveTask['NEXT_TASK']['TAS_ASSIGN_TYPE'], 'TAS_DEF_PROC_CODE' => $aDeriveTask['NEXT_TASK']['TAS_DEF_PROC_CODE'], 'DEL_PRIORITY' => 3, 'TAS_PARENT' => $aDeriveTask['NEXT_TASK']['TAS_PARENT'] + $nextDelegations2[] = array( + 'TAS_UID' => $aDeriveTask['NEXT_TASK']['TAS_UID'], + 'USR_UID' => $aDeriveTask['NEXT_TASK']['USER_ASSIGNED']['USR_UID'], + 'TAS_ASSIGN_TYPE' => $aDeriveTask['NEXT_TASK']['TAS_ASSIGN_TYPE'], + 'TAS_DEF_PROC_CODE' => $aDeriveTask['NEXT_TASK']['TAS_DEF_PROC_CODE'], + 'DEL_PRIORITY' => 3, + 'TAS_PARENT' => $aDeriveTask['NEXT_TASK']['TAS_PARENT'], + 'ROU_PREVIOUS_TYPE' => $aDeriveTask['NEXT_TASK']['ROU_PREVIOUS_TYPE'], + 'ROU_PREVIOUS_TASK' => $aDeriveTask['NEXT_TASK']['ROU_PREVIOUS_TASK'] ); } - $currentDelegation2 = array('APP_UID' => $currentDelegation['APP_UID'], 'DEL_INDEX' => $iNewDelIndex, 'APP_STATUS' => 'TO_DO', 'TAS_UID' => $currentDelegation['TAS_UID'], 'ROU_TYPE' => $aDeriveTasks[1]['ROU_TYPE'] + $currentDelegation2 = array( + 'APP_UID' => $currentDelegation['APP_UID'], + 'DEL_INDEX' => $iNewDelIndex, + 'APP_STATUS' => 'TO_DO', + 'TAS_UID' => $currentDelegation['TAS_UID'], + 'ROU_TYPE' => $aDeriveTasks[1]['ROU_TYPE'], + ); $openThreads = 0; if ($currentDelegation2['ROU_TYPE'] == 'SEC-JOIN') { diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php index 6c95d0e57..d83282b14 100644 --- a/workflow/engine/classes/model/AppDelegation.php +++ b/workflow/engine/classes/model/AppDelegation.php @@ -851,7 +851,7 @@ class AppDelegation extends BaseAppDelegation * @param string $sAppUid * @return array $index */ - public static function getAllTasksBeforeSecJoin($nextTaskUid, $sAppUid, $sDelPrevious){ + public static function getAllTasksBeforeSecJoin($nextTaskUid, $sAppUid, $sDelPrevious, $threadStatus = ''){ $criteriaR = new Criteria('workflow'); $criteriaR->addSelectColumn(AppDelegationPeer::DEL_INDEX); $criteriaR->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS); @@ -860,6 +860,9 @@ class AppDelegation extends BaseAppDelegation $criteriaR->add(RoutePeer::ROU_TYPE, 'SEC-JOIN', Criteria::EQUAL); $criteriaR->add(AppDelegationPeer::APP_UID, $sAppUid, Criteria::EQUAL); $criteriaR->add(AppDelegationPeer::DEL_PREVIOUS, $sDelPrevious, Criteria::EQUAL); + if (!empty($threadStatus)) { + $criteriaR->add(AppDelegationPeer::DEL_THREAD_STATUS, $threadStatus, Criteria::EQUAL); + } $rsCriteriaR = RoutePeer::doSelectRS($criteriaR); $rsCriteriaR->setFetchmode(ResultSet::FETCHMODE_ASSOC); $index = array(); diff --git a/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php b/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php index 0bf763fd6..0233b89b5 100644 --- a/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php +++ b/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php @@ -2,6 +2,18 @@ namespace ProcessMaker\Core; +use AppDelegationPeer; +use Task; +use Cases; +use Criteria; +use RoutePeer; +use TaskPeer; +use G; +use ElementTaskRelationPeer; +use BpmnEventPeer; +use ResultSet; +use PMScript; +use Exception; class RoutingScreen extends \Derivation { @@ -80,7 +92,7 @@ class RoutingScreen extends \Derivation public function prepareRoutingScreen($arrayData) { - $information = $this->prepareInformation($arrayData); + $information = $this->prepareInformationForRoutingScreen($arrayData); $response = array(); $this->taskSecJoin = array(); foreach ($information as $index => $element) { @@ -141,4 +153,203 @@ class RoutingScreen extends \Derivation return count($this->convergent) == 0 || count($this->divergent) == 0 || count($this->convergent) == count($this->divergent); } + + /** + * Prepares the information to show in the routing screen. + * + * @param array $arrayData Data + * @param string $taskUid Unique id of Task + * + * @return array Return array + */ + public function prepareInformationForRoutingScreen(array $arrayData, $taskUid = "") + { + try { + if (!class_exists("Cases")) { + G::LoadClass("case"); + } + + $this->case = new Cases(); + $task = new Task(); + + $arrayApplicationData = $this->case->loadCase($arrayData["APP_UID"]); + + $arrayNextTask = array(); + $arrayNextTaskDefault = array(); + $i = 0; + + $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); + } + + $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); + + $flagDefault = false; + $aSecJoin = array(); + $count = 0; + + while ($rsCriteria->next()) { + $arrayRouteData = G::array_merges($rsCriteria->getRow(), $arrayData); + + if ((int)($arrayRouteData["ROU_DEFAULT"]) == 1) { + $arrayNextTaskDefault = $arrayRouteData; + $flagDefault = true; + continue; + } + + $flagAddDelegation = true; + + //Evaluate the condition if there are conditions defined + if (trim($arrayRouteData["ROU_CONDITION"]) != "" && $arrayRouteData["ROU_TYPE"] != "SELECT") { + G::LoadClass("pmScript"); + + $pmScript = new PMScript(); + $pmScript->setFields($arrayApplicationData["APP_DATA"]); + $pmScript->setScript($arrayRouteData["ROU_CONDITION"]); + $flagAddDelegation = $pmScript->evaluate(); + } + + 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 (count($arrayNextTask) == 0 && 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; + $this->node[$value['TAS_UID']]['out'][$value['ROU_NEXT_TASK']] = $value['ROU_TYPE']; + if ($arrayNextTaskData["NEXT_TASK"]["TAS_UID"] != "-1" && + preg_match("/^(?:" . $this->regexpTaskTypeToInclude . ")$/", $arrayNextTaskData["NEXT_TASK"]["TAS_TYPE"]) + ) { + $arrayAux = $this->prepareInformationForRoutingScreen($arrayData, $arrayNextTaskData["NEXT_TASK"]["TAS_UID"]); + $this->node[$value['ROU_NEXT_TASK']]['in'][$value['TAS_UID']] = $value['ROU_TYPE']; + $notShowNextTaskWhenJoinOf = "INTERMEDIATE-THROW-MESSAGE-EVENT|INTERMEDIATE-CATCH-MESSAGE-EVENT|SCRIPT-TASK|INTERMEDIATE-CATCH-TIMER-EVENT|INTERMEDIATE-THROW-EMAIL-EVENT"; + + foreach ($arrayAux as $value2) { + + //@TODO move this logic to the prepareInformation of the Derivation class + $intermediateEventAndJoinPresent = (array_key_exists('TAS_TYPE', $value2) + && array_key_exists('ROU_TYPE', $value2) + && preg_match("/^(?:" . $notShowNextTaskWhenJoinOf . ")$/", $value2["TAS_TYPE"]) + && $value2['ROU_TYPE'] === 'SEC-JOIN'); + if (!$intermediateEventAndJoinPresent) { + $key = ++$i; + $arrayNextTask[$key] = $value2; + $prefix = substr($value['ROU_NEXT_TASK'], 0, 4); + if ($prefix!=='gtg-') { + $arrayNextTask[$key]['SOURCE_UID'] = $value['ROU_NEXT_TASK']; + } + 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"]; + } + $prefix = substr($value['ROU_NEXT_TASK'], 0, 4); + if($prefix!=='gtg-'){ + $arrayNextTaskData['SOURCE_UID'] = $value['ROU_NEXT_TASK']; + } + $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; + } + } + + } \ No newline at end of file