Update Look n Feel and Functionality of Roles Manager

Users Authentication Tab Changes too
This commit is contained in:
Enrique Ponce de Leon
2011-02-09 16:28:46 +00:00
parent afc2f0835a
commit 7e2d26bfc9
12 changed files with 475 additions and 265 deletions

View File

@@ -562,8 +562,8 @@ class RBAC
* @param string $filter
* @return $this->rolesObj->getAllRolesFilter
*/
function getAllRolesFilter ($filter) {
return $this->rolesObj->getAllRolesFilter($filter);
function getAllRolesFilter ($start,$limit,$filter) {
return $this->rolesObj->getAllRolesFilter($start,$limit,$filter);
}
/**
@@ -657,6 +657,19 @@ class RBAC
return $this->rolesObj->getRoleUsers($ROL_UID,$filter);
}
/**
* this function gets the number of users by roles
*
*
* @access public
* @author: Enrique Ponce de Leon <enrique@colosa.com>
*
* @return $this->rolesObj->getAllUsersByRole
*/
function getAllUsersByRole(){
return $this->rolesObj->getAllUsersByRole();
}
/**
* this function gets roles code
*

View File

@@ -124,28 +124,57 @@ class Roles extends BaseRoles {
}
//Added by QENNIX
function getAllRolesFilter($filter='') {
function getAllRolesFilter($start, $limit, $filter='') {
//echo $start.'<<<<'.$limit;
$systemCode = 'PROCESSMAKER';
$c = $this->listAllRoles($systemCode,$filter);
$rs = RolesPeer::DoSelectRs($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$aRows = Array();
while($rs->next()){
$row = $rs->getRow();
$o = new Roles();
$o->load($row['ROL_UID']);
$row['ROL_NAME'] = $o->getRolName();
$aRows[] = $row;
}
return $aRows;
$oCriteria2 = new Criteria('rbac');
$result = Array();
$oCriteria2->addSelectColumn('COUNT(*) AS CNT');
$oCriteria2->add(RolesPeer::ROL_UID, '', Criteria::NOT_EQUAL);
$oCriteria2->add(SystemsPeer::SYS_CODE, $systemCode);
$oCriteria2->add(RolesPeer::ROL_CREATE_DATE, '', Criteria::NOT_EQUAL);
$oCriteria2->add(RolesPeer::ROL_UPDATE_DATE, '', Criteria::NOT_EQUAL);
$oCriteria2->addJoin(RolesPeer::ROL_SYSTEM, SystemsPeer::SYS_UID);
if ($filter != ''){
$oCriteria2->add(RolesPeer::ROL_CODE, '%'.$filter.'%', Criteria::LIKE);
}
$result['COUNTER'] = $oCriteria2;
$oCriteria = new Criteria('rbac');
$oCriteria->clear();
$oCriteria->addSelectColumn(RolesPeer::ROL_UID);
$oCriteria->addSelectColumn(RolesPeer::ROL_PARENT);
$oCriteria->addSelectColumn(RolesPeer::ROL_SYSTEM);
$oCriteria->addSelectColumn(SystemsPeer::SYS_CODE);
$oCriteria->addSelectColumn(RolesPeer::ROL_CODE);
$oCriteria->addSelectColumn(RolesPeer::ROL_CREATE_DATE);
$oCriteria->addSelectColumn(RolesPeer::ROL_UPDATE_DATE);
$oCriteria->addSelectColumn(RolesPeer::ROL_STATUS);
$oCriteria->add(RolesPeer::ROL_UID, '', Criteria::NOT_EQUAL);
$oCriteria->add(SystemsPeer::SYS_CODE, $systemCode);
$oCriteria->add(RolesPeer::ROL_CREATE_DATE, '', Criteria::NOT_EQUAL);
$oCriteria->add(RolesPeer::ROL_UPDATE_DATE, '', Criteria::NOT_EQUAL);
$oCriteria->addJoin(RolesPeer::ROL_SYSTEM, SystemsPeer::SYS_UID);
if ($filter != ''){
$oCriteria->add(RolesPeer::ROL_CODE, '%'.$filter.'%', Criteria::LIKE);
}
$oCriteria->setOffset($start);
$oCriteria->setLimit($limit);
$result['LIST'] = $oCriteria;
return $result;
}
function getAllRoles($systemCode = 'PROCESSMAKER') {
$c = $this->listAllRoles($systemCode);
$rs = RolesPeer::DoSelectRs($c);
$rs = RolesPeer::DoSelectRs($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$aRows = Array();
@@ -313,6 +342,23 @@ class Roles extends BaseRoles {
return $ret;
}
//Added by Enrique at Feb 9th, 2011
//Gets number of users by role
function getAllUsersByRole(){
$oCriteria = new Criteria('rbac');
$oCriteria->addSelectColumn(UsersRolesPeer::ROL_UID);
$oCriteria->addSelectColumn('COUNT(*) AS CNT');
$oCriteria->addGroupByColumn(UsersRolesPeer::ROL_UID);
$oDataset = UsersRolesPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$aRoles = array();
while ($oDataset->next()){
$row = $oDataset->getRow();
$aRoles[$row['ROL_UID']] = $row['CNT'];
}
return $aRoles;
}
function getRoleUsers($ROL_UID, $filter='') {
try {
$criteria = new Criteria();

View File

@@ -305,4 +305,24 @@ class Content extends BaseContent {
throw ($e);
}
}
//Added by Enrique at Feb 9th,2011
//Gets all Role Names by Role
function getAllContentsByRole($sys_lang=SYS_LANG){
if (!isset($sys_lang)) $sys_lang = 'en';
$oCriteria = new Criteria('workflow');
$oCriteria->clearSelectColumns();
$oCriteria->addSelectColumn(ContentPeer::CON_ID);
$oCriteria->addAsColumn('ROL_NAME', ContentPeer::CON_VALUE);
//$oCriteria->addAsColumn('ROL_UID', ContentPeer::CON_ID);
$oCriteria->add(ContentPeer::CON_CATEGORY,'ROL_NAME');
$oCriteria->add(ContentPeer::CON_LANG, $sys_lang);
$oDataset = ContentPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$aRoles = Array();
while ($oDataset->next()){
$xRow = $oDataset->getRow();
$aRoles[$xRow['CON_ID']] = $xRow['ROL_NAME'];
}
return $aRoles;
}
} // Content

View File

@@ -55,20 +55,13 @@ $oHeadPublisher =& headPublisher::getSingleton();
$oHeadPublisher->addExtJsScript('roles/rolesUsersPermission', false); //adding a javascript file .js
$oHeadPublisher->addContent('roles/rolesUsersPermission'); //adding a html file .html.
$labels = G::getTranslations(Array('ID_PRO_CREATE_DATE','ID_CODE','ID_NAME','ID_LAN_UPDATE_DATE', 'ID_ROLES',
'ID_USERS','ID_PERMISSIONS','ID_EDIT','ID_DELETE','ID_NEW','ID_STATUS','ID_SAVE','ID_CLOSE',
'ID_ACTIVE','ID_INACTIVE','ID_ROLES_MSG','ID_ROLES_CAN_NOT_DELETE','ID_ROLES_SUCCESS_NEW','ID_ROLES_SUCCESS_UPDATE',
'ID_ROLES_SUCCESS_DELETE','ID_REMOVE_ROLE','ID_ASSIGN','ID_REMOVE','ID_BACK','ID_PROCESSING',
'ID_REMOVE_ALL_PERMISSIONS','ID_ASSIGN_ALL_PERMISSIONS','ID_ASSIGN_ALL_USERS','ID_REMOVE_ALL_USERS',
'ID_USER_NAME','ID_PERMISSION_CODE','ID_AVAILABLE_PERMISSIONS','ID_ASSIGNED_PERMISSIONS','ID_ENTER_SEARCH_TERM',
'ID_FIRST_NAME','ID_LAST_NAME','ID_AVAILABLE_USERS','ID_ASSIGNED_USERS','ID_MSG_CONFIRM_ASSIGN_ALL_USERS','ID_MSG_AJAX_FAILURE'));
$roles = Array();
$roles['ROL_UID'] = $_GET['rUID'];
$roles['ROL_CODE'] = $RBAC->getRoleCode($_GET['rUID']);
$roles['CURRENT_TAB'] = ($_GET['tab']=='permissions') ? 1 : 0;
$oHeadPublisher->assign('TRANSLATIONS', $labels);
$oHeadPublisher->assign('ROLES', $roles);
G::RenderPage('publish', 'extJs');

View File

@@ -260,6 +260,58 @@ switch ($REQUEST) {
$RBAC->deleteUserRole($ROL_UID, $aUID);
}
break;
case 'rolesList':
require_once (PATH_RBAC . "model/RolesPeer.php");
require_once ("classes/model/Content.php");
G::LoadClass('configuration');
$co = new Configurations();
$config = $co->getConfiguration('rolesList', 'pageSize','',$_SESSION['USER_LOGGED']);
$limit_size = isset($config['pageSize']) ? $config['pageSize'] : 20;
$start = isset($_POST['start']) ? $_POST['start'] : 0;
$limit = isset($_POST['limit']) ? $_POST['limit'] : $limit_size;
$filter = isset($_REQUEST['textFilter'])? $_REQUEST['textFilter'] : '';
global $RBAC;
$Criterias = $RBAC->getAllRolesFilter($start,$limit,$filter);
$rs = RolesPeer::DoSelectRs($Criterias['LIST']);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$content = new Content();
$rNames = $content->getAllContentsByRole();
$aUsers = $RBAC->getAllUsersByRole();
$aRows = Array();
while($rs->next()){
$aRows[] = $rs->getRow();
$index = sizeof($aRows)-1;
$aRows[$index]['ROL_NAME'] = isset($rNames[$aRows[$index]['ROL_UID']])? $rNames[$aRows[$index]['ROL_UID']] : '';
$aRows[$index]['TOTAL_USERS'] = isset($aUsers[$aRows[$index]['ROL_UID']])? $aUsers[$aRows[$index]['ROL_UID']] : 0;
}
$oData = RolesPeer::doSelectRS($Criterias['COUNTER']);
$oData->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oData->next();
$row = $oData->getRow();
$total_roles = $row['CNT'];
echo '{roles: '.G::json_encode($aRows).', total_roles: '.$total_roles.'}';
break;
case 'updatePageSize':
G::LoadClass('configuration');
$c = new Configurations();
$arr['pageSize'] = $_REQUEST['size'];
$arr['dateSave'] = date('Y-m-d H:i:s');
$config = Array();
$config[] = $arr;
$c->aConfig = $config;
$c->saveConfig('rolesList', 'pageSize','',$_SESSION['USER_LOGGED']);
echo '{success: true}';
break;
default: echo 'default';
}

View File

@@ -46,46 +46,20 @@
$G_ID_MENU_SELECTED = 'USERS';
$G_ID_SUB_MENU_SELECTED = 'ROLES';
// require_once (PATH_RBAC . "model/RolesPeer.php");
// G::LoadClass('ArrayPeer');
// $aRoles = $RBAC->getAllRoles();
//
// $fields = Array(
// 'ROL_UID'=>'char',
// 'ROL_PARENT'=>'char',
// 'ROL_SYSTEM'=>'char',
// 'ROL_CREATE_DATE'=>'char',
// 'ROL_UPDATE_DATE'=>'char',
// 'ROL_STATUS'=>'char'
// );
//
// $rows = array_merge(Array($fields), $aRoles);
//
// global $_DBArray;
// $_DBArray['roles'] = $rows;
// $_SESSION['_DBArray'] = $_DBArray;
// $oCriteria = new Criteria('dbarray');
// $oCriteria->setDBArrayTable('roles');
//
// $G_PUBLISH = new Publisher;
// $G_PUBLISH->AddContent('propeltable', 'paged-table', 'roles/roles_List', $oCriteria);
//
// G::RenderPage('publish','blank');
$G_PUBLISH = new Publisher;
G::LoadClass('configuration');
$c = new Configurations();
$configPage = $c->getConfiguration('rolesList', 'pageSize','',$_SESSION['USER_LOGGED']);
$Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
$oHeadPublisher =& headPublisher::getSingleton();
//$oHeadPublisher->usingExtJs('ux/Ext.ux.fileUploadField');
$oHeadPublisher->addExtJsScript('roles/rolesList', false); //adding a javascript file .js
$oHeadPublisher->addContent('roles/rolesList'); //adding a html file .html.
$labels = G::getTranslations(Array('ID_PRO_CREATE_DATE','ID_CODE','ID_NAME','ID_LAN_UPDATE_DATE', 'ID_ROLES',
'ID_USERS','ID_PERMISSIONS','ID_EDIT','ID_DELETE','ID_NEW','ID_STATUS','ID_SAVE','ID_CLOSE',
'ID_ACTIVE','ID_INACTIVE','ID_ROLES_MSG','ID_ROLES_CAN_NOT_DELETE','ID_ROLES_SUCCESS_NEW','ID_ROLES_SUCCESS_UPDATE',
'ID_ROLES_SUCCESS_DELETE','ID_REMOVE_ROLE','ID_SEARCH','ID_ENTER_SEARCH_TERM','ID_SELECT_STATUS','ID_CREATE_ROLE_TITLE','ID_EDIT_ROLE_TITLE'));
$oHeadPublisher->assign('TRANSLATIONS', $labels);
$oHeadPublisher->assign('FORMATS',$c->getFormats());
$oHeadPublisher->assign('CONFIG', $Config);
G::RenderPage('publish', 'extJs');
?>

View File

@@ -235,28 +235,39 @@ try {
break;
case 'authSources':
$criteria = $RBAC->getAllAuthSources();
$objects = AuthenticationSourcePeer::doSelectRS($criteria);
$objects = AuthenticationSourcePeer::doSelectRS($criteria);
$objects->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
$started = Array();
$started['AUTH_SOURCE_UID'] = '00000000000000000000000000000000';
$started['AUTH_SOURCE_NAME'] = 'ProcessMaker';
$started['AUTH_SOURCE_TYPE'] = 'MYSQL';
//$started['AUTH_SOURCE_NAME'] = 'ProcessMaker';
//$started['AUTH_SOURCE_TYPE'] = 'MYSQL';
$started['AUTH_SOURCE_SHOW'] = 'ProcessMaker (MYSQL)';
$arr = Array();
$arr[] = $started;
while ($objects->next()){
$arr[] = $objects->getRow();
$row = $objects->getRow();
$aux = Array();
$aux['AUTH_SOURCE_UID'] = $row['AUTH_SOURCE_UID'];
//$aux['AUTH_SOURCE_NAME'] = $row['AUTH_SOURCE_NAME'];
//$aux['AUTH_SOURCE_TYPE'] = $row['AUTH_SOURCE_TYPE'];
$aux['AUTH_SOURCE_SHOW'] = $row['AUTH_SOURCE_NAME'].' ('.$row['AUTH_SOURCE_PROVIDER'].')';
$arr[] = $aux;
}
echo '{sources: '.G::json_encode($arr).'}';
break;
case 'loadAuthSourceByUID':
require_once 'classes/model/Users.php';
require_once 'classes/model/Users.php';
$oCriteria=$RBAC->load($_POST['uUID']);
$UID_AUTH = $oCriteria['UID_AUTH_SOURCE'];
if (($UID_AUTH!='00000000000000000000000000000000')&&($UID_AUTH!='')){
$aFields = $RBAC->getAuthSource($UID_AUTH);
$aux = $RBAC->getAuthSource($UID_AUTH);
$arr = Array();
$arr['AUTH_SOURCE_NAME'] = $aux['AUTH_SOURCE_NAME'].' ('.$aux['AUTH_SOURCE_PROVIDER'].')';
$arr['AUTH_SOURCE_PROVIDER'] = $aux['AUTH_SOURCE_PROVIDER'];
$aFields = $arr;
}else{
$arr = Array();
$arr['AUTH_SOURCE_NAME'] = 'ProcessMaker';
$arr['AUTH_SOURCE_NAME'] = 'ProcessMaker (MYSQL)';
$arr['AUTH_SOURCE_PROVIDER'] = 'MYSQL';
$aFields = $arr;
}
@@ -291,28 +302,27 @@ try {
echo '{success: true}';
break;
case 'usersList':
require_once 'classes/model/Users.php';
require_once 'classes/model/LoginLog.php';
require_once 'classes/model/Department.php';
require_once 'classes/model/AppCacheView.php';
G::LoadClass('configuration');
$co = new Configurations();
$config = $co->getConfiguration('usersList', 'pageSize','',$_SESSION['USER_LOGGED']);
$env = $co->getConfiguration('ENVIRONMENT_SETTINGS', '');
$limit_size = isset($config['pageSize']) ? $config['pageSize'] : 20;
$start = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
require_once 'classes/model/Users.php';
require_once 'classes/model/LoginLog.php';
require_once 'classes/model/Department.php';
require_once 'classes/model/AppCacheView.php';
G::LoadClass('configuration');
$co = new Configurations();
$config = $co->getConfiguration('usersList', 'pageSize','',$_SESSION['USER_LOGGED']);
$limit_size = isset($config['pageSize']) ? $config['pageSize'] : 20;
$start = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
$limit = isset($_REQUEST['limit']) ? $_REQUEST['limit'] : $limit_size;
$filter = isset($_REQUEST['textFilter']) ? $_REQUEST['textFilter'] : '';
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn('COUNT(*) AS CNT');
if ($filter != ''){
if ($filter != ''){
$cc = $oCriteria->getNewCriterion(UsersPeer::USR_USERNAME,'%'.$filter.'%',Criteria::LIKE)->addOr(
$oCriteria->getNewCriterion(UsersPeer::USR_FIRSTNAME,'%'.$filter.'%',Criteria::LIKE)->addOr(
$oCriteria->getNewCriterion(UsersPeer::USR_LASTNAME,'%'.$filter.'%',Criteria::LIKE)));
$oCriteria->add($cc);
}
}
$oCriteria->add(UsersPeer::USR_STATUS, array('CLOSED'), Criteria::NOT_IN);
$oDataset = UsersPeer::DoSelectRs ($oCriteria);
$oDataset = UsersPeer::DoSelectRs ($oCriteria);
$oDataset->setFetchmode (ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
$row = $oDataset->getRow();
@@ -351,18 +361,14 @@ try {
$Department = new Department();
$aDepart = $Department->getAllDepartmentsByUser();
$dateFormat = $env['dateFormat'];
$rows = Array();
while($oDataset->next()){
$rows[] = $oDataset->getRow();
$index = sizeof($rows) - 1;
$rows[$index]['DUE_DATE_OK'] = (date('Y-m-d')>date('Y-m-d',strtotime($rows[$index]['USR_DUE_DATE'])))? 0 : 1;
$rows[$index]['DUE_DATE_OK'] = (date('Y-m-d')>date('Y-m-d',strtotime($rows[$index]['USR_DUE_DATE'])))? 0 : 1;
$rows[$index]['LAST_LOGIN'] = isset($aLogin[$rows[$index]['USR_UID']]) ? $aLogin[$rows[$index]['USR_UID']] : '';
$rows[$index]['TOTAL_CASES'] = isset($aCases[$rows[$index]['USR_UID']]) ? $aCases[$rows[$index]['USR_UID']] : 0;
$rows[$index]['DEP_TITLE'] = isset($aDepart[$rows[$index]['USR_UID']]) ? $aDepart[$rows[$index]['USR_UID']] : '';
$rows[$index]['LAST_LOGIN'] = ($rows[$index]['LAST_LOGIN'] != '') ? date($dateFormat,strtotime($rows[$index]['LAST_LOGIN'])) : $rows[$index]['LAST_LOGIN'];
$rows[$index]['USR_DUE_DATE'] = ($rows[$index]['USR_DUE_DATE'] != '') ? date($dateFormat,strtotime($rows[$index]['USR_DUE_DATE'])) : $rows[$index]['USR_DUE_DATE'];
}
echo '{users: '.G::json_encode($rows).', total_users: '.$totalRows.'}';
break;

View File

@@ -67,4 +67,8 @@ $oHeadPublisher->addExtJsScript('users/usersList', false); //adding a javascr
$oHeadPublisher->addContent('users/usersList'); //adding a html file .html.
$oHeadPublisher->assign('CONFIG', $Config);
G::LoadClass('configuration');
$c = new Configurations();
$oHeadPublisher->assign('FORMATS',$c->getFormats());
G::RenderPage('publish', 'extJs');

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -284,7 +284,8 @@ Ext.onReady(function(){
{id: 'AUTH_SOURCE_UID'},
{name : 'AUTH_SOURCE_UID'},
{name : 'AUTH_SOURCE_NAME'},
{name : 'AUTH_SOURCE_PROVIDER'}
{name : 'AUTH_SOURCE_PROVIDER'},
{name : 'AUTH_SOURCE_SHOW'}
]
}),
autoLoad: true
@@ -306,7 +307,7 @@ Ext.onReady(function(){
typeAhead: true,
mode: 'local',
store: comboAuthSourcesStore,
displayField: 'AUTH_SOURCE_NAME',
displayField: 'AUTH_SOURCE_SHOW',
valueField:'AUTH_SOURCE_UID',
allowBlank: false,
submitValue: true,

View File

@@ -24,11 +24,11 @@ new Ext.KeyMap(document, [
{
key: Ext.EventObject.DELETE,
fn: function(k,e){
iGrid = Ext.getCmp('infoGrid');
rowSelected = iGrid.getSelectionModel().getSelected();
if (rowSelected){
DeleteUserAction();
}
iGrid = Ext.getCmp('infoGrid');
rowSelected = iGrid.getSelectionModel().getSelected();
if (rowSelected){
DeleteUserAction();
}
}
}
]);
@@ -238,7 +238,7 @@ Ext.onReady(function(){
{header: _('ID_STATUS'), dataIndex: 'USR_STATUS', width: 50, hidden: false, align: 'center', renderer: render_status},
{header: _('ID_ROLE'), dataIndex: 'USR_ROLE', width: 180, hidden:false, align:'left'},
{header: _('ID_DEPARTMENT'), dataIndex: 'DEP_TITLE', width: 150, hidden:true, align:'left'},
{header: _('ID_LAST_LOGIN'), dataIndex: 'LAST_LOGIN', width: 108, hidden:false, align:'center'},
{header: _('ID_LAST_LOGIN'), dataIndex: 'LAST_LOGIN', width: 108, hidden:false, align:'center', renderer: render_lastlogin},
{header: _('ID_CASES'), dataIndex: 'TOTAL_CASES', width: 45, hidden:false, align:'right'},
{header: _('ID_DUE_DATE'), dataIndex: 'USR_DUE_DATE', width: 108, hidden:false, align:'center', renderer: render_duedate}
]
@@ -399,7 +399,7 @@ photo_user = function(value){
//Render Full Name
full_name = function(v,x,s){
return parseFullName(v, s.data.USR_FIRSTNAME, s.data.USR_LASTNAME, fullNameFormat);
return _FNF(v, s.data.USR_FIRSTNAME, s.data.USR_LASTNAME);
};
//Render Status
@@ -414,9 +414,13 @@ render_status = function(v){
//Render Due Date
render_duedate = function(v,x,s){
if (s.data.DUE_DATE_OK)
return v;
return _DF(v);
else
return '<font color="red">' + v + '</font>';
return '<font color="red">' + _DF(v) + '</font>';
};
render_lastlogin = function(v){
return _DF(v);
};
//Load Grid By Default
@@ -449,13 +453,4 @@ UpdatePageConfig = function(pageSize){
url: 'users_Ajax',
params: {'function':'updatePageSize', size: pageSize}
});
};
//Function Parse Full Name Format
parseFullName = function(uN, fN, lN, f){
var aux = f;
aux = aux.replace('@userName',uN);
aux = aux.replace('@firstName',fN);
aux = aux.replace('@lastName',lN);
return aux;
};