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

HOR-1377

Browse Source
This commit is contained in:
Paula V. Quispe
2016-06-30 09:31:34 -04:00
parent 9e95b10463
commit 51d4ea460d
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1541,6 +1541,10 @@ class Cases
//If exist paused cases //If exist paused cases
$closedTasks[] = $row; $closedTasks[] = $row;
$aIndex[] = $row['DEL_INDEX']; $aIndex[] = $row['DEL_INDEX'];
$res = $this->GetAllOpenDelegation( array('APP_UID'=>$sAppUid, 'APP_THREAD_PARENT'=>$row['DEL_PREVIOUS']), 'NONE' );
foreach ($res as $in) {
$aIndex[] = $in['DEL_INDEX'];
}
$pausedTasks = $this->getReviewedTasksPaused($sAppUid,$aIndex); $pausedTasks = $this->getReviewedTasksPaused($sAppUid,$aIndex);
} }
} }
@@ -7094,14 +7098,16 @@ class Cases
* @return $aThreads * @return $aThreads
*/ */
public function GetAllOpenDelegation($aData) public function GetAllOpenDelegation($aData, $status = 'OPEN')
{ {
try { try {
$aThreads = array(); $aThreads = array();
$c = new Criteria(); $c = new Criteria();
$c->add(AppDelegationPeer::APP_UID, $aData['APP_UID']); $c->add(AppDelegationPeer::APP_UID, $aData['APP_UID']);
$c->add(AppDelegationPeer::DEL_PREVIOUS, $aData['APP_THREAD_PARENT']); $c->add(AppDelegationPeer::DEL_PREVIOUS, $aData['APP_THREAD_PARENT']);
$c->add(AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN'); if($status === 'OPEN'){
$c->add(AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN');
}
$rs = AppDelegationPeer::doSelectRs($c); $rs = AppDelegationPeer::doSelectRs($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rs->next(); $rs->next();

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

@@ -1169,6 +1169,10 @@ class Derivation
if(isset($nextDel["ROU_PREVIOUS_TYPE"])){ if(isset($nextDel["ROU_PREVIOUS_TYPE"])){
if($nextDel["ROU_PREVIOUS_TYPE"] == "SEC-JOIN"){ if($nextDel["ROU_PREVIOUS_TYPE"] == "SEC-JOIN"){
$arrayOpenThread = $this->case->searchOpenPreviousTasks($nextDel["ROU_PREVIOUS_TASK"], $currentDelegation["APP_UID"]); $arrayOpenThread = $this->case->searchOpenPreviousTasks($nextDel["ROU_PREVIOUS_TASK"], $currentDelegation["APP_UID"]);
$arraySiblings = $this->case->getOpenSiblingThreads($nextDel["ROU_PREVIOUS_TASK"], $currentDelegation["APP_UID"], $currentDelegation["DEL_INDEX"], $currentDelegation["TAS_UID"]);
if(is_array($arrayOpenThread) && is_array($arraySiblings)){
$arrayOpenThread = array_merge($arrayOpenThread, $arraySiblings);
}
$canDerivate = empty($arrayOpenThread); $canDerivate = empty($arrayOpenThread);
} }
} }