diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index f2cfeb078..9e048278f 100644 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -61,6 +61,7 @@ require_once 'classes/model/TaskUser.php'; require_once 'classes/model/Triggers.php'; require_once 'classes/model/Users.php'; require_once 'classes/model/Gateway.php'; +require_once 'classes/model/om/BaseUsers.php'; /** * processMap - Process Map class @@ -6021,9 +6022,16 @@ function getExtTaskUsersAdHocCriteria($sTaskUID = '', $iType = 1) { $aFields ['OP_OBJ_TYPE'] = $aRows ['OP_OBJ_TYPE']; $aFields ['OP_ACTION'] = $aRows ['OP_ACTION']; + + $lang = defined ( 'SYS_LANG') ? SYS_LANG : 'en'; - $aFields['TASK_TARGET'] = Content::load ( 'TAS_TITLE', '', $aRows ['TAS_UID'] , $lang ); - $aFields['TASK_SOURCE'] = Content::load ( 'TAS_TITLE', '', $aRows ['OP_TASK_SOURCE'] , $lang ); + $aFields['TASK_TARGET_NAME'] = Content::load ( 'TAS_TITLE', '', $aRows ['TAS_UID'] , $lang ); + $aFields['TASK_SOURCE_NAME'] = Content::load ( 'TAS_TITLE', '', $aRows ['OP_TASK_SOURCE'] , $lang ); + $oUser = UsersPeer::retrieveByPK( $aRows ['USR_UID'] ); + $aFields ['USR_FULLNAME'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname() ; + + + switch ($aRows ['OP_OBJ_TYPE']) { /* case 'ANY': diff --git a/workflow/engine/templates/bpmn/ProcessMapContext.js b/workflow/engine/templates/bpmn/ProcessMapContext.js index 8abc9788d..5ec920a61 100755 --- a/workflow/engine/templates/bpmn/ProcessMapContext.js +++ b/workflow/engine/templates/bpmn/ProcessMapContext.js @@ -339,7 +339,9 @@ ProcessMapContext.prototype.processPermission= function() { name: 'OP_OBJ_TYPE',type: 'string'}, { name: 'OP_GROUP_USER',type: 'string'}, { name: 'OBJ_NAME',type: 'string'}, - { name: 'OP_ACTION',type: 'string'} + { name: 'OP_ACTION',type: 'string'}, + { name: 'USR_FULLNAME',type: 'string'} + ]); var PermissionStore = new Ext.data.JsonStore({ @@ -645,7 +647,7 @@ var PermissionGridColumn = new Ext.grid.ColumnModel({ fieldLabel: 'Target Task', //hiddenName:'popType', //autoload: true, - name: 'TASK_TARGET', + name: 'TASK_TARGET_NAME', store: selectTaskStore, valueField:'LABEL', displayField:'LABEL', @@ -664,7 +666,7 @@ var PermissionGridColumn = new Ext.grid.ColumnModel({ new Ext.form.ComboBox({ fieldLabel: 'Group or Users', //hiddenName:'popType', - name: 'OP_GROUP_USER', + name: 'USR_FULLNAME', //autoload: true, store: usersStore, valueField:'LABEL', @@ -682,7 +684,7 @@ var PermissionGridColumn = new Ext.grid.ColumnModel({ , new Ext.form.ComboBox({ fieldLabel: 'Origin Task', - name : 'TASK_SOURCE', + name : 'TASK_SOURCE_NAME', store: selectTaskStore, valueField:'LABEL', displayField:'LABEL', @@ -764,7 +766,7 @@ var PermissionGridColumn = new Ext.grid.ColumnModel({ autoload: true, width:200, store: dynaformStore, - name: 'DYNAFORM', + name: 'OBJ_NAME', valueField:'LABEL', displayField:'LABEL', triggerAction: 'all', @@ -787,7 +789,7 @@ var PermissionGridColumn = new Ext.grid.ColumnModel({ xtype: 'combo', fieldLabel: 'Input Document', //hiddenName:'UID', - name: 'INPUT', + name: 'OBJ_NAME', width:200, autoload: true, store: inputDocStore, @@ -816,7 +818,7 @@ var PermissionGridColumn = new Ext.grid.ColumnModel({ width:200, autoload: true, store: outputDocStore, - name: 'OUTPUT', + name: 'OBJ_NAME', valueField:'LABEL', displayField:'LABEL', triggerAction: 'all', diff --git a/workflow/engine/templates/bpmn/ProcessOptions.js b/workflow/engine/templates/bpmn/ProcessOptions.js index 789085ccf..2baf8c4f1 100755 --- a/workflow/engine/templates/bpmn/ProcessOptions.js +++ b/workflow/engine/templates/bpmn/ProcessOptions.js @@ -26,7 +26,7 @@ ProcessOptions.prototype.addDynaform= function(_5625) }); var btnAdd = new Ext.Button({ id: 'btnAdd', - text: 'New', + text: _('ID_NEW'), iconCls: 'button_menu_ext ss_sprite ss_add', //iconCls: 'application_add', handler: function () { @@ -37,7 +37,7 @@ ProcessOptions.prototype.addDynaform= function(_5625) var btnRemove = new Ext.Button({ id: 'btnRemove', - text: 'Delete', + text: _('ID_DELETE'), iconCls: 'button_menu_ext ss_sprite ss_delete', handler: function (s) { editor.stopEditing(); @@ -198,7 +198,7 @@ ProcessOptions.prototype.addDynaform= function(_5625) new Ext.grid.RowNumberer(), { id: 'DYN_TITLE', - header: 'Title', + header: _('ID_TITLE_FIELD'), dataIndex: 'DYN_TITLE', width: 280, editable: false, @@ -207,7 +207,7 @@ ProcessOptions.prototype.addDynaform= function(_5625) }) },{ id: 'ACTION', - header: 'Type', + header: _('ID_TYPE'), dataIndex: 'ACTION', width: 280, editable: false, @@ -226,7 +226,7 @@ ProcessOptions.prototype.addDynaform= function(_5625) sortable: false, renderer: function(val, meta, record) { - return String.format("",record.data.DYN_UID); + return String.format("",record.data.DYN_UID); } } ] @@ -340,7 +340,7 @@ ProcessOptions.prototype.addDynaform= function(_5625) width: 500, items:[{ xtype : 'textfield', - fieldLabel: 'Title', + fieldLabel: _('ID_TITLE'), name : 'DYN_TITLE', width : 350, allowBlank: false @@ -350,7 +350,7 @@ ProcessOptions.prototype.addDynaform= function(_5625) allowBlank: false, mode: 'local', editable: false, - fieldLabel: 'Type', + fieldLabel: _('ID_TYPE'), triggerAction: 'all', forceSelection: true, name: 'ACTION', @@ -366,7 +366,7 @@ ProcessOptions.prototype.addDynaform= function(_5625) }) },{ xtype : 'textarea', - fieldLabel: 'Description', + fieldLabel: _('ID_DESCRIPTION'), name : 'DYN_DESCRIPTION', height : 120, width : 350 @@ -410,12 +410,12 @@ ProcessOptions.prototype.addDynaform= function(_5625) }, { xtype : 'textfield', - fieldLabel: 'Title', + fieldLabel: _('ID_TITLE'), name : 'DYN_TITLE' // allowBlank: false },{ xtype : 'textarea', - fieldLabel: 'Description', + fieldLabel: _('ID_DESCRIPTION'), name : 'DYN_DESCRIPTION', height : 120, width : 350 @@ -439,7 +439,7 @@ ProcessOptions.prototype.addDynaform= function(_5625) ] } ], buttons: [{ - text: 'Save', + text: _('ID_SAVE'), formBind :true, handler: function(){ var getForm = dynaformDetails.getForm().getValues(); @@ -489,7 +489,7 @@ ProcessOptions.prototype.addDynaform= function(_5625) } },{ - text: 'Cancel', + text: _('ID_CANCEL'), handler: function(){ // when this button clicked, formWindow.hide(); @@ -499,7 +499,7 @@ ProcessOptions.prototype.addDynaform= function(_5625) }); var gridWindow = new Ext.Window({ - title: 'Dynaform', + title: _('ID_DYNAFORMS'), autoScroll: true, collapsible: false, maximizable: true, @@ -514,7 +514,7 @@ ProcessOptions.prototype.addDynaform= function(_5625) }); var formWindow = new Ext.Window({ - title: 'Dynaform', + title: _('ID_NEW_DYNAFORM'), autoScroll: true, collapsible: false, maximizable: true, @@ -550,7 +550,7 @@ ProcessOptions.prototype.dbConnection = function() var btnNew = new Ext.Button({ id: 'btnNew', - text: 'New', + text: _('ID_NEW'), iconCls: 'button_menu_ext ss_sprite ss_add', handler: function () { dbconnForm.getForm().reset(); @@ -561,7 +561,7 @@ ProcessOptions.prototype.dbConnection = function() var btnEdit = new Ext.Button({ id: 'btnEdit', - text: 'Edit', + text: _('ID_EDIT'), iconCls: 'button_menu_ext ss_sprite ss_pencil', handler: function (s) { var selectedRow = dbGrid.getSelectionModel().getSelections(); @@ -584,7 +584,7 @@ ProcessOptions.prototype.dbConnection = function() var btnRemove = new Ext.Button({ id: 'btnRemove', - text: 'Remove', + text: _('ID_DELETE'), iconCls: 'button_menu_ext ss_sprite ss_delete', handler: function (s) { editor.stopEditing(); @@ -625,7 +625,7 @@ ProcessOptions.prototype.dbConnection = function() }); var editor = new Ext.ux.grid.RowEditor({ - saveText: 'Update' + saveText: _('ID_UPDATE') }); var dbStore = new Ext.data.JsonStore({ @@ -1162,7 +1162,7 @@ ProcessOptions.prototype.addInputDoc= function(_5625) var btnRemove = new Ext.Button({ id: 'btnRemove', - text: 'Delete', + text: _('ID_DELETE'), iconCls: 'button_menu_ext ss_sprite ss_delete', handler: function (s) { editor.stopEditing(); @@ -1228,7 +1228,7 @@ ProcessOptions.prototype.addInputDoc= function(_5625) var btnEdit = new Ext.Button({ id: 'btnEdit', - text: 'Edit', + text: _('ID_EDIT'), iconCls: 'button_menu_ext ss_sprite ss_pencil', handler: function (s) { var selectedRow = inputDocGrid.getSelectionModel().getSelections(); @@ -1677,7 +1677,7 @@ ProcessOptions.prototype.addOutputDoc= function(_5625) var btnRemove = new Ext.Button({ id: 'btnRemove', - text: 'Delete', + text: _('ID_DELETE'), iconCls: 'button_menu_ext ss_sprite ss_delete', handler: function (s) { editor.stopEditing(); @@ -1724,7 +1724,7 @@ ProcessOptions.prototype.addOutputDoc= function(_5625) var btnEdit = new Ext.Button({ id: 'btnEdit', - text: 'Edit', + text: _('ID_EDIT'), iconCls: 'button_menu_ext ss_sprite ss_pencil', handler: function (s) { var s = outputDocGrid.getSelectionModel().getSelections(); @@ -1748,7 +1748,7 @@ ProcessOptions.prototype.addOutputDoc= function(_5625) var btnProperties = new Ext.Button({ id: 'btnProperties', - text: 'Properties', + text: _('ID_PROPERTIES'), iconCls: 'application_add', handler: function (s) { outputDocGrid.stopEditing(); @@ -2163,7 +2163,7 @@ ProcessOptions.prototype.addOutputDoc= function(_5625) }); var newOPWindow = new Ext.Window({ - title : 'Output Document', + title : _('ID_OUTPUT_DOCUMENTS'), width : 550, defaults :{ autoScroll:true }, height : 450, @@ -2277,7 +2277,7 @@ ProcessOptions.prototype.addReportTable= function(_5625) var btnEdit = new Ext.Button({ id: 'btnEdit', - text: 'Edit', + text: _('ID_EDIT'), iconCls: 'button_menu_ext ss_sprite ss_pencil', handler: function (s) { var s = reportGrid.getSelectionModel().getSelections(); @@ -2301,7 +2301,7 @@ ProcessOptions.prototype.addReportTable= function(_5625) var btnRemove = new Ext.Button({ id: 'btnRemove', - text: 'Delete', + text: _('ID_DELETE'), iconCls: 'button_menu_ext ss_sprite ss_delete', handler: function () { editor.stopEditing(); diff --git a/workflow/engine/templates/bpmn/TaskContext.js b/workflow/engine/templates/bpmn/TaskContext.js index 6aa271559..00cc38fab 100755 --- a/workflow/engine/templates/bpmn/TaskContext.js +++ b/workflow/engine/templates/bpmn/TaskContext.js @@ -186,7 +186,7 @@ TaskContext.prototype.editTaskSteps = function(_3252){ plugins : [editor], columns : [{ id: 'STEP_TITLE', - header: 'Title', + header: _('ID_STEPS'), dataIndex: 'STEP_TITLE', width: 280, editor: new Ext.form.TextField({ @@ -194,7 +194,7 @@ TaskContext.prototype.editTaskSteps = function(_3252){ }, { id: 'STEP_CONDITION', - header: 'Condition', + header: _('ID_CONDITION'), dataIndex: 'STEP_CONDITION', width: 250, editable: true, @@ -223,7 +223,7 @@ TaskContext.prototype.editTaskSteps = function(_3252){ plugins : [editor], columns : [{ id: 'STEP_TITLE', - header: 'Title', + header: _('ID_STEPS'), dataIndex: 'STEP_TITLE', width: 200, sortable: true, @@ -260,7 +260,7 @@ TaskContext.prototype.editTaskSteps = function(_3252){ }, { id: 'STEP_MODE', - header: 'Mode', + header: _('STEP_MODE'), dataIndex: 'STEP_MODE', width: 100, sortable: true, @@ -393,21 +393,21 @@ TaskContext.prototype.editTaskSteps = function(_3252){ bodyStyle:'padding:10px' }, items:[{ - title:'Steps', + title:_('ID_STEPS'), layout:'fit', defaults: { width: 400 }, items:[grid] },{ - title:'Condition', + title:_('ID_CONDITION'), layout:'fit', defaults: { width: 400 }, items:[conditionGrid] },{ - title:'Triggers', + title:_('ID_TRIGGERS'), layout:'form', defaults: { width: 400 @@ -421,7 +421,7 @@ TaskContext.prototype.editTaskSteps = function(_3252){ _3252.scope.workflow.taskStepsTabs = taskStepsTabs; var window = new Ext.Window({ - title: 'Steps Of', + title: _('ID_STEPS_OF'), collapsible: false, maximizable: false, width: 750, @@ -473,7 +473,7 @@ TaskContext.prototype.editUsers= function() var btnAdd = new Ext.Button({ id: 'btnAdd', - text: 'Assign', + text: _('ID_ASSIGN'), iconCls: 'application_add', handler: function(){ var User = grid.getStore(); @@ -498,7 +498,7 @@ TaskContext.prototype.editUsers= function() var btnRemove = new Ext.Button({ id: 'btnRemove', - text: 'Remove', + text: _('ID_DE_ASSIGN'), iconCls: 'application_delete', handler: function (s) { editor.stopEditing(); @@ -593,7 +593,7 @@ TaskContext.prototype.editUsers= function() new Ext.grid.RowNumberer(), { id: 'LABEL', - header: 'Group or User', + header:_('ID_GROUP_USER'), dataIndex: 'LABEL', width: 100, editor: new Ext.form.ComboBox({ @@ -689,14 +689,14 @@ TaskContext.prototype.editUsers= function() }); var window = new Ext.Window({ - title: 'Users and User Groups', + title: _('ID_USERS_GROUPS'), collapsible: false, - maximizable: false, + maximizable: true, width: 400, height: 350, minWidth: 200, minHeight: 150, - layout: 'fit', + //layout: 'fit', plain: true, bodyStyle: 'padding:5px;', buttonAlign: 'center', @@ -719,7 +719,7 @@ TaskContext.prototype.editTaskProperties= function() // store : taskDetails, //url : 'proxyTaskPropertiesDetails.php', width : 600, - items: { + items: [{ xtype:'tabpanel', activeTab: 0, bodyStyle : 'padding:10 10 0 ', @@ -728,104 +728,168 @@ TaskContext.prototype.editTaskProperties= function() height : 300 }, items:[{ - title:'Definition', - layout:'form', - defaults: { - width: 230 - }, - defaultType: 'textfield', - items: [{ - fieldLabel: 'Title', - name: 'TAS_TITLE', - width: 350 - },{ - xtype: 'textarea', - fieldLabel: 'Description', - name: 'TAS_DESCRIPTION', - allowBlank: true, - width: 350, - height : 150 - },{ - xtype: 'fieldset', - layout:'column', - border : false, - width: 550, - items:[{ - columnWidth:.7, - layout: 'form', - border : false, - items: [{ - xtype: 'textfield', - labelWidth : 130, - fieldLabel: 'Variable for Case priority', - name: 'TAS_PRIORITY_VARIABLE', - anchor:'100%' - }] + title:_('ID_DEFINITION'), + layout:'form', + defaults: { + width: 230 + }, + defaultType: 'textfield', + items: [{ + fieldLabel: _('ID_TITLE_FIELD'), + name: 'TAS_TITLE', + //dataIndex: 'TAS_TITLE', + //value: _5625.scope.workflow.taskDetails.TAS_TITLE, + allowBlank: false, + width: 300 },{ - columnWidth:.2, - layout: 'form', - border:false, - items: [{ - xtype:'button', - title: ' ', - text: '@@', - name: 'selectorigin', - handler: function (s) { - workflow.variablesAction = 'form'; - workflow.fieldId = 'priorityVariable' ; - workflow.formSelected = taskPropertiesTabs; - var rowData = ProcMapObj.ExtVariables(); - console.log(rowData); - } - }] - }] + xtype: 'textarea', + fieldLabel: _('ID_DESCRIPTION'), + name: 'TAS_DESCRIPTION', + //dataIndex: 'TAS_DESCRIPTION', + //value: _5625.scope.workflow.taskDetails.TAS_DESCRIPTION, + allowBlank: true, + width: 300, + height : 150 + },{ + xtype: 'fieldset', + layout:'column', + border:false, + width: 550, + items:[{ + columnWidth:.6, + layout: 'form', + border:false, + items: [{ + xtype: 'textfield', + //id: 'priorityVariable', + fieldLabel: _('ID_VARIABLES_CASE_PRIORITY'), + name: 'TAS_PRIORITY_VARIABLE', + anchor:'100%' + + }] + },{ + columnWidth:.3, + layout: 'form', + border:false, + items: [{ + xtype:'button', + title: ' ', + text: '@@', + name: 'selectorigin', + handler: function (s) { + workflow.variablesAction = 'form'; + workflow.fieldName = 'TAS_PRIORITY_VARIABLE' ; + workflow.formSelected = taskPropertiesTabs; + var rowData = ProcMapObj.ExtVariables(); + console.log(rowData); + } + }] + }] },{ xtype: 'checkbox', - fieldLabel: 'Starting Task', + fieldLabel:_('ID_START_TASK'), name: 'TAS_START' }] },{ - title:'Assignment Rules', - layout : 'form', - defaults: { - width: 260 - }, - items: [{ - xtype: 'radiogroup', - id: 'assignType', - fieldLabel: 'Cases to be Assigned by', - itemCls: 'x-check-group-alt', - columns: 1, - items: [{ - boxLabel: 'Cyclic Assignment', - id: 'BALANCED', - name: 'TAS_ASSIGN_TYPE', - inputValue: 'BALANCED', - checked: false, - listeners: {'check':{fn: function(){Ext.getCmp("staticMI").hide();Ext.getCmp("cancelMI").hide();Ext.getCmp("evaluate").hide();}}} - },{ - boxLabel: 'Manual Assignment', - id: 'MANUAL', - name: 'TAS_ASSIGN_TYPE', - inputValue: 'MANUAL', - checked:false, - listeners: {'check':{fn: function(){Ext.getCmp("staticMI").hide();Ext.getCmp("cancelMI").hide();Ext.getCmp("evaluate").hide();}}} - },{ - boxLabel: 'Value Based', - id:'EVALUATE', - name: 'TAS_ASSIGN_TYPE', - inputValue: 'EVALUATE', - checked:false, - listeners: { - 'check':{ - fn: function(){ - Ext.getCmp("evaluate").show(); - Ext.getCmp("staticMI").hide(); - Ext.getCmp("cancelMI").hide(); - } + title:_('ID_ASSIGNMENT_RULES'), + layout:'form', + defaults: { + width: 260 + }, + items: [{ + xtype: 'radiogroup', + id: 'assignType', + fieldLabel: _('ID_CASES_ASSIGNED_BY'), + itemCls: 'x-check-group-alt', + columns: 1, + items: [ + { + boxLabel: _('ID_CYCLIC_ASSIGNMENT'), + id: 'BALANCED', + name: 'TAS_ASSIGN_TYPE', + inputValue: 'BALANCED', + checked: false, + listeners: {'check':{fn: function(){Ext.getCmp("staticMI").hide();Ext.getCmp("cancelMI").hide();Ext.getCmp("evaluate").hide();}}} + }, + + { + boxLabel: _('ID_MANUAL_ASSIGNMENT'), + id: 'MANUAL', + name: 'TAS_ASSIGN_TYPE', + inputValue: 'MANUAL', + checked:false, + listeners: {'check':{fn: function(){Ext.getCmp("staticMI").hide();Ext.getCmp("cancelMI").hide();Ext.getCmp("evaluate").hide();}}} + }, + + { + boxLabel: _('ID_VALUE_BASED'), + id:'EVALUATE', + name: 'TAS_ASSIGN_TYPE', + inputValue: 'EVALUATE', + checked:false, + listeners: { + 'check':{ + fn: function(){ + Ext.getCmp("evaluate").show(); + Ext.getCmp("staticMI").hide(); + Ext.getCmp("cancelMI").hide(); + } + } + } + }, + + { + boxLabel: _('ID_REPORTS_TO'), + id:'REPORT_TO', + name: 'TAS_ASSIGN_TYPE', + inputValue: 'REPORT_TO', + checked:false, + listeners: {'check':{fn: function(){Ext.getCmp("staticMI").hide();Ext.getCmp("cancelMI").hide();Ext.getCmp("evaluate").hide();}}} + }, + { + boxLabel: _('ID_SELF_SERVICE'), + id:'SELF_SERVICE', + name: 'TAS_ASSIGN_TYPE', + inputValue: 'SELF_SERVICE', + checked:false, + listeners: {'check':{fn: function(){Ext.getCmp("staticMI").hide();Ext.getCmp("cancelMI").hide();Ext.getCmp("evaluate").hide();}}} + }, + + { + boxLabel: _('ID_STATIC_PARTIAL_JOIN_MULTIPLE_INSTANCES'), + id:'STATIC_MI', + name: 'TAS_ASSIGN_TYPE', + inputValue: 'STATIC_MI', + checked:false, + listeners: { + 'check':{ + fn: function(){ + Ext.getCmp("staticMI").show(); + Ext.getCmp("cancelMI").show(); + Ext.getCmp("evaluate").hide(); + } + } + } + }, + + { + boxLabel: _('ID_CANCEL_PARTIAL_JOIN_MULTIPLE_INSTANCE'), + id:'CANCEL_MI', + name: 'TAS_ASSIGN_TYPE', + inputValue: 'CANCEL_MI', + checked:false, + listeners: { + 'check':{ + fn: function(){ + Ext.getCmp("staticMI").show(); + Ext.getCmp("cancelMI").show(); + Ext.getCmp("evaluate").hide(); + } + } + } } - } - },{ + + ,{ boxLabel: 'Reports to', id:'REPORT_TO', name: 'TAS_ASSIGN_TYPE', @@ -881,11 +945,40 @@ TaskContext.prototype.editTaskProperties= function() columnWidth:.8, layout: 'form', border:false, - items: [{ - xtype: 'textfield', - fieldLabel: 'Variable for Value Based Assignment', - name: 'TAS_ASSIGN_VARIABLE', - anchor:'100%' + width: 550, + //title: 'valueBased', + hidden: true, + id: 'evaluate', + items:[{ + columnWidth:.6, + layout: 'form', + border:false, + items: [{ + xtype: 'textfield', + fieldLabel: _('ID_VARIABLES_VALUE_ASSIGNMENT'), + name: 'TAS_ASSIGN_VARIABLE', + //value: _5625.scope.workflow.taskDetails.TAS_ASSIGN_VARIABLE + anchor:'100%' + }] + },{ + columnWidth:.3, + layout: 'form', + border:false, + items: [{ + xtype:'button', + title: ' ', + text: '@@', + name: 'selectorigin', + handler: function (s) { + workflow.variablesAction = 'form'; + workflow.variable = '@%23', + workflow.fieldName = 'TAS_ASSIGN_VARIABLE' ; + workflow.formSelected = taskPropertiesTabs; + var rowData = ProcMapObj.ExtVariables(); + console.log(rowData); + } + //anchor:'35%' + }] }] },{ columnWidth:.2, @@ -911,21 +1004,39 @@ TaskContext.prototype.editTaskProperties= function() columnWidth:.8, layout: 'form', border:false, - items: [{ - xtype: 'textfield', - fieldLabel: 'Variable for No of Instances', - name: 'TAS_MI_INSTANCE_VARIABLE', - anchor:'100%' - }] - },{ - columnWidth:.2, - layout: 'form', - border:false, - items: [{ - xtype:'button', - title: ' ', - text: '@@', - name: 'selectorigin' + width: 550, + //title: 'MI', + hidden: true, + id: 'staticMI', + items:[{ + columnWidth:.6, + layout: 'form', + border:false, + items: [{ + xtype: 'textfield', + fieldLabel: _('ID_VARIABLES_NO_INSTANCES'), + name: 'TAS_MI_INSTANCE_VARIABLE', + //value: _5625.scope.workflow.taskDetails.TAS_MI_INSTANCE_VARIABLE + anchor:'100%' + }] + },{ + columnWidth:.3, + layout: 'form', + border:false, + items: [{ + xtype:'button', + title: ' ', + text: '@@', + name: 'selectorigin', + handler: function (s) { + workflow.variablesAction = 'form'; + workflow.variable = '@%23', + workflow.fieldName = 'TAS_MI_INSTANCE_VARIABLE' ; + workflow.formSelected = taskPropertiesTabs; + var rowData = ProcMapObj.ExtVariables(); + console.log(rowData); + } + //anchor:'35%' }] }] },{ @@ -937,55 +1048,38 @@ TaskContext.prototype.editTaskProperties= function() hidden: true, id: 'cancelMI', items:[{ - columnWidth:.8, - layout: 'form', - border:false, - items: [{ - xtype: 'textfield', - fieldLabel: 'Variable for No of Instances to complete', - name: 'TAS_MI_COMPLETE_VARIABLE', - anchor:'100%' - }] - },{ - columnWidth:.2, - layout: 'form', - border:false, - items: [{ + columnWidth:.6, + layout: 'form', + border:false, + items: [{ + xtype: 'textfield', + fieldLabel: _('ID_VARIABLES_INSTANCES_TO _COMPLETE'), + name: 'TAS_MI_COMPLETE_VARIABLE', + //value: _5625.scope.workflow.taskDetails.TAS_MI_COMPLETE_VARIABLE + anchor:'100%' + }] + },{ + columnWidth:.3, + layout: 'form', + border:false, + items: [{ xtype:'button', title: ' ', text: '@@', - name: 'selectorigin' + name: 'selectorigin', + handler: function (s) { + workflow.variablesAction = 'form'; + workflow.variable = '@%23', + workflow.fieldName = 'TAS_MI_COMPLETE_VARIABLE' ; + workflow.formSelected = taskPropertiesTabs; + var rowData = ProcMapObj.ExtVariables(); + console.log(rowData); + } }] }] }] },{ - title:'Timing Control Rules', - layout:'form', - defaults: { - width: 260 - }, - bodyStyle:'padding:5px 5px 0 30px', - defaultType: 'textfield', - items: [{ - xtype: 'checkbox', - boxLabel: 'Allow user defined timing control', - name: 'TAS_TRANSFER_FLY', - checked: 'TAS_TRANSFER_FLY', - labelWidth: 100, - listeners: { - /**Listeners for hiding all the fields - * under "Timing Control Rules" tabs - * when user clicks on 'Allow user defined timing control' checkbox - **/ - check : function(a,checked,c) { - if(checked == true) - Ext.getCmp("userDefinedTiming").hide(); - else - Ext.getCmp("userDefinedTiming").show(); - } - } - },{ - xtype: 'fieldset', + title:_('ID_TASK_PROPERTIES_TIMING T'), layout:'form', border:false, width: 550, @@ -1095,50 +1189,90 @@ TaskContext.prototype.editTaskProperties= function() name: 'TAS_TYPE' }] },{ - title:'Case Labels', - layout:'form', - defaults: { - width: 600 - }, - defaultType: 'textfield', - labelWidth: 70, - items: [{ - xtype: 'fieldset', - layout:'column', - border:false, - width: 600, - items:[{ - columnWidth:.8, - layout: 'form', - border:false, - items: [{ - xtype: 'textarea', - fieldLabel: 'Case Title', - id: 'caseTitle', - name: 'TAS_DEF_TITLE', - height : 120, - //value: _5625.scope.workflow.taskDetails.TAS_ASSIGN_VARIABLE - anchor:'100%' - }] + title:'Case Labels', + layout:'form', + defaults: { + width: 800 + }, + defaultType: 'textfield', + labelWidth: 70, + items: [{ + xtype: 'fieldset', + layout:'column', + border:false, + width: 700, + items:[{ + columnWidth:.5, + layout: 'form', + border:false, + items: [{ + xtype: 'textarea', + fieldLabel: 'Case Title', + //id: 'caseTitle', + name: 'TAS_DEF_TITLE', + height : 100, + //value: _5625.scope.workflow.taskDetails.TAS_ASSIGN_VARIABLE + anchor:'100%' + }] + },{ + columnWidth:.3, + layout: 'form', + border:false, + bodyStyle: 'padding:35px;', + items: [{ + xtype:'button', + title: ' ', + text: '@#', + name: 'selectCaseTitle', + handler: function (s) { + workflow.variablesAction = 'form'; + workflow.variable = '@%23', + workflow.fieldName = 'TAS_DEF_TITLE' ; + workflow.formSelected = taskPropertiesTabs; + var rowData = ProcMapObj.ExtVariables(); + console.log(rowData); + } + }] + }] },{ columnWidth:.2, layout: 'form', border:false, - bodyStyle: 'padding:10px;', - items: [{ - xtype:'button', - title: ' ', - text: '@#', - name: 'selectCaseTitle', - handler: function (s) { - workflow.variablesAction = 'form'; - workflow.variable = '@%23', - workflow.fieldId = 'caseTitle' ; - workflow.formSelected = taskPropertiesTabs; - var rowData = ProcMapObj.ExtVariables(); - console.log(rowData); - } - }] + width: 700, + items:[{ + columnWidth:.5, + layout: 'form', + border:false, + items: [{ + xtype: 'textarea', + //id: 'caseDescription', + fieldLabel: 'Case Description', + name: 'TAS_DEF_DESCRIPTION', + height : 100, + anchor:'100%' + + }] + },{ + columnWidth:.3, + layout: 'form', + border:false, + bodyStyle: 'padding:35px;', + items: [{ + xtype:'button', + title: ' ', + text: '@#', + name: 'selectCaseDesc', + handler: function (s) { + workflow.variablesAction = 'form'; + workflow.variable = '@%23', + workflow.fieldName= 'TAS_DEF_DESCRIPTION' ; + workflow.formSelected = taskPropertiesTabs; + var rowData = ProcMapObj.ExtVariables(); + console.log(rowData); + } + //anchor:'10%' + }] + }] }] },{ xtype: 'fieldset', @@ -1221,7 +1355,7 @@ TaskContext.prototype.editTaskProperties= function() } ] - } + }); //Loading Task Details into the form