fernando/luos
1
0
Fork 0
Code Releases Activity

HOR-4408

Browse Source
This commit is contained in:
Paula Quispe
2018-03-07 16:01:39 -04:00
parent c480a8b65e 8901d064d3
commit bfed67d0c2
301 changed files with 64229 additions and 68335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
workflow/engine/classes/model/ListUnassigned.php
View File

@@ -15,9 +15,10 @@ require_once 'classes/model/om/BaseListUnassigned.php';
* @package classes.model
*/
// @codingStandardsIgnoreStart
class ListUnassigned extends BaseListUnassigned
class ListUnassigned extends BaseListUnassigned implements ListInterface
{
private $additionalClassName = '';
use ListBaseTrait;
private $total = 0;
/**
@@ -192,7 +193,7 @@ class ListUnassigned extends BaseListUnassigned
} else {
//If we have additional tables configured in the custom cases list, prepare the variables for search
$casesList = new \ProcessMaker\BusinessModel\Cases();
$casesList->getSearchCriteriaListCases($criteria, __CLASS__ . 'Peer', $search, $this->additionalClassName, $additionalColumns);
$casesList->getSearchCriteriaListCases($criteria, __CLASS__ . 'Peer', $search, $this->getAdditionalClassName(), $additionalColumns);
}
}
@@ -241,7 +242,7 @@ class ListUnassigned extends BaseListUnassigned
{
$pmTable = new PmTable();
$criteria = $pmTable->addPMFieldsToList('unassigned');
$this->additionalClassName = $pmTable->tableClassName;
$this->setAdditionalClassName($pmTable->tableClassName);
$additionalColumns = $criteria->getSelectColumns();
$criteria->addSelectColumn(ListUnassignedPeer::APP_UID);
@@ -273,8 +274,9 @@ class ListUnassigned extends BaseListUnassigned
BasePeer::TYPE_FIELDNAME,
empty($filters['sort']) ? "DEL_DELEGATE_DATE" : $filters['sort'],
"DEL_DELEGATE_DATE",
$this->additionalClassName,
$additionalColumns
$this->getAdditionalClassName(),
$additionalColumns,
$this->getUserDisplayFormat()
);
$dir = isset($filters['dir']) ? $filters['dir'] : "ASC";
@@ -282,10 +284,20 @@ class ListUnassigned extends BaseListUnassigned
$limit = isset($filters['limit']) ? $filters['limit'] : "25";
$paged = isset($filters['paged']) ? $filters['paged'] : 1;
$count = isset($filters['count']) ? $filters['count'] : 1;
if ($dir == "DESC") {
$criteria->addDescendingOrderByColumn($sort);
if (is_array($sort) && count($sort) > 0) {
foreach ($sort as $key) {
if ($dir == 'DESC') {
$criteria->addDescendingOrderByColumn($key);
} else {
$criteria->addAscendingOrderByColumn($key);
}
}
} else {
$criteria->addAscendingOrderByColumn($sort);
if ($dir == 'DESC') {
$criteria->addDescendingOrderByColumn($sort);
} else {
$criteria->addAscendingOrderByColumn($sort);
}
}
$this->total = ListUnassignedPeer::doCount($criteria);
if ($paged == 1) {
@@ -364,14 +376,17 @@ class ListUnassigned extends BaseListUnassigned
}
/**
* get user's SelfService tasks
* Get user's SelfService tasks
*
* @param string $userUid
* @param boolean $adHocUsers
*
* @return array $tasks
*/
public function getSelfServiceTasks($userUid = '')
public function getSelfServiceTasks($userUid = '', $adHocUsers = false)
{
$rows[] = array();
$tasks = array();
$rows[] = [];
$tasks = [];
//check self service tasks assigned directly to this user
$c = new Criteria();
@@ -384,6 +399,10 @@ class ListUnassigned extends BaseListUnassigned
$c->add(TaskPeer::TAS_ASSIGN_TYPE, 'SELF_SERVICE');
$c->add(TaskPeer::TAS_GROUP_VARIABLE, '');
$c->add(TaskUserPeer::USR_UID, $userUid);
//TU_TYPE = 2 is a AdHoc task
if (!$adHocUsers) {
$c->add(TaskUserPeer::TU_TYPE, 1);
}
$rs = TaskPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -397,7 +416,7 @@ class ListUnassigned extends BaseListUnassigned
}
$group = new Groups();
$aGroups = $group->getActiveGroupsForAnUser($userUid);
$groupsList = $group->getActiveGroupsForAnUser($userUid);
$c = new Criteria();
$c->clearSelectColumns();
@@ -408,7 +427,11 @@ class ListUnassigned extends BaseListUnassigned
$c->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
$c->add(TaskPeer::TAS_ASSIGN_TYPE, 'SELF_SERVICE');
$c->add(TaskPeer::TAS_GROUP_VARIABLE, '');
$c->add(TaskUserPeer::USR_UID, $aGroups, Criteria::IN);
$c->add(TaskUserPeer::USR_UID, $groupsList, Criteria::IN);
//TU_TYPE = 2 is a AdHoc task
if (!$adHocUsers) {
$c->add(TaskUserPeer::TU_TYPE, 1);
}
$rs = TaskPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);