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

PMCORE-2687

Browse Source
This commit is contained in:
Paula Quispe
2021-01-08 12:23:17 -04:00
parent f5d434ffdf
commit 322b5e9837
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
workflow/engine/classes/Cases.php
View File

@@ -228,9 +228,9 @@ class Cases
*/ */
public function getStartCasesPerType($sUIDUser = '', $typeView = null) public function getStartCasesPerType($sUIDUser = '', $typeView = null)
{ {
$rows[] = array('uid' => 'char', 'value' => 'char'); $rows[] = ['uid' => 'char', 'value' => 'char'];
$tasks = array(); $tasks = [];
$arrayTaskTypeToExclude = array( $arrayTaskTypeToExclude = [
"WEBENTRYEVENT", "WEBENTRYEVENT",
"END-MESSAGE-EVENT", "END-MESSAGE-EVENT",
"START-MESSAGE-EVENT", "START-MESSAGE-EVENT",
@@ -239,9 +239,9 @@ class Cases
"SCRIPT-TASK", "SCRIPT-TASK",
"START-TIMER-EVENT", "START-TIMER-EVENT",
"INTERMEDIATE-CATCH-TIMER-EVENT" "INTERMEDIATE-CATCH-TIMER-EVENT"
); ];
$webEntryEvent = new WebEntryEvent(); $webEntryEvent = new WebEntryEvent();
$arrayWebEntryEvent = array(); $arrayWebEntryEvent = [];
// Set the parameter $considerShowInCase=true, to consider the WE_SHOW_IN_CASE // Set the parameter $considerShowInCase=true, to consider the WE_SHOW_IN_CASE
// configuration to filter the Start events with WebEntry. // configuration to filter the Start events with WebEntry.
$allWebEntryEvents = $webEntryEvent->getAllWebEntryEvents(true); $allWebEntryEvents = $webEntryEvent->getAllWebEntryEvents(true);
@@ -300,16 +300,17 @@ class Cases
$c->addSelectColumn(TaskPeer::TAS_TITLE); $c->addSelectColumn(TaskPeer::TAS_TITLE);
$c->addSelectColumn(TaskPeer::PRO_UID); $c->addSelectColumn(TaskPeer::PRO_UID);
$c->addSelectColumn(ProcessPeer::PRO_TITLE); $c->addSelectColumn(ProcessPeer::PRO_TITLE);
$c->addSelectColumn(ProcessPeer::PRO_DESCRIPTION);
if ($typeView == 'category') { if ($typeView == 'category') {
$c->addAsColumn('PRO_CATEGORY', 'PCS.PRO_CATEGORY'); $c->addAsColumn('PRO_CATEGORY', 'PCS.PRO_CATEGORY');
$c->addAsColumn('CATEGORY_NAME', 'PCSCAT.CATEGORY_NAME'); $c->addAsColumn('CATEGORY_NAME', 'PCSCAT.CATEGORY_NAME');
$c->addAlias('PCS', 'PROCESS'); $c->addAlias('PCS', 'PROCESS');
$c->addAlias('PCSCAT', 'PROCESS_CATEGORY'); $c->addAlias('PCSCAT', 'PROCESS_CATEGORY');
$aConditions = array(); $aConditions = [];
$aConditions[] = array(TaskPeer::PRO_UID, 'PCS.PRO_UID'); $aConditions[] = [TaskPeer::PRO_UID, 'PCS.PRO_UID'];
$c->addJoinMC($aConditions, Criteria::LEFT_JOIN); $c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$aConditions = array(); $aConditions = [];
$aConditions[] = array('PCS.PRO_CATEGORY', 'PCSCAT.CATEGORY_UID'); $aConditions[] = ['PCS.PRO_CATEGORY', 'PCSCAT.CATEGORY_UID'];
$c->addJoinMC($aConditions, Criteria::LEFT_JOIN); $c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
} }
$c->addJoin(TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $c->addJoin(TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
@@ -333,19 +334,21 @@ class Cases
$row['TAS_TITLE'] = $taskTitle->getTasTitle(); $row['TAS_TITLE'] = $taskTitle->getTasTitle();
$row['CATEGORY_NAME'] = ($row['CATEGORY_NAME'] == '') ? $row['CATEGORY_NAME'] = ($row['CATEGORY_NAME'] == '') ?
G::LoadTranslation('ID_PROCESS_NOCATEGORY') : $row['CATEGORY_NAME']; G::LoadTranslation('ID_PROCESS_NOCATEGORY') : $row['CATEGORY_NAME'];
$rows[] = array( $rows[] = [
'uid' => $row['TAS_UID'], 'uid' => $row['TAS_UID'],
'value' => $row['PRO_TITLE'] . ' (' . $taskTitleLabel . ')', 'value' => $row['PRO_TITLE'] . ' (' . $taskTitleLabel . ')',
'pro_uid' => $row['PRO_UID'], 'pro_uid' => $row['PRO_UID'],
'pro_description' => $row['PRO_DESCRIPTION'],
'cat' => $row['PRO_CATEGORY'], 'cat' => $row['PRO_CATEGORY'],
'catname' => $row['CATEGORY_NAME'] 'catname' => $row['CATEGORY_NAME']
); ];
} else { } else {
$rows[] = array( $rows[] = [
'uid' => $row['TAS_UID'], 'uid' => $row['TAS_UID'],
'value' => $row['PRO_TITLE'] . ' (' . $taskTitleLabel . ')', 'value' => $row['PRO_TITLE'] . ' (' . $taskTitleLabel . ')',
'pro_uid' => $row['PRO_UID'] 'pro_uid' => $row['PRO_UID'],
); 'pro_description' => $row['PRO_DESCRIPTION']
];
} }
$rs->next(); $rs->next();
$row = $rs->getRow(); $row = $rs->getRow();
@@ -7344,24 +7347,26 @@ class Cases
$canStart = $this->canStartCase($usrUid); $canStart = $this->canStartCase($usrUid);
if ($canStart) { if ($canStart) {
$processList = array(); $processList = [];
$list = $this->getStartCasesPerType($usrUid, $typeView); $list = $this->getStartCasesPerType($usrUid, $typeView);
foreach ($list as $index => $row) { foreach ($list as $index => $row) {
if (!empty($row['pro_uid'])) { if (!empty($row['pro_uid'])) {
if ($typeView == 'category') { if ($typeView == 'category') {
$processList[] = array( $processList[] = [
'tas_uid' => $row['uid'], 'tas_uid' => $row['uid'],
'pro_title' => $row['value'], 'pro_title' => $row['value'],
'pro_uid' => $row['pro_uid'], 'pro_uid' => $row['pro_uid'],
'pro_description' => $row['pro_description'],
'pro_category' => $row['cat'], 'pro_category' => $row['cat'],
'category_name' => $row['catname'] 'category_name' => $row['catname']
); ];
} else { } else {
$processList[] = array( $processList[] = [
'tas_uid' => $row['uid'], 'tas_uid' => $row['uid'],
'pro_title' => $row['value'], 'pro_title' => $row['value'],
'pro_uid' => $row['pro_uid'] 'pro_uid' => $row['pro_uid'],
); 'pro_description' => $row['pro_description']
];
} }
} }
} }