From c8e076e325ff3ebe6d4272a14de67969b298053b Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Wed, 15 Feb 2017 15:55:58 -0400 Subject: [PATCH] Suggest of users --- .../engine/methods/cases/casesListExtJs.php | 66 ------------- .../engine/methods/cases/casesList_Ajax.php | 98 ++++++------------- workflow/engine/templates/cases/casesList.js | 42 -------- 3 files changed, 32 insertions(+), 174 deletions(-) diff --git a/workflow/engine/methods/cases/casesListExtJs.php b/workflow/engine/methods/cases/casesListExtJs.php index 6f7ca3b29..b0d0daba7 100644 --- a/workflow/engine/methods/cases/casesListExtJs.php +++ b/workflow/engine/methods/cases/casesListExtJs.php @@ -139,8 +139,6 @@ if ($action == "todo" || $action == "draft" || $action == "sent" || $action == " $processes[] = array ('',G::LoadTranslation( 'ID_ALL_PROCESS' )); $status = getStatusArray( $action, $userUid ); $category = getCategoryArray(); -$users = getUserArray( $action, $userUid ); -$allUsers = getAllUsersArray( $action ); $oHeadPublisher->assign( 'reassignReaderFields', $reassignReaderFields ); //sending the fields to get from proxy $oHeadPublisher->addExtJsScript( 'cases/reassignList', false ); @@ -160,8 +158,6 @@ $oHeadPublisher->assign( 'PMDateFormat', $dateFormat ); //sending the fields to $oHeadPublisher->assign( 'statusValues', $status ); //Sending the listing of status $oHeadPublisher->assign( 'processValues', $processes ); //Sending the listing of processes $oHeadPublisher->assign( 'categoryValues', $category ); //Sending the listing of categories -$oHeadPublisher->assign( 'userValues', $users ); //Sending the listing of users -$oHeadPublisher->assign( 'allUsersValues', $allUsers ); //Sending the listing of all users $oHeadPublisher->assign( 'solrEnabled', $solrEnabled ); //Sending the status of solar $oHeadPublisher->assign( 'enableEnterprise', $enableEnterprise ); //sending the page size @@ -221,38 +217,6 @@ $oHeadPublisher->assign( 'openReassignCallback', $jsFunction ); G::RenderPage( 'publish', 'extJs' ); -function getUserArray ($action, $userUid) -{ - global $oAppCache; - $status = array (); - - $users[] = array ("",G::LoadTranslation( "ID_ALL_USERS" )); - $users[] = array ("CURRENT_USER",G::LoadTranslation( "ID_CURRENT_USER" )); - - //now get users, just for the Search action - switch ($action) { - case 'search_simple': - case 'search': - $cUsers = new Criteria( 'workflow' ); - $cUsers->clearSelectColumns(); - $cUsers->addSelectColumn( UsersPeer::USR_ID ); - $cUsers->addSelectColumn( UsersPeer::USR_FIRSTNAME ); - $cUsers->addSelectColumn( UsersPeer::USR_LASTNAME ); - $oDataset = UsersPeer::doSelectRS( $cUsers ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); - $oDataset->next(); - while ($aRow = $oDataset->getRow()) { - $users[] = array ($aRow['USR_ID'],$aRow['USR_LASTNAME'] . ' ' . $aRow['USR_FIRSTNAME']); - $oDataset->next(); - } - break; - default: - return $users; - break; - } - return $users; -} - function getCategoryArray () { global $oAppCache; @@ -276,36 +240,6 @@ function getCategoryArray () return $category; } -function getAllUsersArray ($action) -{ - global $oAppCache; - $status = array (); - $users[] = array ("CURRENT_USER",G::LoadTranslation( "ID_CURRENT_USER" ) - ); - $users[] = array ("",G::LoadTranslation( "ID_ALL_USERS" ) - ); - - if ($action == 'to_reassign') { - //now get users, just for the Search action - $cUsers = $oAppCache->getToReassignListCriteria(null); - $cUsers->addSelectColumn( AppCacheViewPeer::USR_UID ); - - if (g::MySQLSintaxis()) { - $cUsers->addGroupByColumn( AppCacheViewPeer::USR_UID ); - } - - $cUsers->addAscendingOrderByColumn( AppCacheViewPeer::APP_CURRENT_USER ); - $oDataset = AppCacheViewPeer::doSelectRS( $cUsers , Propel::getDbConnection('workflow_ro') ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); - $oDataset->next(); - while ($aRow = $oDataset->getRow()) { - $users[] = array ($aRow['USR_UID'],$aRow['APP_CURRENT_USER']); - $oDataset->next(); - } - } - return $users; -} - function getStatusArray($action, $userUid) { $status = array(); diff --git a/workflow/engine/methods/cases/casesList_Ajax.php b/workflow/engine/methods/cases/casesList_Ajax.php index 7d5831dc8..9cc236847 100644 --- a/workflow/engine/methods/cases/casesList_Ajax.php +++ b/workflow/engine/methods/cases/casesList_Ajax.php @@ -43,85 +43,51 @@ function filterUserListArray($users = array(), $filter = '') return $filteredUsers; } +//Load the suggest list of users if ($actionAjax == "userValues") { - //global $oAppCache; - $oAppCache = new AppCacheView(); $action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : null; $query = isset( $_REQUEST['query'] ) ? $_REQUEST['query'] : null; + + G::LoadClass("configuration"); + $conf = new Configurations(); + $confEnvSetting = $conf->getFormats(); $users = array(); - $users[] = array ("USR_UID" => "", "USR_FULLNAME" => G::LoadTranslation( "ID_ALL_USERS" )); - $users[] = array ("USR_UID" => "CURRENT_USER", "USR_FULLNAME" => G::LoadTranslation( "ID_CURRENT_USER" )); - $users = filterUserListArray($users, $query); - //now get users, just for the Search action + $cUsers = new Criteria('workflow'); + $cUsers->clearSelectColumns(); + $cUsers->addSelectColumn(UsersPeer::USR_USERNAME); + $cUsers->addSelectColumn(UsersPeer::USR_FIRSTNAME); + $cUsers->addSelectColumn(UsersPeer::USR_LASTNAME); switch ($action) { case 'to_reassign': - G::LoadClass("configuration"); - $conf = new Configurations(); - $confEnvSetting = $conf->getFormats(); - $cUsers = new Criteria('workflow'); - $cUsers->clearSelectColumns(); $cUsers->addSelectColumn(UsersPeer::USR_UID); - $cUsers->addSelectColumn(UsersPeer::USR_USERNAME); - $cUsers->addSelectColumn(UsersPeer::USR_FIRSTNAME); - $cUsers->addSelectColumn(UsersPeer::USR_LASTNAME); - $cUsers->add(UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL); - if (!is_null($query)) { - $filters = $cUsers->getNewCriterion(UsersPeer::USR_FIRSTNAME, '%' . $query . '%', Criteria::LIKE)->addOr( - $cUsers->getNewCriterion(UsersPeer::USR_LASTNAME, '%' . $query . '%', Criteria::LIKE)->addOr( - $cUsers->getNewCriterion(UsersPeer::USR_USERNAME, '%' . $query . '%', Criteria::LIKE))); - $cUsers->addOr($filters); - } - $cUsers->setLimit(20); - $cUsers->addAscendingOrderByColumn(UsersPeer::TABLE_NAME . "." . $conf->userNameFormatGetFirstFieldByUsersTable()); - $oDataset = UsersPeer::doSelectRS($cUsers); - $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - - while ($oDataset->next()) { - $row = $oDataset->getRow(); - $usrFullName = $conf->usersNameFormatBySetParameters($confEnvSetting["format"], $row["USR_USERNAME"], $row["USR_FIRSTNAME"], $row["USR_LASTNAME"]); - $users[] = array("USR_UID" => $row["USR_UID"], "USR_FULLNAME" => $usrFullName); - } break; case 'search_simple': case 'search': - G::LoadClass("configuration"); - - $conf = new Configurations(); - - $confEnvSetting = $conf->getFormats(); - - $cUsers = new Criteria('workflow'); - $cUsers->clearSelectColumns(); $cUsers->addSelectColumn(UsersPeer::USR_ID); - $cUsers->addSelectColumn(UsersPeer::USR_USERNAME); - $cUsers->addSelectColumn(UsersPeer::USR_FIRSTNAME); - $cUsers->addSelectColumn(UsersPeer::USR_LASTNAME); - $cUsers->add(UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL); - - if (!is_null($query)) { - $filters = $cUsers->getNewCriterion( UsersPeer::USR_FIRSTNAME, '%'.$query.'%', Criteria::LIKE )->addOr( - $cUsers->getNewCriterion( UsersPeer::USR_LASTNAME, '%'.$query.'%', Criteria::LIKE )->addOr( - $cUsers->getNewCriterion( UsersPeer::USR_USERNAME, '%'.$query.'%', Criteria::LIKE ))); - $cUsers->addOr( $filters ); - } - $cUsers->setLimit(20); - $cUsers->addAscendingOrderByColumn(UsersPeer::TABLE_NAME . "." . $conf->userNameFormatGetFirstFieldByUsersTable()); - $oDataset = UsersPeer::doSelectRS($cUsers); - $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - - while ($oDataset->next()) { - $row = $oDataset->getRow(); - - $usrFullName = $conf->usersNameFormatBySetParameters($confEnvSetting["format"], $row["USR_USERNAME"], $row["USR_FIRSTNAME"], $row["USR_LASTNAME"]); - - $users[] = array("USR_ID" => $row["USR_UID"], "USR_FULLNAME" => $usrFullName); - } - break; - default: - return $users; break; } - //return $users; + $cUsers->add(UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL); + if (!is_null($query)) { + $filters = $cUsers->getNewCriterion(UsersPeer::USR_FIRSTNAME, '%' . $query . '%', Criteria::LIKE)->addOr( + $cUsers->getNewCriterion(UsersPeer::USR_LASTNAME, '%' . $query . '%', Criteria::LIKE)->addOr( + $cUsers->getNewCriterion(UsersPeer::USR_USERNAME, '%' . $query . '%', Criteria::LIKE))); + $cUsers->addOr($filters); + } + $cUsers->setLimit(20); + $cUsers->addAscendingOrderByColumn(UsersPeer::TABLE_NAME . "." . $conf->userNameFormatGetFirstFieldByUsersTable()); + $oDataset = UsersPeer::doSelectRS($cUsers); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); + + while ($oDataset->next()) { + $row = $oDataset->getRow(); + $usrFullName = $conf->usersNameFormatBySetParameters($confEnvSetting["format"], $row["USR_USERNAME"], $row["USR_FIRSTNAME"], $row["USR_LASTNAME"]); + if ($action === 'search') { + //Only for the advanced search we used the USR_ID column + $users[] = array("USR_UID" => $row["USR_ID"], "USR_FULLNAME" => $usrFullName); + } else { + $users[] = array("USR_UID" => $row["USR_UID"], "USR_FULLNAME" => $usrFullName); + } + } return print G::json_encode($users); } diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index 79a166b90..9cdcad84a 100644 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -1032,47 +1032,6 @@ Ext.onReady ( function() { } }; - var comboAllUsers = new Ext.form.ComboBox({ - width : 180, - boxMaxWidth : 180, - editable : false, - displayField : 'USR_FULLNAME', - valueField : 'USR_UID', - //typeAhead : true, - mode : 'local', - forceSelection: true, - triggerAction: 'all', - - emptyText: _('ID_EMPTY_USERS'), - selectOnFocus: true, - //getListParent: function() { - // return this.el.up('.x-menu'); - //}, - store : new Ext.data.ArrayStore({ - fields: ['USR_UID','USR_FULLNAME'], - data : allUsersValues - }), - listeners:{ - scope: this, - 'select': function() { - filterProcess = comboAllUsers.value; - - /*if (filterProcess==''){ - btnSelectAll.hide(); - btnUnSelectAll.hide(); - btnReassign.hide(); - } - else { - btnSelectAll.show(); - btnUnSelectAll.show(); - btnReassign.show(); - }*/ - storeCases.setBaseParam( 'user', filterProcess); - //storeCases.load({params:{user: filterProcess, start : 0 , limit : pageSize}}); - }}, - iconCls: 'no-icon' //use iconCls if placing within menu to shift to right side of menu - }); - var comboCategory = new Ext.form.ComboBox({ width : 180, boxMaxWidth : 200, @@ -2533,7 +2492,6 @@ Ext.onReady ( function() { if(typeof(comboUser) != 'undefined'){ comboUser.setValue(""); } - comboAllUsers.setValue("CURRENT_USER"); function reassign(){ storeReassignCases.removeAll();