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

Progress 14 for the dashboards

Browse Source
This commit is contained in:
Julio Cesar Laura
2011-10-31 20:19:21 -04:00
parent c643744c99
commit a8e653d82e
3 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/classes/class.pmDashlet.php
View File

@@ -53,6 +53,18 @@ class PMDashlet extends DashletInstance implements DashletInterface {
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
while ($row = $dataset->getRow()) {
$row['DAS_INS_STATUS_LABEL'] = ($row['DAS_INS_STATUS'] == '1' ? G::LoadTranslation('ID_ACTIVE') : G::LoadTranslation('ID_INACTIVE'));
switch ($row['DAS_INS_OWNER_TYPE']) {
case 'DEPARTMENT':
require_once 'classes/model/Department.php';
$departmentInstance = new Department();
$department = $departmentInstance->load($row['DAS_INS_OWNER_UID']);
$row['DAS_INS_OWNER_TITLE'] = $department['DEPO_TITLE'];
break;
default:
$row['DAS_INS_OWNER_TITLE'] = $row['DAS_INS_OWNER_TYPE'];
break;
}
$dashletsInstances[] = $row;
$dataset->next();
}

3
workflow/engine/controllers/dashboard.php
View File

@@ -44,7 +44,7 @@ class Dashboard extends Controller {
$width = 300;
}
else {
$width = $_REQUEST['w']-10;
$width = $_REQUEST['w'];
}
$this->pmDashlet->render( $width);
}
@@ -119,6 +119,7 @@ class Dashboard extends Controller {
}
catch (Exception $error) {
//ToDo: Display a error message
error_log($error->getMessage());
}
}

32
workflow/engine/templates/dashboard/dashletsList.js
View File

@@ -151,18 +151,13 @@ Ext.onReady(function(){
totalProperty: 'totalDashletsInstances',
fields : [
{name : 'DAS_INS_UID'},
{name : 'AUTH_SOURCE_NAME'},
{name : 'AUTH_SOURCE_PROVIDER'},
{name : 'AUTH_SOURCE_SERVER_NAME'},
{name : 'AUTH_SOURCE_PORT'},
{name : 'AUTH_SOURCE_ENABLED_TLS'},
{name : 'AUTH_SOURCE_VERSION'},
{name : 'AUTH_SOURCE_BASE_DN'},
{name : 'AUTH_ANONYMOUS'},
{name : 'AUTH_SOURCE_SEARCH_USER'},
{name : 'AUTH_SOURCE_ATTRIBUTES'},
{name : 'AUTH_SOURCE_OBJECT_CLASSES'},
{name : 'CURRENT_USERS', type:'int'}
{name : 'DAS_TITLE'},
{name : 'DAS_VERSION'},
{name : 'DAS_INS_TYPE'},
{name : 'DAS_INS_CONTEXT_TIME'},
{name : 'DAS_INS_OWNER_TITLE'},
{name : 'DAS_INS_UPDATE_DATE'},
{name : 'DAS_INS_STATUS_LABEL'}
]
})
});
@@ -174,11 +169,14 @@ Ext.onReady(function(){
},
columns: [
{id:'DAS_INS_UID', dataIndex: 'DAS_INS_UID', hidden:true, hideable:false},
{header: _('ID_NAME'), dataIndex: 'AUTH_SOURCE_NAME', width: 200, hidden:false, align:'left'},
{header: _('ID_PROVIDER'), dataIndex: 'AUTH_SOURCE_PROVIDER', width: 120, hidden: false, align: 'center'},
{header: _('ID_SERVER_NAME'), dataIndex: 'AUTH_SOURCE_SERVER_NAME', width: 180, hidden: false, align: 'center'},
{header: _('ID_PORT'), dataIndex: 'AUTH_SOURCE_PORT', width: 60, hidden: false, align: 'center'},
{header: _('ID_ACTIVE_USERS'), dataIndex: 'CURRENT_USERS', width: 90, hidden: false, align: 'center'}
{header: _('ID_NAME'), dataIndex: 'DAS_TITLE', width: 200, hidden:false, align:'left'},
{header: _('ID_VERSION'), dataIndex: 'DAS_VERSION', width: 60, hidden: false, align: 'center'},
{header: _('ID_TYPE'), dataIndex: 'DAS_INS_TYPE', width: 100, hidden: false, align: 'center'},
//{header: _('ID_PERIOD'), dataIndex: 'DAS_INS_CONTEXT_TIME', width: 100, hidden: false, align: 'center'},
{header: 'Period', dataIndex: 'DAS_INS_CONTEXT_TIME', width: 100, hidden: false, align: 'center'},
{header: _('ID_OWNER'), dataIndex: 'DAS_INS_OWNER_TITLE', width: 200, hidden: false, align: 'center'},
{header: _('ID_UPDATE_DATE'), dataIndex: 'DAS_INS_UPDATE_DATE', width: 80, hidden: false, align: 'center'},
{header: _('ID_STATUS'), dataIndex: 'DAS_INS_STATUS_LABEL', width: 60, hidden: false, align: 'center'}
]
});