fernando/luos
1
0
Fork 0
Code Releases Activity

Pagination in process permission,process supervisor,and fixed issue with extjs

Browse Source
This commit is contained in:
safan
2011-02-12 12:42:15 +00:00
parent 0c575422a2
commit 4ccf2c140a
5 changed files with 413 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
workflow/engine/methods/bpmn/get-triggers-tree.php
View File

@@ -4,9 +4,11 @@ try
{
G::LoadClass('processMap');
$oProcessMap = new processMap(new DBConnection);
$start = isset($_POST['start'])? $_POST['start']: 0;
$limit = isset($_POST['limit'])? $_POST['limit']: '';
if ( isset($_GET['tid'] ) )
{
$rows = $oProcessMap->getExtStepsCriteria($_GET['tid']); //Getting all assigned steps on a task
$rows = $oProcessMap->getExtStepsCriteria($start, $limit, $_GET['tid']); //Getting all assigned steps on a task
array_shift($rows);
}
@@ -119,52 +121,4 @@ try
'children' => $assignTaskChildren
);
/* $nodes = "[{
text: 'Step 1 - Triggers (0)',
cls: 'blank',
iconCls: 'blank',
children: [{
text: 'Before - Triggers (0)',
cls: 'blank',
iconCls: 'blank',
children: [{
text: 'Assign Before Trigger',
leaf: true,
}]
},{
text: 'After - Triggers (0)',
leaf: true,
cls: 'blank',
iconCls: 'blank',
}]
},{
text: 'Step 2 - Triggers (0)',
children: [{
text: 'Before - Triggers (0)',
leaf: true,
},{
text: 'After - Triggers (0)',
leaf: true,
}]
},{
text: 'Assign Task - Triggers(0)',
children: [{
text: 'Before Assigment - Triggers(0)',
leaf: true,
},{
text: 'Before Derivation - Triggers(0)',
leaf: true,
},{
text: 'After Derivation - Triggers(0)',
leaf: true,
}]
}]";*/
//echo $nodes;
echo json_encode($steps);
echo json_encode($steps);

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

26
workflow/engine/templates/bpmn/ProcessOptions.js
View File

@@ -278,7 +278,7 @@ var dynaformColumns = new Ext.grid.ColumnModel({
bodyStyle : 'padding:10px 0 0 10px;',
//monitorValid : true,
autoHeight: true,
autoScroll: true,
defaults :{autoScroll:true},
items:
[{
xtype: 'fieldset',
@@ -334,7 +334,7 @@ var dynaformColumns = new Ext.grid.ColumnModel({
items:[{
xtype : 'textfield',
fieldLabel: _('ID_TITLE'),
name : 'DYN_TITLE',
name : 'DYN_TITLE1',
width : 350,
allowBlank: false
},{
@@ -360,7 +360,7 @@ var dynaformColumns = new Ext.grid.ColumnModel({
},{
xtype : 'textarea',
fieldLabel: _('ID_DESCRIPTION'),
name : 'DYN_DESCRIPTION',
name : 'DYN_DESCRIPTION1',
height : 120,
width : 350
}
@@ -404,13 +404,13 @@ var dynaformColumns = new Ext.grid.ColumnModel({
{
xtype : 'textfield',
fieldLabel: _('ID_TITLE'),
name : 'DYN_TITLE',
name : 'DYN_TITLE2',
allowBlank: false,
width : 350
},{
xtype : 'textarea',
fieldLabel: _('ID_DESCRIPTION'),
name : 'DYN_DESCRIPTION',
name : 'DYN_DESCRIPTION2',
height : 120,
width : 350
},
@@ -441,8 +441,8 @@ var dynaformColumns = new Ext.grid.ColumnModel({
if(getForm.DYN_SOURCE == 'blankDyna')
{
var sAction = getForm.ACTION;
var sTitle = getForm.DYN_TITLE[0];
var sDesc = getForm.DYN_DESCRIPTION[0];
var sTitle = getForm.DYN_TITLE1;
var sDesc = getForm.DYN_DESCRIPTION1;
}
else
{
@@ -457,8 +457,8 @@ var dynaformColumns = new Ext.grid.ColumnModel({
}
var fieldname = Ext.util.JSON.encode(fName);
var variable = Ext.util.JSON.encode(pVar);
sTitle = getForm.DYN_TITLE[1];
sDesc = getForm.DYN_DESCRIPTION[1];
sTitle = getForm.DYN_TITLE2;
sDesc = getForm.DYN_DESCRIPTION2;
}
if(sTitle == '' || sAction == '')
@@ -517,6 +517,8 @@ var dynaformColumns = new Ext.grid.ColumnModel({
collapsible: false,
maximizable: true,
width: 550,
height: 300,
defaults :{autoScroll:true},
//autoHeight: true,
//height: 500,
layout: 'fit',
@@ -666,7 +668,7 @@ ProcessOptions.prototype.dbConnection = function()
id: 'DBS_DATABASE_NAME',
header: 'Database Name',
dataIndex: 'DBS_DATABASE_NAME',
//width: 100,
width: 150,
sortable: true,
editor: new Ext.form.TextField({
// allowBlank: false
@@ -1901,7 +1903,7 @@ ProcessOptions.prototype.addOutputDoc= function(_5625)
handler: function (s) {
workflow.variablesAction = 'form';
workflow.fieldName = 'OUT_DOC_FILENAME' ;
workflow.variable = '@@',
workflow.variable = '@#',
workflow.formSelected = outputDocForm;
var rowData = ProcMapObj.ExtVariables();
console.log(rowData);
@@ -2521,7 +2523,7 @@ var reportForm =new Ext.FormPanel({
align:'left',
items:[{
xtype: 'combo',
width: 250,
width: 200,
mode: 'local',
editable:false,
fieldLabel: 'Grid Fields',

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

@@ -440,7 +440,7 @@ TaskContext.prototype.editTaskSteps = function(_3252){
title: _('ID_STEPS_OF'),
collapsible: false,
maximizable: false,
width: 750,
width: 770,
height: 365,
minWidth: 200,
minHeight: 150,
@@ -1426,7 +1426,7 @@ TaskContext.prototype.stepTriggers = function()
border : false,
rootVisible : false,
height : 320,
width : 200,
width : 230,
useArrows : false,
autoScroll : true,
animate : true
@@ -1572,7 +1572,7 @@ TaskContext.prototype.stepTriggers = function()
fields : triggersFields
});
//taskUsers.setDefaultSort('LABEL', 'asc');
stepsTriggers.load({params:{start : 0 , limit : 10 }});
stepsTriggers.load({params:{start : 0 , limit : 5 }});
var availableTriggers = new Ext.data.JsonStore({
root : 'data',
@@ -1599,7 +1599,7 @@ TaskContext.prototype.stepTriggers = function()
clicksToEdit: 1,
width : 450,
minHeight:400,
height :400,
height :320,
layout: 'fit',
plugins: [triggerEditor],
columns: [
@@ -1676,7 +1676,7 @@ TaskContext.prototype.stepTriggers = function()
stripeRows: true,
viewConfig: {forceFit: true},
bbar: new Ext.PagingToolbar({
pageSize: 10,
pageSize: 5,
store: stepsTriggers,
displayInfo: true,
displayMsg: 'Displaying Step Tiggers {0} - {1} of {2}',