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

CR corrections

Browse Source
This commit is contained in:
Dante
2017-03-09 17:34:51 -04:00
parent aac96f1535
commit 86eb058f15
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
workflow/engine/classes/class.case.php
View File

@@ -1236,19 +1236,22 @@ class Cases
public function multiInstanceIsCompleted($appUid, $tasUid, $previousDelIndex) public function multiInstanceIsCompleted($appUid, $tasUid, $previousDelIndex)
{ {
$result = false;
try { try {
$c = new Criteria(); $c = new Criteria();
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->addSelectColumn('COUNT(*)');
$c->add(AppDelegationPeer::APP_UID, $appUid); $c->add(AppDelegationPeer::APP_UID, $appUid);
$c->add(AppDelegationPeer::TAS_UID, $tasUid); $c->add(AppDelegationPeer::TAS_UID, $tasUid);
$c->add(AppDelegationPeer::DEL_PREVIOUS, $previousDelIndex); $c->add(AppDelegationPeer::DEL_PREVIOUS, $previousDelIndex);
$c->add(AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN'); $c->add(AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN');
$rs = AppDelegationPeer::doSelectRs($c); $rs = AppDelegationPeer::doSelectRs($c);
$rs->next();
$row = $rs->getRow(); if ($rs->next()) {
//if no open threads exists, the multiinstance is completes $result = false;
return intval($row[0]) === 0; } else {
$result = true;
}
} catch (exception $e) { } catch (exception $e) {
throw ($e); throw ($e);
} }

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

@@ -1015,11 +1015,10 @@ class Derivation
//is triggered: //is triggered:
if (isset($nextDel["TAS_UID_DUMMY"]) && $flagTaskAssignTypeIsMultipleInstance) { if (isset($nextDel["TAS_UID_DUMMY"]) && $flagTaskAssignTypeIsMultipleInstance) {
$taskDummy = TaskPeer::retrieveByPK($nextDel["TAS_UID_DUMMY"]); $taskDummy = TaskPeer::retrieveByPK($nextDel["TAS_UID_DUMMY"]);
$currentDeltegionAllData = AppDelegationPeer::retrieveByPK($currentDelegation['APP_UID'], $currentDelegation['DEL_INDEX']); if ($this->case->multiInstanceIsCompleted($appFields['APP_UID'],
if ($this->case->multiInstanceIsCompleted($currentDeltegionAllData->getAppUid(), $appFields['TAS_UID'],
$currentDeltegionAllData->getTasUid(), $appFields['DEL_PREVIOUS'])
$currentDeltegionAllData->getDelPrevious() && preg_match("/^(?:END-MESSAGE-EVENT|END-EMAIL-EVENT)$/", $taskDummy->getTasType())) {
&& preg_match("/^(?:END-MESSAGE-EVENT|END-EMAIL-EVENT)$/", $taskDummy->getTasType()))) {
$this->executeEvent($nextDel["TAS_UID_DUMMY"], $appFields, $flagFirstIteration, true); $this->executeEvent($nextDel["TAS_UID_DUMMY"], $appFields, $flagFirstIteration, true);
} }
} }