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

HOR-2814: Observations related to search with APP_UID

Browse Source
This commit is contained in:
Paula Quispe
2017-05-31 10:53:22 -04:00
parent e815883262
commit 61a3b373f4
4 changed files with 155 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -394,15 +394,16 @@ class ListInbox extends BaseListInbox
*/ */
public function loadFilters(&$criteria, $filters, $additionalColumns = array()) public function loadFilters(&$criteria, $filters, $additionalColumns = array())
{ {
$action = isset($filters['action']) ? $filters['action'] : ""; $action = isset($filters['action']) ? $filters['action'] : '';
$usrUid = isset($filters['usr_uid']) ? $filters['usr_uid'] : ""; $usrUid = isset($filters['usr_uid']) ? $filters['usr_uid'] : '';
$filter = isset($filters['filter']) ? $filters['filter'] : ""; $filter = isset($filters['filter']) ? $filters['filter'] : '';
$search = isset($filters['search']) ? $filters['search'] : ""; $search = isset($filters['search']) ? $filters['search'] : '';
$process = isset($filters['process']) ? $filters['process'] : ""; $caseLink = isset($filters['caseLink']) ? $filters['caseLink'] : '';
$category = isset($filters['category']) ? $filters['category'] : ""; $process = isset($filters['process']) ? $filters['process'] : '';
$dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : ""; $category = isset($filters['category']) ? $filters['category'] : '';
$dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : ""; $dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : '';
$filterStatus = isset($filters['filterStatus']) ? $filters['filterStatus'] : ""; $dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : '';
$filterStatus = isset($filters['filterStatus']) ? $filters['filterStatus'] : '';
$newestthan = isset($filters['newestthan']) ? $filters['newestthan'] : ''; $newestthan = isset($filters['newestthan']) ? $filters['newestthan'] : '';
$oldestthan = isset($filters['oldestthan']) ? $filters['oldestthan'] : ''; $oldestthan = isset($filters['oldestthan']) ? $filters['oldestthan'] : '';
@@ -471,6 +472,10 @@ class ListInbox extends BaseListInbox
//Filter Search //Filter Search
if ($search != '') { if ($search != '') {
//Check if we need to search to the APP_UID
if (!empty($caseLink)) {
$criteria->add(ListInboxPeer::APP_UID, $search, Criteria::EQUAL);
} else {
$oTmpCriteria = ''; $oTmpCriteria = '';
//If we have additional tables configured in the custom cases list, prepare the variables for search //If we have additional tables configured in the custom cases list, prepare the variables for search
if (count($additionalColumns) > 0) { if (count($additionalColumns) > 0) {
@@ -486,41 +491,23 @@ class ListInbox extends BaseListInbox
if (!empty($oTmpCriteria)) { if (!empty($oTmpCriteria)) {
$criteria->add( $criteria->add(
$criteria->getNewCriterion(ListInboxPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListInboxPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
->addOr( $criteria->getNewCriterion(ListInboxPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
$criteria->getNewCriterion(ListInboxPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListInboxPeer::APP_PRO_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
->addOr( $criteria->getNewCriterion(ListInboxPeer::APP_NUMBER, $search, Criteria::EQUAL)->addOr(
$criteria->getNewCriterion(ListInboxPeer::APP_PRO_TITLE, '%' . $search . '%', Criteria::LIKE)
->addOr(
$criteria->getNewCriterion(ListInboxPeer::APP_UID, $search, Criteria::EQUAL)
->addOr(
$criteria->getNewCriterion(ListInboxPeer::APP_NUMBER, $search, Criteria::EQUAL)
->addOr(
$oTmpCriteria $oTmpCriteria
) ))))
)
)
)
)
); );
} else { } else {
$criteria->add( $criteria->add(
$criteria->getNewCriterion(ListInboxPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListInboxPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
->addOr( $criteria->getNewCriterion(ListInboxPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
$criteria->getNewCriterion(ListInboxPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListInboxPeer::APP_PRO_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
->addOr( $criteria->getNewCriterion(ListInboxPeer::APP_NUMBER, $search, Criteria::EQUAL))))
$criteria->getNewCriterion(ListInboxPeer::APP_PRO_TITLE, '%' . $search . '%', Criteria::LIKE)
->addOr(
$criteria->getNewCriterion(ListInboxPeer::APP_UID, $search, Criteria::EQUAL)
->addOr(
$criteria->getNewCriterion(ListInboxPeer::APP_NUMBER, $search, Criteria::EQUAL)
)
)
)
)
); );
} }
} }
}
//Filter Process Id //Filter Process Id
if ($process != '') { if ($process != '') {

38
workflow/engine/classes/model/ListParticipatedLast.php
View File

@@ -246,6 +246,7 @@ class ListParticipatedLast extends BaseListParticipatedLast
{ {
$filter = isset($filters['filter']) ? $filters['filter'] : ''; $filter = isset($filters['filter']) ? $filters['filter'] : '';
$search = isset($filters['search']) ? $filters['search'] : ''; $search = isset($filters['search']) ? $filters['search'] : '';
$caseLink = isset($filters['caseLink']) ? $filters['caseLink'] : '';
$process = isset($filters['process']) ? $filters['process'] : ''; $process = isset($filters['process']) ? $filters['process'] : '';
$category = isset($filters['category']) ? $filters['category'] : ''; $category = isset($filters['category']) ? $filters['category'] : '';
$dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : ''; $dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : '';
@@ -281,6 +282,10 @@ class ListParticipatedLast extends BaseListParticipatedLast
//Filter Search //Filter Search
if ($search != '') { if ($search != '') {
//Check if we need to search to the APP_UID
if (!empty($caseLink)) {
$criteria->add(ListParticipatedLastPeer::APP_UID, $search, Criteria::EQUAL);
} else {
//If we have additional tables configured in the custom cases list, prepare the variables for search //If we have additional tables configured in the custom cases list, prepare the variables for search
if (count($additionalColumns) > 0) { if (count($additionalColumns) > 0) {
require_once(PATH_DATA_SITE . 'classes' . PATH_SEP . $this->additionalClassName . '.php'); require_once(PATH_DATA_SITE . 'classes' . PATH_SEP . $this->additionalClassName . '.php');
@@ -295,36 +300,23 @@ class ListParticipatedLast extends BaseListParticipatedLast
if (!empty($oTmpCriteria)) { if (!empty($oTmpCriteria)) {
$criteria->add( $criteria->add(
$criteria->getNewCriterion(ListParticipatedLastPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListParticipatedLastPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
->addOr( $criteria->getNewCriterion(ListParticipatedLastPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
$criteria->getNewCriterion(ListParticipatedLastPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListParticipatedLastPeer::APP_PRO_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
->addOr( $criteria->getNewCriterion(ListParticipatedLastPeer::APP_NUMBER, $search, Criteria::EQUAL)->addOr(
$criteria->getNewCriterion(ListParticipatedLastPeer::APP_UID, $search, Criteria::EQUAL)
->addOr(
$criteria->getNewCriterion(ListParticipatedLastPeer::APP_NUMBER, $search, Criteria::EQUAL)
->addOr(
$oTmpCriteria $oTmpCriteria
) ))))
)
)
)
); );
} else { } else {
$criteria->add( $criteria->add(
$criteria->getNewCriterion(ListParticipatedLastPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListParticipatedLastPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
->addOr( $criteria->getNewCriterion(ListParticipatedLastPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
$criteria->getNewCriterion(ListParticipatedLastPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListParticipatedLastPeer::APP_PRO_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
->addOr( $criteria->getNewCriterion(ListParticipatedLastPeer::APP_NUMBER, $search, Criteria::EQUAL))))
$criteria->getNewCriterion(ListParticipatedLastPeer::APP_UID, $search, Criteria::EQUAL)
->addOr(
$criteria->getNewCriterion(ListParticipatedLastPeer::APP_NUMBER, $search, Criteria::EQUAL)
)
)
)
); );
} }
} }
}
//Filter Process Id //Filter Process Id
if ($process != '') { if ($process != '') {

48
workflow/engine/classes/model/ListPaused.php
View File

@@ -222,11 +222,12 @@ class ListPaused extends BaseListPaused
*/ */
public function loadFilters(&$criteria, $filters, $additionalColumns = array()) public function loadFilters(&$criteria, $filters, $additionalColumns = array())
{ {
$filter = isset($filters['filter']) ? $filters['filter'] : ""; $filter = isset($filters['filter']) ? $filters['filter'] : '';
$search = isset($filters['search']) ? $filters['search'] : ""; $search = isset($filters['search']) ? $filters['search'] : '';
$process = isset($filters['process']) ? $filters['process'] : ""; $caseLink = isset($filters['caseLink']) ? $filters['caseLink'] : '';
$category = isset($filters['category']) ? $filters['category'] : ""; $process = isset($filters['process']) ? $filters['process'] : '';
$filterStatus = isset($filters['filterStatus']) ? $filters['filterStatus'] : ""; $category = isset($filters['category']) ? $filters['category'] : '';
$filterStatus = isset($filters['filterStatus']) ? $filters['filterStatus'] : '';
//Filter Read Unread All //Filter Read Unread All
switch ($filter) { switch ($filter) {
@@ -240,6 +241,10 @@ class ListPaused extends BaseListPaused
//Filter Search //Filter Search
if ($search != '') { if ($search != '') {
//Check if we need to search to the APP_UID
if (!empty($caseLink)) {
$criteria->add(ListPausedPeer::APP_UID, $search, Criteria::EQUAL);
} else {
//If we have additional tables configured in the custom cases list, prepare the variables for search //If we have additional tables configured in the custom cases list, prepare the variables for search
if (count($additionalColumns) > 0) { if (count($additionalColumns) > 0) {
require_once(PATH_DATA_SITE . 'classes' . PATH_SEP . $this->additionalClassName . '.php'); require_once(PATH_DATA_SITE . 'classes' . PATH_SEP . $this->additionalClassName . '.php');
@@ -254,36 +259,23 @@ class ListPaused extends BaseListPaused
if (!empty($oTmpCriteria)) { if (!empty($oTmpCriteria)) {
$criteria->add( $criteria->add(
$criteria->getNewCriterion(ListPausedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListPausedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
->addOr( $criteria->getNewCriterion(ListPausedPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
$criteria->getNewCriterion(ListPausedPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListPausedPeer::APP_PRO_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
->addOr( $criteria->getNewCriterion(ListPausedPeer::APP_NUMBER, $search, Criteria::EQUAL)->addOr(
$criteria->getNewCriterion(ListPausedPeer::APP_UID, $search, Criteria::EQUAL)
->addOr(
$criteria->getNewCriterion(ListPausedPeer::APP_NUMBER, $search, Criteria::EQUAL)
->addOr(
$oTmpCriteria $oTmpCriteria
) ))))
)
)
)
); );
} else { } else {
$criteria->add( $criteria->add(
$criteria->getNewCriterion(ListPausedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListPausedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
->addOr( $criteria->getNewCriterion(ListPausedPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
$criteria->getNewCriterion(ListPausedPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListPausedPeer::APP_PRO_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
->addOr( $criteria->getNewCriterion(ListPausedPeer::APP_NUMBER, $search, Criteria::EQUAL))))
$criteria->getNewCriterion(ListPausedPeer::APP_UID, $search, Criteria::EQUAL)
->addOr(
$criteria->getNewCriterion(ListPausedPeer::APP_NUMBER, $search, Criteria::EQUAL)
)
)
)
); );
} }
} }
}
//Filter Process Id //Filter Process Id
if ($process != '') { if ($process != '') {

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

@@ -175,15 +175,20 @@ class ListUnassigned extends BaseListUnassigned
*/ */
public function loadFilters(&$criteria, $filters, $additionalColumns = array()) public function loadFilters(&$criteria, $filters, $additionalColumns = array())
{ {
$filter = isset($filters['filter']) ? $filters['filter'] : ""; $filter = isset($filters['filter']) ? $filters['filter'] : '';
$search = isset($filters['search']) ? $filters['search'] : ""; $search = isset($filters['search']) ? $filters['search'] : '';
$process = isset($filters['process']) ? $filters['process'] : ""; $caseLink = isset($filters['caseLink']) ? $filters['caseLink'] : '';
$category = isset($filters['category']) ? $filters['category'] : ""; $process = isset($filters['process']) ? $filters['process'] : '';
$dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : ""; $category = isset($filters['category']) ? $filters['category'] : '';
$dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : ""; $dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : '';
$dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : '';
//Filter Search //Filter Search
if ($search != '') { if ($search != '') {
//Check if we need to search to the APP_UID
if (!empty($caseLink)) {
$criteria->add(ListUnassignedPeer::APP_UID, $search, Criteria::EQUAL);
} else {
//If we have additional tables configured in the custom cases list, prepare the variables for search //If we have additional tables configured in the custom cases list, prepare the variables for search
if (count($additionalColumns) > 0) { if (count($additionalColumns) > 0) {
require_once(PATH_DATA_SITE . 'classes' . PATH_SEP . $this->additionalClassName . '.php'); require_once(PATH_DATA_SITE . 'classes' . PATH_SEP . $this->additionalClassName . '.php');
@@ -198,36 +203,23 @@ class ListUnassigned extends BaseListUnassigned
if (!empty($oTmpCriteria)) { if (!empty($oTmpCriteria)) {
$criteria->add( $criteria->add(
$criteria->getNewCriterion(ListUnassignedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListUnassignedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
->addOr( $criteria->getNewCriterion(ListUnassignedPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
$criteria->getNewCriterion(ListUnassignedPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListUnassignedPeer::APP_PRO_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
->addOr( $criteria->getNewCriterion(ListUnassignedPeer::APP_NUMBER, $search, Criteria::EQUAL)->addOr(
$criteria->getNewCriterion(ListUnassignedPeer::APP_UID, $search, Criteria::EQUAL)
->addOr(
$criteria->getNewCriterion(ListUnassignedPeer::APP_NUMBER, $search, Criteria::EQUAL)
->addOr(
$oTmpCriteria $oTmpCriteria
) ))))
)
)
)
); );
} else { } else {
$criteria->add( $criteria->add(
$criteria->getNewCriterion(ListUnassignedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListUnassignedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
->addOr( $criteria->getNewCriterion(ListUnassignedPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
$criteria->getNewCriterion(ListUnassignedPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListUnassignedPeer::APP_PRO_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
->addOr( $criteria->getNewCriterion(ListUnassignedPeer::APP_NUMBER, $search, Criteria::EQUAL))))
$criteria->getNewCriterion(ListUnassignedPeer::APP_UID, $search, Criteria::EQUAL)
->addOr(
$criteria->getNewCriterion(ListUnassignedPeer::APP_NUMBER, $search, Criteria::EQUAL)
)
)
)
); );
} }
} }
}
//Filter Process Id //Filter Process Id
if ($process != '') { if ($process != '') {