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

HOR-2441

Browse Source
This commit is contained in:
Paula Quispe
2017-01-06 11:58:24 -04:00
parent c46300d406
commit 28477a6667
3 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
workflow/engine/classes/model/ListInbox.php
View File

@@ -336,6 +336,8 @@ class ListInbox extends BaseListInbox
public function loadFilters (&$criteria, $filters)
{
$action = isset($filters['action']) ? $filters['action'] : "";
$usrUid = isset($filters['usr_uid']) ? $filters['usr_uid'] : "";
$filter = isset($filters['filter']) ? $filters['filter'] : "";
$search = isset($filters['search']) ? $filters['search'] : "";
$process = isset($filters['process']) ? $filters['process'] : "";
@@ -346,6 +348,29 @@ class ListInbox extends BaseListInbox
$newestthan = isset($filters['newestthan'] ) ? $filters['newestthan'] : '';
$oldestthan = isset($filters['oldestthan'] ) ? $filters['oldestthan'] : '';
switch ($action) {
case 'draft':
$criteria->add( ListInboxPeer::APP_STATUS, 'DRAFT', Criteria::EQUAL );
$criteria->add( ListInboxPeer::USR_UID, $usrUid, Criteria::EQUAL );
break;
case 'to_revise':
$criteria->add( ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL );
$oAppCache = new AppCacheView();
$aProcesses = $oAppCache->getProUidSupervisor($usrUid);
$criteria->add(ListInboxPeer::PRO_UID, $aProcesses, Criteria::IN);
break;
case 'to_reassign':
$criteria->add( ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL );
if($usrUid !== ''){
$criteria->add( ListInboxPeer::USR_UID, $usrUid, Criteria::EQUAL );
}
break;
default://todo
$criteria->add( ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL );
$criteria->add( ListInboxPeer::USR_UID, $usrUid, Criteria::EQUAL );
break;
}
if ($filter != '') {
switch ($filter) {
case 'read':
@@ -430,13 +455,9 @@ class ListInbox extends BaseListInbox
public function countTotal ($usr_uid, $filters = array())
{
$filters['usr_uid'] = $usr_uid;
$criteria = new Criteria();
$criteria->add( ListInboxPeer::USR_UID, $usr_uid, Criteria::EQUAL );
if ($filters['action'] == 'draft') {
$criteria->add( ListInboxPeer::APP_STATUS, 'DRAFT', Criteria::EQUAL );
} else {
$criteria->add( ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL );
}
self::loadFilters($criteria, $filters);
$total = ListInboxPeer::doCount( $criteria );
return (int)$total;
@@ -454,6 +475,8 @@ class ListInbox extends BaseListInbox
$pmTable = new PmTable();
$criteria = $pmTable->addPMFieldsToList('todo');
$filters['usr_uid'] = $usr_uid;
$criteria->addSelectColumn(ListInboxPeer::APP_UID);
$criteria->addSelectColumn(ListInboxPeer::DEL_INDEX);
$criteria->addSelectColumn(ListInboxPeer::USR_UID);
@@ -479,7 +502,6 @@ class ListInbox extends BaseListInbox
$criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
$criteria->addSelectColumn(UsersPeer::USR_USERNAME);
$criteria->addJoin( ListInboxPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN );
$criteria->add( ListInboxPeer::USR_UID, $usr_uid, Criteria::EQUAL );
self::loadFilters($criteria, $filters);
$sort = (!empty($filters['sort'])) ? ListInboxPeer::TABLE_NAME.'.'.$filters['sort'] : "LIST_INBOX.APP_UPDATE_DATE";
@@ -488,12 +510,6 @@ class ListInbox extends BaseListInbox
$limit = isset($filters['limit']) ? $filters['limit'] : "25";
$paged = isset($filters['paged']) ? $filters['paged'] : 1;
if ($filters['action'] == 'draft') {
$criteria->add( ListInboxPeer::APP_STATUS, 'DRAFT', Criteria::EQUAL );
} else {
$criteria->add( ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL );
}
if ($dir == "DESC") {
$criteria->addDescendingOrderByColumn($sort);
} else {

4
workflow/engine/methods/cases/casesListExtJs.php
View File

@@ -47,10 +47,10 @@ switch ($action) {
$urlProxy .= '?list=unassigned';
break;
case 'to_revise':
$urlProxy = 'proxyCasesList';
$urlProxy .= '?list=inbox';
break;
case 'to_reassign':
$urlProxy = 'proxyCasesList';
$urlProxy .= '?list=inbox';
break;
}
/*----------------------------------********---------------------------------*/

11
workflow/engine/methods/cases/proxyNewCasesList.php
View File

@@ -31,11 +31,22 @@ try {
$filters['dir'] = isset( $_REQUEST["dir"] ) ? $filter->sanitizeInputValue($_REQUEST["dir"], 'nosql') : "DESC";
$filters['action'] = isset( $_REQUEST["action"] ) ? $filter->sanitizeInputValue($_REQUEST["action"], 'nosql') : "";
$filters['user'] = isset( $_REQUEST["user"] ) ? $filter->sanitizeInputValue($_REQUEST["user"], 'nosql') : "";
$listName = isset( $_REQUEST["list"] ) ? $filter->sanitizeInputValue($_REQUEST["list"], 'nosql') : "inbox";
$filters['filterStatus'] = isset( $_REQUEST["filterStatus"] ) ? $filter->sanitizeInputValue($_REQUEST["filterStatus"], 'nosql') : "";
$openApplicationUid = (isset($_REQUEST['openApplicationUid']) && $_REQUEST['openApplicationUid'] != '')?
$_REQUEST['openApplicationUid'] : null;
//Define user when is reassign
if($filters['action'] == 'to_reassign') {
if($filters['user'] == '' ){
$userUid = '';
}
if($filters['user'] !== '' && $filters['user'] !== 'CURRENT_USER'){
$userUid = $filters['user'];
}
}
// Select list
switch ($listName) {
case 'inbox':