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

Progress 13 for the dashboards

Browse Source
This commit is contained in:
Julio Cesar Laura
2011-10-31 19:06:40 -04:00
parent 6935394727
commit 8068f7dd26
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,7 @@ class PMDashlet extends DashletInstance implements DashletInterface {
public function saveDashletInstance($data) { public function saveDashletInstance($data) {
try { try {
$this->dashletObject->createOrUpdate($data); $this->createOrUpdate($data);
} }
catch (Exception $error) { catch (Exception $error) {
throw $error; throw $error;
@@ -98,7 +98,7 @@ class PMDashlet extends DashletInstance implements DashletInterface {
public function deleteDashletInstance($dasInsUid) { public function deleteDashletInstance($dasInsUid) {
try { try {
$this->dashletObject->remove($dasInsUid); $this->remove($dasInsUid);
} }
catch (Exception $error) { catch (Exception $error) {
throw $error; throw $error;

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

@@ -85,6 +85,12 @@ class Dashboard extends Controller {
$result = new stdclass(); $result = new stdclass();
$result->status = 'OK'; $result->status = 'OK';
try { try {
if (!isset($data->start)) {
$data->start = null;
}
if (!isset($data->limit)) {
$data->limit = null;
}
$result->dashletsInstances = $this->pmDashlet->getDashletsInstances($data->start, $data->limit); $result->dashletsInstances = $this->pmDashlet->getDashletsInstances($data->start, $data->limit);
$result->totalDashletsInstances = $this->pmDashlet->getDashletsInstancesQuantity(); $result->totalDashletsInstances = $this->pmDashlet->getDashletsInstancesQuantity();
} }

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

@@ -150,7 +150,7 @@ Ext.onReady(function(){
root: 'dashletsInstances', root: 'dashletsInstances',
totalProperty: 'totalDashletsInstances', totalProperty: 'totalDashletsInstances',
fields : [ fields : [
{name : 'AUTH_SOURCE_UID'}, {name : 'DAS_INS_UID'},
{name : 'AUTH_SOURCE_NAME'}, {name : 'AUTH_SOURCE_NAME'},
{name : 'AUTH_SOURCE_PROVIDER'}, {name : 'AUTH_SOURCE_PROVIDER'},
{name : 'AUTH_SOURCE_SERVER_NAME'}, {name : 'AUTH_SOURCE_SERVER_NAME'},
@@ -173,7 +173,7 @@ Ext.onReady(function(){
sortable: true sortable: true
}, },
columns: [ columns: [
{id:'AUTH_SOURCE_UID', dataIndex: 'AUTH_SOURCE_UID', hidden:true, hideable:false}, {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_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_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_SERVER_NAME'), dataIndex: 'AUTH_SOURCE_SERVER_NAME', width: 180, hidden: false, align: 'center'},
@@ -212,8 +212,10 @@ Ext.onReady(function(){
pageSize: pageSize, pageSize: pageSize,
store: store, store: store,
displayInfo: true, displayInfo: true,
displayMsg: _('ID_GRID_PAGE_DISPLAYING_DASHLET_MESSAGE') + '    ', //displayMsg: _('ID_GRID_PAGE_DISPLAYING_DASHLET_MESSAGE') + '    ',
emptyMsg: _('ID_GRID_PAGE_NO_DASHLET_MESSAGE'), displayMsg: 'Displaying dashlets instances {0} - {1} of {2}' + '    ',
//emptyMsg: _('ID_GRID_PAGE_NO_DASHLET_MESSAGE'),
emptyMsg: 'No dashlets instances to display',
items: ['-',_('ID_PAGE_SIZE')+':',comboPageSize] items: ['-',_('ID_PAGE_SIZE')+':',comboPageSize]
}); });
@@ -233,7 +235,8 @@ Ext.onReady(function(){
viewConfig: { viewConfig: {
forceFit:true forceFit:true
}, },
title : _('ID_DASHLET_INSTANCE'), //title : _('ID_DASHLETS_INSTANCES'),
title : 'Dashlets Instances',
store: store, store: store,
cm: cmodel, cm: cmodel,
sm: smodel, sm: smodel,
@@ -308,18 +311,18 @@ newDashletInstance = function() {
editDashletInstance = function(){ editDashletInstance = function(){
var rowSelected = infoGrid.getSelectionModel().getSelected(); var rowSelected = infoGrid.getSelectionModel().getSelected();
if (rowSelected){ if (rowSelected){
location.href = 'dashletInstanceForm?$dasInsUid=' + rowSelected.data.AUTH_SOURCE_UID; location.href = 'dashletInstanceForm?dasInsUid=' + rowSelected.data.DAS_INS_UID;
} }
}; };
//Delete Dashlet Instance Action //Delete Dashlet Instance Action
deleteDashletInstance = function(){ deleteDashletInstance = function(){
var rowSelected = infoGrid.getSelectionModel().getSelected(); var rowSelected = infoGrid.getSelectionModel().getSelected();
if (rowSelected){ /*if (rowSelected){
viewport.getEl().mask(_('ID_PROCESSING')); viewport.getEl().mask(_('ID_PROCESSING'));
Ext.Ajax.request({ Ext.Ajax.request({
url: 'deleteDashletInstance', url: 'deleteDashletInstance',
params: {dasInsUid: rowSelected.data.AUTH_SOURCE_UID}, params: {dasInsUid: rowSelected.data.DAS_INS_UID},
success: function(r,o){ success: function(r,o){
viewport.getEl().unmask(); viewport.getEl().unmask();
response = Ext.util.JSON.decode(r.responseText); response = Ext.util.JSON.decode(r.responseText);
@@ -329,7 +332,7 @@ deleteDashletInstance = function(){
viewport.getEl().mask(_('ID_PROCESSING')); viewport.getEl().mask(_('ID_PROCESSING'));
Ext.Ajax.request({ Ext.Ajax.request({
url: 'deleteDashletInstance', url: 'deleteDashletInstance',
params: {dasInsUid : rowSelected.data.AUTH_SOURCE_UID}, params: {dasInsUid : rowSelected.data.DAS_INS_UID},
success: function(r,o){ success: function(r,o){
viewport.getEl().unmask(); viewport.getEl().unmask();
resp = Ext.util.JSON.decode(r.responseText); resp = Ext.util.JSON.decode(r.responseText);
@@ -357,5 +360,5 @@ deleteDashletInstance = function(){
viewport.getEl().unmask(); viewport.getEl().unmask();
} }
}); });
} }*/
}; };