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

Update Look n Feel and Functionality of User Manager

Browse Source
This commit is contained in:
Enrique Ponce de Leon
2011-02-07 16:54:10 +00:00
parent 70dced295d
commit b3e55e2dcb
9 changed files with 1530 additions and 1054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1194,4 +1194,20 @@ class AppCacheView extends BaseAppCacheView {
return ($rowData);
}
//Added By Qennix
function getTotalCasesByAllUsers(){
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(AppCacheViewPeer::USR_UID);
$oCriteria->addAsColumn('CNT', 'COUNT(DISTINCT(APP_UID))');
$oCriteria->addGroupByColumn(AppCacheViewPeer::USR_UID);
$Dat = AppCacheViewPeer::doSelectRS ($oCriteria);
$Dat->setFetchmode (ResultSet::FETCHMODE_ASSOC);
$aRows = Array();
while ($Dat->next()){
$row = $Dat->getRow();
$aRows[$row['USR_UID']] = $row['CNT'];
}
return $aRows;
}
} // AppCacheView

36
workflow/engine/classes/model/Department.php
View File

@@ -394,19 +394,35 @@ protected $depo_title = '';
// select departments
// this function is used to draw the hierachy tree view
function getDepartments( $DepParent ) {
function getDepartments( $DepParent ) {
try {
$result = array();
$criteria = new Criteria('workflow');
$criteria->add(DepartmentPeer::DEP_PARENT, $DepParent, Criteria::EQUAL);
$con = Propel::getConnection(DepartmentPeer::DATABASE_NAME);
$objects = DepartmentPeer::doSelect($criteria, $con);
global $RBAC;
foreach( $objects as $oDepartment ) {
$node = array();
$node['DEP_UID'] = $oDepartment->getDepUid();
$node['DEP_PARENT'] = $oDepartment->getDepParent();
$node['DEP_TITLE'] = $oDepartment->getDepTitle();
$node['DEP_STATUS'] = $oDepartment->getDepStatus();
$node['DEP_MANAGER'] = $oDepartment->getDepManager();
$node['DEP_LAST'] = 0;
$manager = $oDepartment->getDepManager();
if ($manager != ''){
$UserUID = $RBAC->load($manager);
$node['DEP_MANAGER_USERNAME'] = $UserUID['USR_USERNAME'];
$node['DEP_MANAGER_FIRSTNAME'] = $UserUID['USR_FIRSTNAME'];
$node['DEP_MANAGER_LASTNAME'] = $UserUID['USR_LASTNAME'];
}else{
$node['DEP_MANAGER_USERNAME'] = '';
$node['DEP_MANAGER_FIRSTNAME'] = '';
$node['DEP_MANAGER_LASTNAME'] = '';
}
$criteriaCount = new Criteria('workflow');
$criteriaCount->clearSelectColumns();
@@ -555,5 +571,23 @@ protected $depo_title = '';
$c->add(ContentPeer::CON_LANG, SYS_LANG );
return $c;
}
//Added by Qennix
function getAllDepartmentsByUser(){
$c = new Criteria('workflow');
$c->addSelectColumn(UsersPeer::USR_UID);
$c->addAsColumn('DEP_TITLE', ContentPeer::CON_VALUE);
$c->add(ContentPeer::CON_LANG,defined(SYS_LANG)?SYS_LANG:'en');
$c->add(ContentPeer::CON_CATEGORY,'DEPO_TITLE');
$c->addJoin(UsersPeer::DEP_UID, ContentPeer::CON_ID,Criteria::INNER_JOIN);
$Dat = UsersPeer::doSelectRS ($c);
$Dat->setFetchmode (ResultSet::FETCHMODE_ASSOC);
$aRows = Array();
while ($Dat->next()){
$row = $Dat->getRow();
$aRows[$row['USR_UID']] = $row['DEP_TITLE'];
}
return $aRows;
}
} // Department

30
workflow/engine/classes/model/LoginLog.php
View File

@@ -109,5 +109,35 @@ class LoginLog extends BaseLoginLog {
throw($e);
}
}
//Added by Qennix
function getLastLoginByUser($sUID){
$c = new Criteria();
$c->addSelectColumn(LoginLogPeer::LOG_INIT_DATE);
$c->add(LoginLogPeer::USR_UID,$sUID);
$c->setLimit(1);
$c->addDescendingOrderByColumn(LoginLogPeer::LOG_INIT_DATE);
$Dat = LoginLogPeer::doSelectRS ($c);
$Dat->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
$Dat->next();
$aRow = $Dat->getRow();
return isset($aRow['LOG_INIT_DATE']) ? $aRow['LOG_INIT_DATE'] : '';
}
//Added by Qennix
function getLastLoginAllUsers(){
$c = new Criteria();
$c->addSelectColumn(LoginLogPeer::USR_UID);
$c->addAsColumn('LAST_LOGIN', 'MAX(LOG_INIT_DATE)');
$c->addGroupByColumn(LoginLogPeer::USR_UID);
$Dat = LoginLogPeer::doSelectRS ($c);
$Dat->setFetchmode (ResultSet::FETCHMODE_ASSOC);
$aRows = Array();
while ($Dat->next()){
$row = $Dat->getRow();
$aRows[$row['USR_UID']] = $row['LAST_LOGIN'];
}
return $aRows;
}
} // LoginLog