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

Solved task saving issue and worked on showing Variables pop-up window when clicked on '@@' for showing available conditions list in ExtJs

Browse Source
This commit is contained in:
safan
2011-01-12 13:10:20 +00:00
parent 0c69f01561
commit 7d9caa5ddd
3 changed files with 95 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
workflow/engine/methods/bpmn/proxyExtjs.php
View File

@@ -132,6 +132,7 @@ switch($_GET['action'])
case 'getAssignedCaseTrackerObjects':
$rows = $oProcessMap->getExtCaseTrackerObjectsCriteria($_GET['pid']);
array_shift($rows);
break;
case 'getAvailableCaseTrackerObjects':
@@ -179,6 +180,53 @@ switch($_GET['action'])
array_shift($rows);
break;
case 'getTaskPropertiesList':
require_once 'classes/model/Task.php';
$oTask = new Task();
$rows = $oTask->load($_GET['tid']);
while (list($key, $value) = each($rows)) {
if ($value == 'TRUE')
$rows[$key] = true;
else if($value == 'FALSE')
$rows[$key] = false;
if($key == 'TAS_TYPE_DAY' && $value == '1')
$rows[$key] = 'Work Days';
else if($key == 'TAS_TYPE_DAY' && $value == '2')
$rows[$key] = 'Calendar Days';
if($key == 'TAS_ASSIGN_TYPE')
{
switch($value)
{
case 'SELF_SERVICE':
$rows[$value] = 'true';
break;
case 'REPORT_TO':
$rows[$value] = 'true';
break;
case 'BALANCED':
$rows[$value] = 'true';
break;
case 'MANUAL':
$rows[$value] = 'true';
break;
case 'EVALUATE':
$rows[$value] = 'true';
$rows['hideEvaluateField'] = 'false';
break;
case 'STATIC_MI':
$rows[$value] = 'true';
$rows['hidePartialJoinField'] = 'false';
break;
case 'CANCEL_MI':
$rows[$value] = 'true';
$rows['hidePartialJoinField'] = 'false';
break;
}
}
}
}
//$result['totalCount'] = count($rows);
//$result['data'] = $rows;

57
workflow/engine/templates/bpmn/ProcessMapContext.js
View File

@@ -190,7 +190,7 @@ ProcessMapContext.prototype.exportProcess= function()
//taskUsers.setDefaultSort('LABEL', 'asc');
exportProcess.load();*/
var obj='FILENAME_LINKXPDL';
var exportProcessForm = new Ext.FormPanel({
labelWidth : 120, // label settings here cascade unless overridden
frame : true,
@@ -230,14 +230,28 @@ ProcessMapContext.prototype.exportProcess= function()
fieldLabel : 'File',
name : 'FILENAME_LINK',
readOnly :true
},{
xtype : 'button',
fieldLabel : 'File XPDL',
name : 'FILENAME_LINKXPDL',
dataIndex : 'FILENAME_LINKXPDL',
html : '<a href="javascript: Ext.ux.classobj.method(' + Ext.util.JSON.encode(obj) + ')" ></a>'
//},{
// xtype : 'button',
// fieldLabel : 'File XPDL',
// name : 'FILENAME_LINKXPDL',
//dataIndex : 'FILENAME_LINKXPDL',
// html : '<a href="javascript: Ext.ux.classobj.method(' + Ext.util.JSON.encode(obj) + ')" ></a>'
//readOnly :true
},{
xtype: "panel",
html: new Ext.XTemplate("<a href='#'>{value}").apply({
value:'FILENAME_LINKXPDL'
})
},{
xtype: 'box',
autoEl: {
tag: 'a',
html: '3. Dom element created by a DomHelper and wrapped as Component',
href: '#'
}},
{
xtype : 'button',
name : 'FILENAME_LINK',
html : '<a href=\"http:\/\/www.google.at\">Link<\/a>',
@@ -671,17 +685,36 @@ var tb = new Ext.Toolbar({
{name : 'All', value: '0'},
{name : 'DYNAFORM', value: '1'},
{name : 'INPUT', value: '2'},
{name : 'OUTPUT', value: '3'}]})
{name : 'OUTPUT', value: '3'}]}),
onSelect: function(record, index) {
//Show-Hide Format Type Field
if(record.data.value == '1')
{Ext.getCmp("dynaform").show();
Ext.getCmp("inputdoc").hide();
Ext.getCmp("outputdoc").hide()}
else if(record.data.value == '2')
{Ext.getCmp("inputdoc").show();
Ext.getCmp("dynaform").hide();
Ext.getCmp("outputdoc").hide()}
else
{Ext.getCmp("outputdoc").show();
Ext.getCmp("inputdoc").hide();
Ext.getCmp("dynaform").hide()}
this.setValue(record.data[this.valueField || this.displayField]);
this.collapse();
}
},
{
xtype: 'fieldset',
id : 'dynaform',
hidden: false,
hidden: true,
items: [{
xtype: 'combo',
fieldLabel: 'Dynaform',
//hiddenName:'UID',
autoload: true,
width:200,
store: dynaformStore,
valueField:'LABEL',
displayField:'LABEL',
@@ -699,11 +732,12 @@ var tb = new Ext.Toolbar({
},{
xtype: 'fieldset',
id : 'inputdoc',
hidden: false,
hidden: true,
items: [{
xtype: 'combo',
fieldLabel: 'Input Document',
//hiddenName:'UID',
width:200,
autoload: true,
store: inputDocStore,
valueField:'UID',
@@ -722,11 +756,12 @@ var tb = new Ext.Toolbar({
},{
xtype: 'fieldset',
id : 'outputdoc',
hidden: false,
hidden: true,
items: [{
xtype: 'combo',
fieldLabel: 'Output Document',
//hiddenName:'popType',
width:200,
autoload: true,
store: outputDocStore,
valueField:'LABEL',

2
workflow/engine/templates/bpmn/TaskContext.js
View File

@@ -1310,7 +1310,7 @@ TaskContext.prototype.editTaskProperties= function(_5625)
//Loading Task Details into the form
taskPropertiesTabs.form.load({
url:'proxyExtjs.php?tid='+taskId+'&action=getPropertiesList',
url:'proxyExtjs.php?tid='+taskId+'&action=getTaskPropertiesList',
method:'GET',
waitMsg:'Loading',
success:function(form, action) {