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

BUG 9830 "En Advanced Search no funciona la busqueda por el..." SOLVED

Browse Source 
- First commit:
  > Solution to bug 9924
  > It improved the list of cases (inbox, draft, participated, paused, advanced search)
* Available from version 2.0.45
This commit is contained in:
Victor Saisa Lopez
2012-10-31 10:45:21 -04:00
parent dc1175bdd4
commit d0bf6400af
7 changed files with 437 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

281
workflow/engine/classes/model/AppCacheView.php
View File

@@ -100,7 +100,11 @@ class AppCacheView extends BaseAppCacheView
$criteria->addSelectColumn(AppCacheViewPeer::PRO_UID);
$criteria->add(AppCacheViewPeer::APP_STATUS, "TO_DO", CRITERIA::EQUAL);
$criteria->add(AppCacheViewPeer::USR_UID, $userUid);
if (!empty($userUid)) {
$criteria->add(AppCacheViewPeer::USR_UID, $userUid);
}
$criteria->add(AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL);
$criteria->add(AppCacheViewPeer::APP_THREAD_STATUS, 'OPEN');
$criteria->add(AppCacheViewPeer::DEL_THREAD_STATUS, 'OPEN');
@@ -145,7 +149,10 @@ class AppCacheView extends BaseAppCacheView
}
$criteria->add(AppCacheViewPeer::APP_STATUS, "DRAFT", CRITERIA::EQUAL);
$criteria->add(AppCacheViewPeer::USR_UID, $userUid);
if (!empty($userUid)) {
$criteria->add(AppCacheViewPeer::USR_UID, $userUid);
}
//$criteria->add(AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL);
$criteria->add(AppCacheViewPeer::APP_THREAD_STATUS, 'OPEN');
@@ -200,6 +207,36 @@ class AppCacheView extends BaseAppCacheView
return $criteria;
}
/**
* Gets the criteria object of the sent cases
*
* Return the criteria object of the sent cases
*
* @param string $userUid The user ID
* @param bool $doCount If true this will return the criteria for count cases only
* @return criteria Object criteria
*/
public function getSent2($userUid, $doCount)
{
//Adding configuration fields from the configuration options
//and forming the criteria object
if ($doCount && !isset($this->confCasesList["PMTable"]) && !empty($this->confCasesList["PMTable"])) {
$criteria = new Criteria("workflow");
} else {
$criteria = $this->addPMFieldsToCriteria("sent");
}
if (!empty($userUid)) {
$criteria->add(AppCacheViewPeer::USR_UID, $userUid);
}
if (!$doCount) {
$criteria->addGroupByColumn(AppCacheViewPeer::APP_UID);
}
return $criteria;
}
/**
* gets the SENT cases list criteria for count
* param $userUid the current userUid
@@ -213,7 +250,9 @@ class AppCacheView extends BaseAppCacheView
$criteria->add(AppCacheViewPeer::USR_UID, $userUid);
return $criteria;*/
return $this->getSentListCriteria($userUid);
//return $this->getSentListCriteria($userUid);
return $this->getSent2($userUid, true);
}
/**
@@ -223,6 +262,7 @@ class AppCacheView extends BaseAppCacheView
*/
public function getSentListCriteria ($userUid)
{
/*
$criteria = $this->addPMFieldsToCriteria('sent');
//$criteria->addAsColumn('MAX_DEL_INDEX', 'MAX(' . AppDelegationPeer::DEL_INDEX . ')');
@@ -234,6 +274,9 @@ class AppCacheView extends BaseAppCacheView
$criteria->add(AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL);
return $criteria;
*/
return $this->getSent2($userUid, false);
}
public function getSentListProcessCriteria($userUid)
@@ -421,35 +464,43 @@ class AppCacheView extends BaseAppCacheView
public function getProUidSupervisor($userUid)
{
//finding cases PRO_UID where $userUid is supervising
require_once ('classes/model/ProcessUser.php');
require_once ('classes/model/GroupUser.php');
$oCriteria = new Criteria('workflow');
$oCriteria->add(ProcessUserPeer::USR_UID, $userUid);
$oCriteria->add(ProcessUserPeer::PU_TYPE, 'SUPERVISOR');
$oDataset = ProcessUserPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
$aProcesses = array();
while ($aRow = $oDataset->getRow()) {
$aProcesses[] = $aRow['PRO_UID'];
$oDataset->next();
//finding cases PRO_UID where $userUid is supervising
require_once ('classes/model/ProcessUser.php');
require_once ('classes/model/GroupUser.php');
$oCriteria = new Criteria('workflow');
if (!empty($userUid)) {
$oCriteria->add(ProcessUserPeer::USR_UID, $userUid);
}
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(ProcessUserPeer::PRO_UID);
$oCriteria->add(ProcessUserPeer::PU_TYPE, 'GROUP_SUPERVISOR');
$oCriteria->addJoin(ProcessUserPeer::USR_UID, GroupUserPeer::USR_UID, Criteria::LEFT_JOIN);
$oCriteria->add(GroupUserPeer::USR_UID, $userUid);
$oCriteria->add(ProcessUserPeer::PU_TYPE, 'SUPERVISOR');
$oDataset = ProcessUserPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
$aProcesses[] = $aRow['PRO_UID'];
$oDataset->next();
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
$aProcesses = array();
while ($aRow = $oDataset->getRow()) {
$aProcesses[] = $aRow['PRO_UID'];
$oDataset->next();
}
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(ProcessUserPeer::PRO_UID);
$oCriteria->add(ProcessUserPeer::PU_TYPE, 'GROUP_SUPERVISOR');
$oCriteria->addJoin(ProcessUserPeer::USR_UID, GroupUserPeer::USR_UID, Criteria::LEFT_JOIN);
if (!empty($userUid)) {
$oCriteria->add(GroupUserPeer::USR_UID, $userUid);
}
$oDataset = ProcessUserPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
$aProcesses[] = $aRow['PRO_UID'];
$oDataset->next();
}
return $aProcesses;
@@ -475,15 +526,21 @@ class AppCacheView extends BaseAppCacheView
//add a validation to show the processes of which $userUid is supervisor
//$criteria->add(AppCacheViewPeer::USR_UID, $userUid);
$criteria->add(
$criteria->getNewCriterion(AppCacheViewPeer::USR_UID, $userUid)->
addOr($criteria->getNewCriterion(AppCacheViewPeer::PRO_UID, $aProcesses, Criteria::IN))
);
if (!empty($userUid)) {
$criteria->add(
$criteria->getNewCriterion(AppCacheViewPeer::USR_UID, $userUid)->addOr(
$criteria->getNewCriterion(AppCacheViewPeer::PRO_UID, $aProcesses, Criteria::IN))
);
} else {
$criteria->add(AppCacheViewPeer::PRO_UID, $aProcesses, Criteria::IN);
}
//join with APP_DELAY table using APP_UID and DEL_INDEX
$appDelayConds[] = array(AppCacheViewPeer::APP_UID, AppDelayPeer::APP_UID);
$appDelayConds[] = array(AppCacheViewPeer::DEL_INDEX, AppDelayPeer::APP_DEL_INDEX);
$criteria->addJoinMC($appDelayConds, Criteria::LEFT_JOIN);
$arrayCondition = array();
$arrayCondition[] = array(AppCacheViewPeer::APP_UID, AppDelayPeer::APP_UID);
$arrayCondition[] = array(AppCacheViewPeer::DEL_INDEX, AppDelayPeer::APP_DEL_INDEX);
$criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN);
$criteria->add(
$criteria->getNewCriterion(AppDelayPeer::APP_DISABLE_ACTION_USER, null, Criteria::ISNULL)->
@@ -578,15 +635,14 @@ class AppCacheView extends BaseAppCacheView
}
$criteria->add(AppCacheViewPeer::APP_STATUS, "COMPLETED", CRITERIA::EQUAL);
$criteria->add(AppCacheViewPeer::USR_UID, $userUid);
//$criteria->add(AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL);
$criteria->add(AppCacheViewPeer::APP_THREAD_STATUS, 'OPEN');
$criteria->add(AppCacheViewPeer::DEL_THREAD_STATUS, 'OPEN');
if (!empty($userUid)) {
$criteria->add(AppCacheViewPeer::USR_UID, $userUid);
}
//$c->add(AppDelegationPeer::DEL_PREVIOUS, '0', Criteria::NOT_EQUAL);
$criteria->addGroupByColumn(AppCacheViewPeer::APP_UID);
if (!$doCount) {
$criteria->addGroupByColumn(AppCacheViewPeer::APP_UID);
}
return $criteria;
}
@@ -628,7 +684,11 @@ class AppCacheView extends BaseAppCacheView
}
$criteria->add(AppCacheViewPeer::APP_STATUS, "CANCELLED", CRITERIA::EQUAL);
$criteria->add(AppCacheViewPeer::USR_UID, $userUid);
if (!empty($userUid)) {
$criteria->add(AppCacheViewPeer::USR_UID, $userUid);
}
$criteria->add(AppCacheViewPeer::DEL_THREAD_STATUS, 'CLOSED');
return $criteria;
@@ -900,7 +960,10 @@ class AppCacheView extends BaseAppCacheView
public function getAllCasesCountCriteria($userUid)
{
$oCriteria = $this->getGeneralCases(true);
$oCriteria->add(AppCacheViewPeer::USR_UID, $userUid);
if (!empty($userUid)) {
$oCriteria->add(AppCacheViewPeer::USR_UID, $userUid);
}
return $oCriteria;
}
@@ -912,11 +975,122 @@ class AppCacheView extends BaseAppCacheView
public function getAllCasesListCriteria($userUid)
{
$oCriteria = $this->getGeneralCases(false);
$oCriteria->add(AppCacheViewPeer::USR_UID, $userUid);
if (!empty($userUid)) {
$oCriteria->add(AppCacheViewPeer::USR_UID, $userUid);
}
return $oCriteria;
}
/**
* Gets the SQL string for an case
*
* Return the SQL string for an case
*
* @param string $fieldAppUid The field APP_UID
* @param string $fieldDelIndex The field DEL_INDEX
* @return string SQL string
*/
public function getAppDelaySql($fieldAppUid, $fieldDelIndex)
{
$sql = "SELECT DISTINCT " . AppDelayPeer::APP_UID . "
FROM " . AppDelayPeer::TABLE_NAME . "
WHERE " . AppDelayPeer::APP_UID . " = $fieldAppUid AND
" . AppDelayPeer::APP_DEL_INDEX . " = $fieldDelIndex AND
(" . AppDelayPeer::APP_DISABLE_ACTION_USER . " IS NULL OR " . AppDelayPeer::APP_DISABLE_ACTION_USER . " = '0') AND
" . AppDelayPeer::APP_DELAY_UID . " IS NOT NULL AND
" . AppDelayPeer::APP_TYPE . " = 'PAUSE'";
return $sql;
}
/**
* Gets the criteria object of all cases
*
* Return the criteria object of all cases
*
* @param string $userUid The user ID
* @param bool $doCount If true this will return the criteria for count cases only
* @return criteria Object criteria
*/
public function getAllCases2($userUid, $doCount)
{
//Adding configuration fields from the configuration options
//and forming the criteria object
if ($doCount && !isset($this->confCasesList["PMTable"]) && !empty($this->confCasesList["PMTable"])) {
$criteria = new Criteria("workflow");
} else {
$criteria = $this->addPMFieldsToCriteria("all");
}
if (!empty($userUid)) {
$criteria->add(AppCacheViewPeer::USR_UID, $userUid);
}
//paused
$sqlAppDelay = $this->getAppDelaySql(AppCacheViewPeer::APP_UID, AppCacheViewPeer::DEL_INDEX);
$criteria->add(
//todo - getToDo()
$criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "TO_DO", CRITERIA::EQUAL)->addAnd(
$criteria->getNewCriterion(AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL))->addAnd(
$criteria->getNewCriterion(AppCacheViewPeer::APP_THREAD_STATUS, "OPEN"))->addAnd(
$criteria->getNewCriterion(AppCacheViewPeer::DEL_THREAD_STATUS, "OPEN"))
)->addOr(
//draft - getDraft()
$criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "DRAFT", CRITERIA::EQUAL)->addAnd(
$criteria->getNewCriterion(AppCacheViewPeer::APP_THREAD_STATUS, "OPEN"))->addAnd(
$criteria->getNewCriterion(AppCacheViewPeer::DEL_THREAD_STATUS, "OPEN"))
)->addOr(
//paused
$criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "PAUSED")->addAnd(
$criteria->getNewCriterion(AppCacheViewPeer::APP_UID, AppCacheViewPeer::APP_UID . " IN ($sqlAppDelay)", Criteria::CUSTOM))
)->addOr(
//cancelled - getCancelled()
$criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "CANCELLED", CRITERIA::EQUAL)->addAnd(
$criteria->getNewCriterion(AppCacheViewPeer::DEL_THREAD_STATUS, "CLOSED"))
)->addOr(
//completed - getCompleted()
$criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "COMPLETED", CRITERIA::EQUAL)
);
if (!$doCount) {
//completed - getCompleted()
$criteria->addGroupByColumn(AppCacheViewPeer::APP_UID);
//$criteria->addGroupByColumn(AppCacheViewPeer::USR_UID);
}
return $criteria;
}
/**
* Gets the criteria object of all cases for the list
*
* Return the criteria object of all cases for the list
*
* @param string $userUid The user ID
* @return criteria Object criteria
*/
public function getAllCasesListCriteria2($userUid)
{
return $this->getAllCases2($userUid, false);
}
/**
* Gets the criteria object of all cases for the count
*
* Return the criteria object of all cases for the count
*
* @param string $userUid The user ID
* @return criteria Object criteria
*/
public function getAllCasesCountCriteria2($userUid)
{
return $this->getAllCases2($userUid, true);
}
/**
* gets the ALL cases list criteria for count
* @return Criteria object $Criteria
@@ -935,7 +1109,7 @@ class AppCacheView extends BaseAppCacheView
return $this->getGeneralCases(false);
}
public function getToReassign($doCount)
public function getToReassign($userUid, $doCount)
{
if ($doCount && !isset($this->confCasesList['PMTable']) && !empty($this->confCasesList['PMTable'])) {
$oCriteria = new Criteria('workflow');
@@ -944,6 +1118,11 @@ class AppCacheView extends BaseAppCacheView
}
$oCriteria->add(AppCacheViewPeer::APP_STATUS, 'TO_DO');
if (!empty($userUid)) {
$oCriteria->add(AppCacheViewPeer::USR_UID, $userUid);
}
$oCriteria->add(AppCacheViewPeer::APP_CURRENT_USER, '', Criteria::NOT_EQUAL);
$oCriteria->add(AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL);
$oCriteria->add(AppCacheViewPeer::APP_THREAD_STATUS, 'OPEN');
@@ -957,18 +1136,18 @@ class AppCacheView extends BaseAppCacheView
* gets the ALL cases list criteria for count
* @return Criteria object $Criteria
*/
public function getToReassignCountCriteria()
public function getToReassignCountCriteria($userUid)
{
return $this->getToReassign(true);
return $this->getToReassign($userUid, true);
}
/**
* gets the ALL cases list criteria for list
* @return Criteria object $Criteria
*/
public function getToReassignListCriteria()
public function getToReassignListCriteria($userUid)
{
return $this->getToReassign(false);
return $this->getToReassign($userUid, false);
}
public function getDefaultFields()