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

BUG 000 Second progress in the dashboards changes for the release of December

Browse Source
This commit is contained in:
Julio Cesar Laura
2011-12-02 14:51:32 -04:00
parent c369b8de0b
commit 4a13322dad
4 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.dashletOpenVSCompleted.php
View File

@@ -15,7 +15,7 @@ class dashletOpenVSCompleted implements DashletInterface {
private $greenFrom;
private $greenTo;
public static function getAdditionalFields($a) {
public static function getAdditionalFields($className) {
$additionalFields = array();
$contextTimeStore = new stdclass();

6
workflow/engine/classes/class.dashletProcessMakerCommunity.php
View File

@@ -15,10 +15,10 @@ class dashletProcessMakerCommunity implements DashletInterface {
private $greenFrom;
private $greenTo;
public static function getAdditionalFields($a) {
public static function getAdditionalFields($className) {
$additionalFields = array();
$contextTimeStore = new stdclass();
/*$contextTimeStore = new stdclass();
$contextTimeStore->xtype = 'arraystore';
$contextTimeStore->fields = array('id', 'value');
$contextTimeStore->data = array(array('TODAY', 'Today'),
@@ -108,7 +108,7 @@ class dashletProcessMakerCommunity implements DashletInterface {
$greenTo->maxValue = 100;
$greenTo->minValue = 0;
$greenTo->allowBlank = false;
$additionalFields[] = $greenTo;
$additionalFields[] = $greenTo;*/
return $additionalFields;
}

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

@@ -166,6 +166,22 @@ class Dashboard extends Controller {
return $result;
}
public function getAdditionalFields($data) {
$this->setResponseType('json');
$result = new stdclass();
$result->status = 'OK';
try {
$dashlet = new Dashlet();
$dashletFields = $dashlet->load($data->DAS_UID);
$result->additionaFields = PMDashlet::getAdditionalFields($dashletFields['DAS_CLASS']);
}
catch(Exception $error) {
$result->status = 'ERROR';
$result->message = $error->getMessage();
}
return $result;
}
public function getOwnersByType($data) {
$this->setResponseType('json');
$result = new stdclass();

25
workflow/engine/templates/dashboard/dashletInstanceForm.js
View File

@@ -16,7 +16,7 @@ Ext.onReady(function() {
storeDasInsOwnerType = new Ext.data.ArrayStore({
idIndex: 0,
fields: ['id', 'value'],
data: [['USER', 'User'], ['DEPARTMENT', 'Department'], ['GROUP', 'Group']]
data: [['USER', 'User'], ['DEPARTMENT', 'Department'], ['GROUP', 'Group'], ['EVERYBODY', 'Everybody']]
});
storeDasInsOwnerUID = new Ext.data.Store({
@@ -69,10 +69,19 @@ Ext.onReady(function() {
Ext.Ajax.request({
url: 'getAdditionalFields',
method: 'POST',
params: '',
params: {DAS_UID: this.getValue()},
success: function (result, request) {
var dataResponse = Ext.util.JSON.decode(result.responseText)
//
var response = Ext.util.JSON.decode(result.responseText)
additionaFields = response.additionaFields;
dashletInstanceFrm.remove('additional');
if (additionaFields.length > 0) {
dashletInstanceFrm.add(new Ext.form.FieldSet({
id: 'additional',
title: 'Other',
items: additionaFields
}));
}
dashletInstanceFrm.doLayout(false, true);
},
failure: function (result, request) {
myMask.hide();
@@ -122,8 +131,14 @@ Ext.onReady(function() {
formFields = [
new Ext.form.FieldSet({
id: 'general',
title: 'General',
items: [hiddenDasInsUID, cboDasUID, cboDasInsOwnerType, cboDasInsOwnerUID]
}),
new Ext.form.FieldSet({
id: 'additional',
title: 'Other',
items: additionaFields
})
];
@@ -135,7 +150,7 @@ Ext.onReady(function() {
width: 465,
frame: true,
title: 'Dashlet Instance Configuration',
items: formFields.concat(additionaFields),
items: formFields,
buttonAlign: 'right',
buttons: [
new Ext.Action({