From ab465d532b091583149cf462aa05c837713e3e36 Mon Sep 17 00:00:00 2001 From: safan Date: Tue, 11 Jan 2011 13:09:14 +0000 Subject: [PATCH] Was testing all Extjs form and fix issues that were found. Also worked on getting Export Process link --- .../templates/bpmn/ProcessMapContext.js | 58 +++++++++++-------- .../engine/templates/bpmn/ProcessOptions.js | 24 ++++---- 2 files changed, 49 insertions(+), 33 deletions(-) diff --git a/workflow/engine/templates/bpmn/ProcessMapContext.js b/workflow/engine/templates/bpmn/ProcessMapContext.js index cdca84153..205ef3993 100755 --- a/workflow/engine/templates/bpmn/ProcessMapContext.js +++ b/workflow/engine/templates/bpmn/ProcessMapContext.js @@ -110,6 +110,7 @@ ProcessMapContext.prototype.editProcess= function(_5678) minWidth: 300, minHeight: 200, layout: 'fit', + autoScroll: true, plain: true, bodyStyle: 'padding:5px;', buttonAlign: 'center', @@ -189,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,11 +231,12 @@ ProcessMapContext.prototype.exportProcess= function() name : 'FILENAME_LINK', readOnly :true },{ - xtype : 'textfield', + xtype : 'button', fieldLabel : 'File XPDL', name : 'FILENAME_LINKXPDL', dataIndex : 'FILENAME_LINKXPDL', - readOnly :true + html : '' + //readOnly :true },{ xtype : 'button', name : 'FILENAME_LINK', @@ -292,6 +294,7 @@ ProcessMapContext.prototype.exportProcess= function() minHeight : 200, layout : 'fit', plain : true, + autoScroll: true, bodyStyle : 'padding:5px;', buttonAlign: 'center', items : exportProcessForm @@ -358,6 +361,7 @@ var PermissionGridColumn = new Ext.grid.ColumnModel({ dataIndex: 'TASK_TARGET', autoWidth: true, editable: false, + width:120, sortable: true, editor: new Ext.form.TextField({ //allowBlank: false @@ -366,7 +370,7 @@ var PermissionGridColumn = new Ext.grid.ColumnModel({ id: 'GROUP_USER', header: 'Group or Users', dataIndex: 'GROUP_USER', - //width: 100, + width: 150, sortable: true, editor: new Ext.form.TextField({ //allowBlank: false @@ -375,7 +379,7 @@ var PermissionGridColumn = new Ext.grid.ColumnModel({ id: 'TASK_SOURCE', header: 'Origin Task', dataIndex: 'TASK_SOURCE', - //width: 100, + width: 120, sortable: true, editor: new Ext.form.TextField({ //allowBlank: false @@ -384,7 +388,7 @@ var PermissionGridColumn = new Ext.grid.ColumnModel({ id: 'PARTICIPATED', header: 'Participation', dataIndex: 'PARTICIPATED', - width: 100, + width: 120, sortable: true, editor: new Ext.form.TextField({ //allowBlank: false @@ -393,7 +397,7 @@ var PermissionGridColumn = new Ext.grid.ColumnModel({ id: 'OBJECT_TYPE', header: 'Type', dataIndex: 'OBJECT_TYPE', - //width: 100, + width: 100, editable: false, sortable: true, editor: new Ext.form.TextField({ @@ -403,7 +407,7 @@ var PermissionGridColumn = new Ext.grid.ColumnModel({ id: 'OBJECT', header: 'Object', dataIndex: 'OBJECT', - //width: 100, + width: 100, sortable: true, editor: new Ext.form.TextField({ //allowBlank: false @@ -412,7 +416,7 @@ var PermissionGridColumn = new Ext.grid.ColumnModel({ id: 'ACTION', header: 'Permission', dataIndex: 'ACTION', - //width: 100, + width: 120, sortable: true, editor: new Ext.form.TextField({ //allowBlank: false @@ -421,7 +425,7 @@ var PermissionGridColumn = new Ext.grid.ColumnModel({ id: 'OP_CASE_STATUS', header: 'Status', dataIndex: 'OP_CASE_STATUS', - width: 100, + width: 120, sortable: true, editor: new Ext.form.TextField({ //allowBlank: false @@ -473,8 +477,8 @@ var tb = new Ext.Toolbar({ title: 'Process Permissions', collapsible: false, maximizable: true, - width: 600, - //autoHeight: true, + width: 800, + autoScroll: true, height: 450, layout: 'fit', plain: true, @@ -794,6 +798,7 @@ var formWindow = new Ext.Window({ collapsible: false, maximizable: true, width: 450, + autoScroll: true, //autoHeight: true, height: 420, //layout: 'fit', @@ -1060,6 +1065,7 @@ ProcessMapContext.prototype.processSupervisors= function() height: 350, minWidth: 200, minHeight: 150, + autoScroll: true, layout: 'fit', plain: true, bodyStyle: 'padding:5px;', @@ -1223,11 +1229,11 @@ ProcessMapContext.prototype.processDynaform= function() var User = grid.getStore(); var selectedrowIndex = '0'; - User.data.items[selectedrowIndex].data.STEP_UID = record.data.STEP_UID; - User.data.items[selectedrowIndex].data.STEP_UID_OBJ = record.data.STEP_UID_OBJ; - User.data.items[selectedrowIndex].data.STEP_TYPE_OBJ = record.data.STEP_TYPE_OBJ; - User.data.items[selectedrowIndex].data.STEP_POSITION = record.data.STEP_POSITION; - User.data.items[selectedrowIndex].data.DYN_UID = record.data.DYN_UID; + User.data.items[selectedrowIndex].data.STEP_UID = record.data.STEP_UID; + User.data.items[selectedrowIndex].data.STEP_UID_OBJ = record.data.STEP_UID_OBJ; + User.data.items[selectedrowIndex].data.STEP_TYPE_OBJ = record.data.STEP_TYPE_OBJ; + User.data.items[selectedrowIndex].data.STEP_POSITION = record.data.STEP_POSITION; + User.data.items[selectedrowIndex].data.DYN_UID = record.data.DYN_UID; this.setValue(record.data[this.valueField || this.displayField]); this.collapse(); @@ -1278,6 +1284,7 @@ ProcessMapContext.prototype.processDynaform= function() minWidth: 200, minHeight: 150, layout: 'fit', + autoScroll: true, plain: true, bodyStyle: 'padding:5px;', buttonAlign: 'center', @@ -1441,10 +1448,10 @@ ProcessMapContext.prototype.processIODoc= function() var selectedrowIndex = '0'; User.data.items[selectedrowIndex].data.STEP_UID = record.data.STEP_UID; - User.data.items[selectedrowIndex].data.STEP_UID_OBJ = record.data.STEP_UID_OBJ; - User.data.items[selectedrowIndex].data.STEP_TYPE_OBJ = record.data.STEP_TYPE_OBJ; - User.data.items[selectedrowIndex].data.STEP_POSITION = record.data.STEP_POSITION; - User.data.items[selectedrowIndex].data.INP_DOC_UID = record.data.INP_DOC_UID; + User.data.items[selectedrowIndex].data.STEP_UID_OBJ = record.data.STEP_UID_OBJ; + User.data.items[selectedrowIndex].data.STEP_TYPE_OBJ = record.data.STEP_TYPE_OBJ; + User.data.items[selectedrowIndex].data.STEP_POSITION = record.data.STEP_POSITION; + User.data.items[selectedrowIndex].data.INP_DOC_UID = record.data.INP_DOC_UID; this.setValue(record.data[this.valueField || this.displayField]); this.collapse(); @@ -1494,6 +1501,7 @@ ProcessMapContext.prototype.processIODoc= function() height: 350, minWidth: 200, minHeight: 150, + autoScroll: true, layout: 'fit', plain: true, bodyStyle: 'padding:5px;', @@ -1518,13 +1526,14 @@ ProcessMapContext.prototype.processFileManager= function() }); var window = new Ext.Window({ - title: 'Edit Process', + title: 'Process File Manager', collapsible: false, maximizable: false, width: 500, height: 400, minWidth: 300, minHeight: 200, + autoScroll: true, layout: 'fit', plain: true, bodyStyle: 'padding:5px;', @@ -1594,7 +1603,7 @@ ProcessMapContext.prototype.caseTrackerProperties= function() layout: 'form', border:false, items: [{ - width :100, + width :100, xtype :'combo', mode :'local', triggerAction :'all', @@ -1645,6 +1654,7 @@ ProcessMapContext.prototype.caseTrackerProperties= function() //minWidth: 300, //minHeight: 200, layout: 'fit', + autoScroll: true, plain: true, bodyStyle: 'padding:5px;', buttonAlign: 'center', @@ -1960,6 +1970,7 @@ ProcessMapContext.prototype.caseTrackerObjects= function() minHeight : 150, layout : 'fit', plain : true, + autoScroll : true, bodyStyle : 'padding:5px;', items : Objectsgrid, buttonAlign : 'center' @@ -2115,6 +2126,7 @@ ProcessMapContext.prototype.ExtVariables = function() height: 350, minWidth: 200, minHeight: 150, + autoScroll: true, layout: 'fit', plain: true, bodyStyle: 'padding:5px;', diff --git a/workflow/engine/templates/bpmn/ProcessOptions.js b/workflow/engine/templates/bpmn/ProcessOptions.js index 609b45417..41fab898b 100755 --- a/workflow/engine/templates/bpmn/ProcessOptions.js +++ b/workflow/engine/templates/bpmn/ProcessOptions.js @@ -25,7 +25,7 @@ ProcessOptions.prototype.addDynaform= function(_5625) }); var btnAdd = new Ext.Button({ id: 'btnAdd', - text: 'New Dynaform', + text: 'New', iconCls: 'application_add', handler: function () { formWindow.show(); @@ -34,7 +34,7 @@ ProcessOptions.prototype.addDynaform= function(_5625) var btnRemove = new Ext.Button({ id: 'btnRemove', - text: 'Delete Dynaform', + text: 'Delete', iconCls: 'application_delete', handler: function (s) { editor.stopEditing(); @@ -393,6 +393,7 @@ ProcessOptions.prototype.addDynaform= function(_5625) var gridWindow = new Ext.Window({ title: 'Dynaform', + autoScroll: true, collapsible: false, maximizable: true, width: 600, @@ -407,6 +408,7 @@ ProcessOptions.prototype.addDynaform= function(_5625) var formWindow = new Ext.Window({ title: 'Dynaform', + autoScroll: true, collapsible: false, maximizable: true, width: 550, @@ -1014,7 +1016,7 @@ ProcessOptions.prototype.addInputDoc= function(_5625) var btnRemove = new Ext.Button({ id: 'btnRemove', - text: 'Delete Input Document', + text: 'Delete', iconCls: 'application_delete', handler: function (s) { editor.stopEditing(); @@ -1069,7 +1071,7 @@ ProcessOptions.prototype.addInputDoc= function(_5625) var btnAdd = new Ext.Button({ id: 'btnAdd', - text: 'New Input Document', + text: 'New', iconCls: 'application_add', handler: function () { newIOWindow.show(); @@ -1318,18 +1320,20 @@ ProcessOptions.prototype.addInputDoc= function(_5625) plain: true, bodyStyle: 'padding:5px;', items: inputDocGrid, - buttonAlign: 'center' + buttonAlign: 'center', + autoScroll: true }); var newIOWindow = new Ext.Window({ - title: 'Input Document', + title: 'New Input Document', collapsible: false, maximizable: false, width: 550, height: 400, minWidth: 200, minHeight: 150, + autoScroll: true, layout: 'fit', plain: true, bodyStyle: 'padding:5px;', @@ -1485,7 +1489,7 @@ ProcessOptions.prototype.addOutputDoc= function(_5625) var btnRemove = new Ext.Button({ id: 'btnRemove', - text: 'Delete Output Document', + text: 'Delete', iconCls: 'application_delete', handler: function (s) { editor.stopEditing(); @@ -1522,7 +1526,7 @@ ProcessOptions.prototype.addOutputDoc= function(_5625) var btnAdd = new Ext.Button({ id: 'btnAdd', - text: 'New Output Document', + text: 'New', iconCls: 'application_add', handler: function () { newOPWindow.show(); @@ -2053,7 +2057,7 @@ ProcessOptions.prototype.addReportTable= function(_5625) var btnAdd = new Ext.Button({ id: 'btnAdd', - text: 'New Report Table', + text: 'New', iconCls: 'application_add', handler: function () { formWindow.show(); @@ -2086,7 +2090,7 @@ ProcessOptions.prototype.addReportTable= function(_5625) var btnRemove = new Ext.Button({ id: 'btnRemove', - text: 'Delete Report Table', + text: 'Delete', iconCls: 'application_add', handler: function () { editor.stopEditing();