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

PM-1944 "0015574: Current User se muestra con UNASSIGNED..." SOLVED

Browse Source 
Issue:
    0015574: Current User se muestra con UNASSIGNED al llegar a un subproceso
Cause:
    No se a contemplado este caso para el "Cases lists"
Solution:
    Se a agregado codigo necesario para mostrar el "Current User" cuando es Sub-proceso
This commit is contained in:
Victor Saisa Lopez
2015-04-29 10:26:24 -04:00
parent 4ac5555fc4
commit 779b09b1e6
1 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
workflow/engine/classes/class.applications.php
View File

@@ -62,6 +62,8 @@ class Applications
$oAppCache->confCasesList = $confCasesList; $oAppCache->confCasesList = $confCasesList;
} }
$delimiter = DBAdapter::getStringDelimiter();
// get the action based list // get the action based list
switch ($action) { switch ($action) {
case "draft": case "draft":
@@ -185,14 +187,25 @@ class Applications
$CriteriaCount->addAsColumn( 'USR_USERNAME', 'CU.USR_USERNAME' ); $CriteriaCount->addAsColumn( 'USR_USERNAME', 'CU.USR_USERNAME' );
//Current delegation //Current delegation
if ($action == "to_reassign") { $appdelcrTableName = AppCacheViewPeer::TABLE_NAME;
$Criteria->addAsColumn("APPCVCR_APP_TAS_TITLE", "APP_CACHE_VIEW.APP_TAS_TITLE"); $appdelcrAppTasTitle = "APPDELCR.APP_TAS_TITLE";
$CriteriaCount->addAsColumn("APPCVCR_APP_TAS_TITLE", "APP_CACHE_VIEW.APP_TAS_TITLE"); $appdelcrAppTasTitleCount = $appdelcrAppTasTitle;
} else {
$Criteria->addAsColumn("APPCVCR_APP_TAS_TITLE", "APPCVCR.APP_TAS_TITLE"); switch ($action) {
$CriteriaCount->addAsColumn("APPCVCR_APP_TAS_TITLE", "APPCVCR.APP_TAS_TITLE"); case "sent":
$appdelcrTableName = AppDelegationPeer::TABLE_NAME;
$appdelcrAppTasTitle = "(SELECT CON_VALUE FROM CONTENT WHERE CON_ID = APPDELCR.TAS_UID AND CON_LANG = " . $delimiter . SYS_LANG . $delimiter . " AND CON_CATEGORY = " . $delimiter . "TAS_TITLE" . $delimiter . ")";
$appdelcrAppTasTitleCount = "APPDELCR.TAS_UID";
break;
case "to_reassign":
$appdelcrAppTasTitle = "APP_CACHE_VIEW.APP_TAS_TITLE";
$appdelcrAppTasTitleCount = $appdelcrAppTasTitle;
break;
} }
$Criteria->addAsColumn("APPDELCR_APP_TAS_TITLE", $appdelcrAppTasTitle);
$CriteriaCount->addAsColumn("APPDELCR_APP_TAS_TITLE", $appdelcrAppTasTitleCount);
$Criteria->addAsColumn("USRCR_USR_UID", "USRCR.USR_UID"); $Criteria->addAsColumn("USRCR_USR_UID", "USRCR.USR_UID");
$Criteria->addAsColumn("USRCR_USR_FIRSTNAME", "USRCR.USR_FIRSTNAME"); $Criteria->addAsColumn("USRCR_USR_FIRSTNAME", "USRCR.USR_FIRSTNAME");
$Criteria->addAsColumn("USRCR_USR_LASTNAME", "USRCR.USR_LASTNAME"); $Criteria->addAsColumn("USRCR_USR_LASTNAME", "USRCR.USR_LASTNAME");
@@ -203,20 +216,20 @@ class Applications
$CriteriaCount->addAsColumn("USRCR_USR_LASTNAME", "USRCR.USR_LASTNAME"); $CriteriaCount->addAsColumn("USRCR_USR_LASTNAME", "USRCR.USR_LASTNAME");
$CriteriaCount->addAsColumn("USRCR_USR_USERNAME", "USRCR.USR_USERNAME"); $CriteriaCount->addAsColumn("USRCR_USR_USERNAME", "USRCR.USR_USERNAME");
$Criteria->addAlias("APPCVCR", AppCacheViewPeer::TABLE_NAME); $Criteria->addAlias("APPDELCR", $appdelcrTableName);
$Criteria->addAlias("USRCR", UsersPeer::TABLE_NAME); $Criteria->addAlias("USRCR", UsersPeer::TABLE_NAME);
$CriteriaCount->addAlias("APPCVCR", AppCacheViewPeer::TABLE_NAME); $CriteriaCount->addAlias("APPDELCR", $appdelcrTableName);
$CriteriaCount->addAlias("USRCR", UsersPeer::TABLE_NAME); $CriteriaCount->addAlias("USRCR", UsersPeer::TABLE_NAME);
$arrayCondition = array(); $arrayCondition = array();
$arrayCondition[] = array(AppCacheViewPeer::APP_UID, "APPCVCR.APP_UID"); $arrayCondition[] = array(AppCacheViewPeer::APP_UID, "APPDELCR.APP_UID");
$arrayCondition[] = array("APPCVCR.DEL_LAST_INDEX", 1); $arrayCondition[] = array("APPDELCR.DEL_LAST_INDEX", 1);
$Criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN); $Criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN);
$CriteriaCount->addJoinMC($arrayCondition, Criteria::LEFT_JOIN); $CriteriaCount->addJoinMC($arrayCondition, Criteria::LEFT_JOIN);
$arrayCondition = array(); $arrayCondition = array();
$arrayCondition[] = array("APPCVCR.USR_UID", "USRCR.USR_UID"); $arrayCondition[] = array("APPDELCR.USR_UID", "USRCR.USR_UID");
$Criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN); $Criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN);
$CriteriaCount->addJoinMC($arrayCondition, Criteria::LEFT_JOIN); $CriteriaCount->addJoinMC($arrayCondition, Criteria::LEFT_JOIN);
@@ -467,7 +480,7 @@ class Applications
$sort = "USRCR_" . $conf->userNameFormatGetFirstFieldByUsersTable(); $sort = "USRCR_" . $conf->userNameFormatGetFirstFieldByUsersTable();
break; break;
case "APP_CACHE_VIEW.APP_TAS_TITLE": case "APP_CACHE_VIEW.APP_TAS_TITLE":
$sort = "APPCVCR_APP_TAS_TITLE"; $sort = "APPDELCR_APP_TAS_TITLE";
break; break;
} }
} }
@@ -568,7 +581,7 @@ class Applications
//Current delegation (*) || $action == "search" || $action == "to_revise" //Current delegation (*) || $action == "search" || $action == "to_revise"
if (($action == "sent" || $action == "simple_search" || $action == "to_reassign") && ($status != "TO_DO")) { if (($action == "sent" || $action == "simple_search" || $action == "to_reassign") && ($status != "TO_DO")) {
//Current task //Current task
$aRow["APP_TAS_TITLE"] = $aRow["APPCVCR_APP_TAS_TITLE"]; $aRow["APP_TAS_TITLE"] = $aRow["APPDELCR_APP_TAS_TITLE"];
//Current user //Current user
//if ($action != "to_reassign" ) { //if ($action != "to_reassign" ) {