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

PM-1915: Adicion de field delStatus para indicar el hilo pausado

Browse Source
This commit is contained in:
Brayan Pereyra
2015-04-15 12:49:47 -04:00
parent 15404d0970
commit 43c1f2ed2d
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
workflow/engine/classes/class.wsBase.php
View File

@@ -1051,6 +1051,21 @@ class wsBase
$result->createDate = $aRows['CREATE_DATE']; $result->createDate = $aRows['CREATE_DATE'];
$result->updateDate = $aRows['UPDATE_DATE']; $result->updateDate = $aRows['UPDATE_DATE'];
//now fill the array of AppDelay
$oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( AppDelayPeer::APP_DEL_INDEX );
$oCriteria->add( AppDelayPeer::APP_UID, $caseId );
$oCriteria->add( AppDelayPeer::APP_TYPE, 'PAUSE' );
$oCriteria->add( AppDelayPeer::APP_DISABLE_ACTION_USER, '0' );
$oDataset = AppDelayPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$aIndexsPaused = array();
while ($oDataset->next()) {
$data = $oDataset->getRow();
$aIndexsPaused[] = $data['APP_DEL_INDEX'];
}
//now fill the array of AppDelegationPeer //now fill the array of AppDelegationPeer
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( AppDelegationPeer::DEL_INDEX ); $oCriteria->addSelectColumn( AppDelegationPeer::DEL_INDEX );
@@ -1063,8 +1078,11 @@ class wsBase
$oCriteria->addSelectColumn(AppDelegationPeer::DEL_TASK_DUE_DATE); $oCriteria->addSelectColumn(AppDelegationPeer::DEL_TASK_DUE_DATE);
$oCriteria->add( AppDelegationPeer::APP_UID, $caseId ); $oCriteria->add( AppDelegationPeer::APP_UID, $caseId );
if ($flagUseDelIndex) { if (count($aIndexsPaused)) {
$oCriteria->add(AppDelegationPeer::DEL_INDEX, $iDelIndex, Criteria::EQUAL); $cton1 = $oCriteria->getNewCriterion( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL);
$cton2 = $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INDEX, $aIndexsPaused, Criteria::IN );
$cton1->addOR( $cton2 );
$oCriteria->add( $cton1 );
} else { } else {
$oCriteria->add(AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL); $oCriteria->add(AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL);
} }
@@ -1105,6 +1123,7 @@ class wsBase
$currentUser->delIndex = $aAppDel['DEL_INDEX']; $currentUser->delIndex = $aAppDel['DEL_INDEX'];
$currentUser->delThread = $aAppDel['DEL_THREAD']; $currentUser->delThread = $aAppDel['DEL_THREAD'];
$currentUser->delThreadStatus = $aAppDel['DEL_THREAD_STATUS']; $currentUser->delThreadStatus = $aAppDel['DEL_THREAD_STATUS'];
$currentUser->delStatus = ($aAppDel["DEL_THREAD_STATUS"] == 'CLOSED') ? 'PAUSED' : $aRows['APP_STATUS'];
$currentUser->delInitDate = $aAppDel["DEL_INIT_DATE"]; $currentUser->delInitDate = $aAppDel["DEL_INIT_DATE"];
$currentUser->delTaskDueDate = $aAppDel["DEL_TASK_DUE_DATE"]; $currentUser->delTaskDueDate = $aAppDel["DEL_TASK_DUE_DATE"];
$aCurrentUsers[] = $currentUser; $aCurrentUsers[] = $currentUser;

19
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -449,24 +449,9 @@ class Cases
} }
//Get data //Get data
$arrayStatusInfo = $this->getStatusInfo($applicationUid);
$applicationStatus = "";
$delIndex = 0;
$flagUseDelIndex = false;
if (count($arrayStatusInfo) > 0) {
$applicationStatus = $arrayStatusInfo["APP_STATUS"];
$delIndex = $arrayStatusInfo["DEL_INDEX"];
if (in_array($applicationStatus, array("DRAFT", "PAUSED", "CANCELLED"))) {
$flagUseDelIndex = true;
}
}
$ws = new \wsBase(); $ws = new \wsBase();
$fields = $ws->getCaseInfo($applicationUid, $delIndex, $flagUseDelIndex); $fields = $ws->getCaseInfo($applicationUid, 0);
$array = json_decode(json_encode($fields), true); $array = json_decode(json_encode($fields), true);
if ($array ["status_code"] != 0) { if ($array ["status_code"] != 0) {
@@ -475,7 +460,7 @@ class Cases
$array['app_uid'] = $array['caseId']; $array['app_uid'] = $array['caseId'];
$array['app_number'] = $array['caseNumber']; $array['app_number'] = $array['caseNumber'];
$array['app_name'] = $array['caseName']; $array['app_name'] = $array['caseName'];
$array["app_status"] = ($applicationStatus != "")? $applicationStatus : $array["caseStatus"]; $array["app_status"] = $array["caseStatus"];
$array['app_init_usr_uid'] = $array['caseCreatorUser']; $array['app_init_usr_uid'] = $array['caseCreatorUser'];
$array['app_init_usr_username'] = trim($array['caseCreatorUserName']); $array['app_init_usr_username'] = trim($array['caseCreatorUserName']);
$array['pro_uid'] = $array['processId']; $array['pro_uid'] = $array['processId'];