diff --git a/gulliver/js/ext/pmos-common.js b/gulliver/js/ext/pmos-common.js index 34b44113b..8d42fad6e 100755 --- a/gulliver/js/ext/pmos-common.js +++ b/gulliver/js/ext/pmos-common.js @@ -26,7 +26,7 @@ PMExtJSCommon = function() { Ext.MessageBox.show({ title: title, msg: msg, - buttons: Ext.MessageBox.OK, + buttons: Ext.MessageBox.YESNO, animEl: 'mb9', fn: fn != undefined ? fn: function(){}, icon: Ext.MessageBox.QUESTION diff --git a/workflow/engine/methods/bpmn/proxyExtjs.php b/workflow/engine/methods/bpmn/proxyExtjs.php index 4310df539..5bc2a3d84 100644 --- a/workflow/engine/methods/bpmn/proxyExtjs.php +++ b/workflow/engine/methods/bpmn/proxyExtjs.php @@ -333,8 +333,29 @@ $result = $tmpData; echo $result; break; - } - + + case 'getTriggersList': + $rows = $oProcessMap->getExtTriggers($start, $limit, $_GET['pid']); + array_shift($rows); + $result['totalCount'] = count($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; + + case 'editTriggers': + require_once('classes/model/Triggers.php'); + + if (isset($_GET['TRI_UID'])) + { + $oTrigger = new Triggers(); + $rows = $oTrigger->load($_GET['TRI_UID']); + } + + $result['totalCount'] = count($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; +} //$result['data'] = $rows; //print json_encode( $result ) ; /*$tmpData = json_encode( $rows ) ; diff --git a/workflow/engine/methods/triggers/triggers_Save.php b/workflow/engine/methods/triggers/triggers_Save.php index 6f41602d2..dca02da15 100644 --- a/workflow/engine/methods/triggers/triggers_Save.php +++ b/workflow/engine/methods/triggers/triggers_Save.php @@ -26,8 +26,13 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Response; require_once('classes/model/Triggers.php'); require_once('classes/model/Content.php'); - - if(isset($_POST['function']) && $_POST['function']=='lookforNameTrigger'){ + +if( isset($_POST['function']) ) + $sfunction = $_POST['function']; + else if( isset($_POST['functions']) ) + $sfunction = $_POST['functions']; + + if(isset($sfunction) && $sfunction=='lookforNameTrigger'){ $snameTrigger=urldecode($_POST['NAMETRIGGER']); $sPRO_UID=urldecode($_POST['proUid']); @@ -63,19 +68,23 @@ require_once('classes/model/Content.php'); G::LoadClass('processMap'); $oProcessMap = new processMap(new DBConnection); + if(isset ($_POST['form'])) + $value = $_POST['form']; + else + $value = $_POST; - if ($_POST['form']['TRI_UID'] != '') + if ($value['TRI_UID'] != '') { - $oTrigger->load($_POST['form']['TRI_UID']); + $oTrigger->load($value['TRI_UID']); } else { - $oTrigger->create($_POST['form']); - $_POST['form']['TRI_UID']=$oTrigger->getTriUid(); + $oTrigger->create($value); + $value['TRI_UID']=$oTrigger->getTriUid(); } //print_r($_POST['form']);die; - $oTrigger->update($_POST['form']); + $oTrigger->update($value); - $oProcessMap->triggersList($_POST['form']['PRO_UID']); + $oProcessMap->triggersList($value['PRO_UID']); } ?> \ No newline at end of file diff --git a/workflow/engine/templates/bpmn/ProcessMapContext.js b/workflow/engine/templates/bpmn/ProcessMapContext.js index d697f6f74..ab5290668 100755 --- a/workflow/engine/templates/bpmn/ProcessMapContext.js +++ b/workflow/engine/templates/bpmn/ProcessMapContext.js @@ -1088,7 +1088,7 @@ ProcessMapContext.prototype.processSupervisors= function() //cm: cm, loadMask: true, loadingText: 'Loading...', - renderTo: 'cases-grid', + //renderTo: 'cases-grid', frame: false, autoHeight:false, clicksToEdit: 1, @@ -1183,7 +1183,7 @@ ProcessMapContext.prototype.processSupervisors= function() title: _('ID_SUPERVISOR'), collapsible: false, maximizable: false, - width: 400, + width: 450, height: 350, minWidth: 200, minHeight: 150, @@ -1316,7 +1316,7 @@ ProcessMapContext.prototype.processDynaform= function() //cm: cm, loadMask: true, loadingText: 'Loading...', - renderTo: 'cases-grid', + //renderTo: 'cases-grid', frame: false, autoHeight:false, clicksToEdit: 1, @@ -1406,7 +1406,7 @@ ProcessMapContext.prototype.processDynaform= function() title: _('ID_DYNAFORMS'), collapsible: false, maximizable: false, - width: 440, + width: 480, height: 350, minWidth: 200, minHeight: 150, @@ -1517,7 +1517,7 @@ ProcessMapContext.prototype.processIODoc = function() remoteSort : true, fields : supervisorInputDocFields, proxy: new Ext.data.HttpProxy({ - url: 'proxyProcessSupervisors?pid='+pro_uid+'&action=supervisorInputDoc' + url: 'proxyExtjs?pid='+pro_uid+'&action=supervisorInputDoc' }) }); supervisorInputDoc.load({params:{start : 0 , limit : 10 }}); @@ -1525,7 +1525,7 @@ ProcessMapContext.prototype.processIODoc = function() // create the Data Store of users that are not assigned to a process supervisor var availableSupervisorInputDoc = new Ext.data.JsonStore({ root : 'data', - url : 'proxyProcessSupervisors?pid='+pro_uid+'&action=availableSupervisorInputDoc', + url : 'proxyExtjs?pid='+pro_uid+'&action=availableSupervisorInputDoc', totalProperty : 'totalCount', idProperty : 'gridIndex', remoteSort : false, //true, @@ -1540,7 +1540,7 @@ ProcessMapContext.prototype.processIODoc = function() //cm: cm, loadMask: true, loadingText: 'Loading...', - renderTo: 'cases-grid', + //renderTo: 'cases-grid', frame: false, autoHeight:false, clicksToEdit: 1, @@ -1940,7 +1940,7 @@ ProcessMapContext.prototype.caseTrackerObjects= function() //cm: cm, loadMask: true, loadingText: 'Loading...', - renderTo: 'cases-grid', + //renderTo: 'cases-grid', frame: false, autoHeight:false, clicksToEdit: 1, @@ -2133,7 +2133,7 @@ ProcessMapContext.prototype.ExtVariables = function() remoteSort : true, fields : varFields, proxy : new Ext.data.HttpProxy({ - url : 'proxyVariable?pid='+pro_uid+'&sFieldName=form[CTO_CONDITION]&sSymbol=@@' + url : 'proxyExtjs?pid='+pro_uid+'&action=getVariables&sFieldName=form[CTO_CONDITION]&sSymbol=@@' }) }); //varStore.load(); @@ -2179,7 +2179,7 @@ ProcessMapContext.prototype.ExtVariables = function() listeners: { activate: function(tabPanel){ // use {@link Ext.data.HttpProxy#setUrl setUrl} to change the URL for *just* this request. - var link = 'proxyVariable?pid='+pro_uid+'&type='+tabPanel.id+'&sFieldName=form[CTO_CONDITION]&sSymbol=@@'; + var link = 'proxyExtjs?pid='+pro_uid+'&action=getVariables&type='+tabPanel.id+'&sFieldName=form[CTO_CONDITION]&sSymbol=@@'; varStore.proxy.setUrl(link, true); varStore.load(); } @@ -2293,7 +2293,7 @@ ProcessMapContext.prototype.ExtVariables = function() listeners:{ activate: function(tabPanel){ // use {@link Ext.data.HttpProxy#setUrl setUrl} to change the URL for *just* this request. - var link = 'proxyVariable?pid='+pro_uid+'&type='+tabPanel.id+'&sFieldName=form[CTO_CONDITION]&sSymbol=@@'; + var link = 'proxyExtjs?pid='+pro_uid+'&action=getVariables&type='+tabPanel.id+'&sFieldName=form[CTO_CONDITION]&sSymbol=@@'; varStore.proxy.setUrl(link, true); varStore.load(); } @@ -2366,7 +2366,7 @@ ProcessMapContext.prototype.ExtVariables = function() listeners: { activate: function(tabPanel){ // use {@link Ext.data.HttpProxy#setUrl setUrl} to change the URL for *just* this request. - var link = 'proxyVariable?pid='+pro_uid+'&type='+tabPanel.id+'&sFieldName=form[CTO_CONDITION]&sSymbol=@@'; + var link = 'proxyExtjs?pid='+pro_uid+'&action=getVariables&type='+tabPanel.id+'&sFieldName=form[CTO_CONDITION]&sSymbol=@@'; varStore.proxy.setUrl(link, true); varStore.load(); } diff --git a/workflow/engine/templates/bpmn/ProcessOptions.js b/workflow/engine/templates/bpmn/ProcessOptions.js index 14a99e7bb..4d0571765 100755 --- a/workflow/engine/templates/bpmn/ProcessOptions.js +++ b/workflow/engine/templates/bpmn/ProcessOptions.js @@ -523,6 +523,8 @@ ProcessOptions.prototype.addDynaform= function(_5625) var sDynaformType = getForm.DYN_TYPE; if(sDynaformType == 'normal') sDynaformType = 'xmlform'; + else + sDynaformType = 'grid'; } else { @@ -2724,7 +2726,285 @@ var formWindow = new Ext.Window({ ProcessOptions.prototype.addTriggers= function() { - - + var triggerFields = Ext.data.Record.create([ + {name: 'TRI_UID'}, + {name: 'TRI_TITLE'}, + {name: 'TRI_DESCRIPTION'}, + {name: 'TRI_WEBBOT'} + ]); + var triggerStore = new Ext.data.GroupingStore({ + idProperty : 'gridIndex', + reader : new Ext.data.JsonReader( { + totalProperty: 'totalCount', + root: 'data', + fields : triggerFields + }), + proxy : new Ext.data.HttpProxy({ + url: 'proxyExtjs?pid='+pro_uid+'&action=getTriggersList' + }) + //sortInfo:{field: 'DYN_TITLE', direction: "ASC"} + }); + triggerStore.load({params:{start:0, limit:10}}); + + var btnAdd = new Ext.Button({ + id: 'btnEdit', + text: _('ID_NEW'), + iconCls: 'button_menu_ext ss_sprite ss_add', + handler: function () { + triggersForm.getForm().reset(); + formWindow.show(); + } + }); + + var btnEdit = new Ext.Button({ + id: 'btnEdit', + text: _('ID_EDIT'), + iconCls: 'button_menu_ext ss_sprite ss_pencil', + handler: function (s) { + var selectedRow = triggersGrid.getSelectionModel().getSelections(); + var triggerUID = selectedRow[0].data.TRI_UID; + triggersForm.form.load({ + url:'proxyExtjs.php?pid='+pro_uid+'&triggerUid='+triggerUID+'&action=editTriggers', + method:'GET', + waitMsg:'Loading', + success:function(form, action) { + formWindow.show(); + //Ext.MessageBox.alert('Message', 'Loaded OK'); + // setTaskAssignType(form); + }, + failure:function(form, action) { + PMExt.notify( _('ID_STATUS') , _('ID_LOAD_FAILED') ); + } + }); + } + }); + + var expander = new Ext.ux.grid.RowExpander({ + tpl : new Ext.Template("

"+TRANSLATIONS.ID_DESCRIPTION+": {TRI_DESCRIPTION}

") + }); + + var triggersColumns = new Ext.grid.ColumnModel({ + defaults: { + width: 90, + sortable: true + }, + columns: [ + expander, + { + header: _('ID_TITLE_FIELD'), + dataIndex: 'TRI_TITLE', + width: 280 + } + ] + }); + + var tb = new Ext.Toolbar({ + items: [btnAdd, btnEdit] + }); + + var triggersGrid = new Ext.grid.GridPanel({ + store: triggerStore, + id : 'dynaformGrid', + loadMask: true, + loadingText: 'Loading...', + //renderTo: 'cases-grid', + frame: false, + autoHeight:false, + minHeight:400, + height :400, + width: '', + layout: 'fit', + cm: triggersColumns, + stateful : true, + stateId : 'grid', + plugins: expander, + stripeRows: true, + tbar: tb, + bbar: new Ext.PagingToolbar({ + pageSize: 10, + store: triggerStore, + displayInfo: true, + displayMsg: 'Displaying dynaforms {0} - {1} of {2}', + emptyMsg: "No users to display", + items:[] + }), + viewConfig: {forceFit: true} + }); + + //connecting context menu to grid + triggersGrid.addListener('rowcontextmenu', ontriggersContextMenu,this); + + //by default the right click is not selecting the grid row over the mouse + //we need to set this four lines + triggersGrid.on('rowcontextmenu', function (grid, rowIndex, evt) { + var sm = grid.getSelectionModel(); + sm.selectRow(rowIndex, sm.isSelected(rowIndex)); + }, this); + + //prevent default + triggersGrid.on('contextmenu', function (evt) { + evt.preventDefault(); + }, this); + + function ontriggersContextMenu(grid, rowIndex, e) { + e.stopEvent(); + var coords = e.getXY(); + triggersContextMenu.showAt([coords[0], coords[1]]); + } + + var triggersContextMenu = new Ext.menu.Menu({ + id: 'messageContextMenu', + items: [{ + text: _('ID_EDIT'), + iconCls: 'button_menu_ext ss_sprite ss_pencil' + // handler: editDynaform + },{ + text: _('ID_DELETE'), + icon: '/images/delete.png' + // handler: removeDynaform + },{ + text: _('ID_UID'), + handler: function(){ + var rowSelected = Ext.getCmp('dynaformGrid').getSelectionModel().getSelected(); + workflow.createUIDButton(rowSelected.data.DYN_UID); + } + } + ] + }); + +var triggersForm = new Ext.FormPanel({ + labelWidth : 100, + buttonAlign : 'center', + width : 400, + height : 320, + bodyStyle : 'padding:10px 0 0 10px;', + autoHeight: true, + items: + [{ + xtype: 'textfield', + layout: 'fit', + border:true, + name: 'TRI_TITLE', + fieldLabel: _('ID_TITLE'), + width: 150, + collapsible: false, + labelAlign: 'top' + }, + { + xtype: 'textfield', + border:true, + name: 'TRI_DESCRIPTION', + hidden: false, + fieldLabel: _('ID_DESCRIPTION'), + width: 150 + },{ + layout :'column', + border :false, + items :[{ + //columnWidth :.6, + layout : 'form', + border :false, + items : [{ + xtype : 'textarea', + width : 200, + //id : 'DestPath', + //fieldLabel : _('ID_DESTINATION_PATH'), + name : 'TRI_WEBBOT', + anchor :'100%' + }] + },{ + //columnWidth :.4, + layout : 'form', + border :false, + items : [{ + xtype :'button', + title : ' ', + width:50, + text : '@@', + name : 'selectorigin', + handler: function (s) { + workflow.variablesAction = 'form'; + workflow.fieldName = 'TRI_WEBBOT' ; + workflow.variable = '@@', + workflow.formSelected = triggersForm; + var rowData = ProcMapObj.ExtVariables(); + } + }] + }] + }], buttons: [{ + text: _('ID_SAVE'), + //formBind :true, + handler: function(){ + var getForm = triggersForm.getForm().getValues(); + var title = getForm.TRI_TITLE; + var triggerUid = getForm.TRI_UID; + var condition = getForm.TRI_WEBBOT; + var desc = getForm.TRI_DESCRIPTION; + + if(title == '') + PMExt.notify( _('ID_ERROR') , _('ID_DYNAFORM_TITLE_REQUIRED') ); + else + { + Ext.Ajax.request({ + url : '../triggers/triggers_Save.php', + method: 'POST', + params:{ + //functions : 'lookforNameTrigger', + TRI_TITLE : title, + PRO_UID : pro_uid, + TRI_UID :'', + TRI_PARAM :'', + TRI_TYPE :'SCRIPT', + TRI_DESCRIPTION :desc, + TRI_WEBBOT :condition + }, + success: function(response) { + // var result = Ext.util.JSON.decode(response.responseText); + PMExt.notify( _('ID_STATUS') , _('ID_DYANFORM_CREATED') ); + + triggerStore.reload(); + formWindow.hide(); + } + }); + } + } + },{ + text: _('ID_CANCEL'), + handler: function(){ + // when this button clicked, + formWindow.hide(); + } + }] + + }); + + var formWindow = new Ext.Window({ + title: _('ID_TRIGGERS'), + autoScroll: true, + collapsible: false, + maximizable: true, + width: 450, + //autoHeight: true, + height: 350, + layout: 'fit', + plain: true, + buttonAlign: 'center', + items: triggersForm + }); + + var gridWindow = new Ext.Window({ + title: _('ID_TRIGGERS'), + autoScroll: true, + collapsible: false, + maximizable: true, + width: 600, + //autoHeight: true, + height: 420, + layout: 'fit', + plain: true, + buttonAlign: 'center', + items: triggersGrid + }); + gridWindow.show(); } diff --git a/workflow/engine/templates/bpmn/TaskContext.js b/workflow/engine/templates/bpmn/TaskContext.js index 3faa99171..e5bc1b105 100755 --- a/workflow/engine/templates/bpmn/TaskContext.js +++ b/workflow/engine/templates/bpmn/TaskContext.js @@ -580,7 +580,7 @@ TaskContext.prototype.editUsers= function() id : 'mygrid', loadMask: true, loadingText: 'Loading...', - renderTo: 'cases-grid', + //renderTo: 'cases-grid', frame: false, autoHeight:false, clicksToEdit: 1, @@ -695,7 +695,7 @@ TaskContext.prototype.editUsers= function() var panel = new Ext.Panel({ id: 'panel', - renderTo: Ext.getBody(), + //renderTo: Ext.getBody(), items: [grid] }); @@ -721,6 +721,9 @@ TaskContext.prototype.editTaskProperties= function() var ProcMapObj = new ProcessMapContext(); var taskExtObj = new TaskContext(); var taskId = workflow.currentSelection.id; + var oPmosExt = new pmosExt(); + + var fieldsToToggle = new Array(); var taskPropertiesTabs = new Ext.FormPanel({ labelWidth : 140, @@ -813,75 +816,113 @@ TaskContext.prototype.editTaskProperties= function() 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();}}} + 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();}}} + checked:false +// listeners: { +// 'check':{ +// fn: function(){ +// Ext.getCmp("staticMI").hide(); +// Ext.getCmp("cancelMI").hide(); +// Ext.getCmp("evaluate").hide(); +// } +// } +// } },{ boxLabel: _('ID_VALUE_BASED'), - id:'EVALUATE', + //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(); - } - } - } + checked:false +// listeners: { +// 'check':{ +// fn: function(){ + + +// var fields = workflow.taskPropertiesTabs.items.items[0].items.items[1].items.items; +// var fieldsToToggle = new Array(); +// fieldsToToggle = [fields[1].items.items[0].items.items[0]]; +// oPmosExt.toggleFields(fieldsToToggle,true); +// } +// } +// } },{ 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();}}} + 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();}}} + checked:false +// listeners: { +// 'check': +// {fn: function(){ +// //fieldsToToggle = [fields[0],fields[1],fields[2],fields[3],fields[4],fields[5],fields[6],fields[7],fields[8]] +// 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(); - } - } - } + 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(); - } - } - } + checked:false +// listeners: { +// 'check':{ +// fn: function(){ +// Ext.getCmp("staticMI").show(); +// Ext.getCmp("cancelMI").show(); +// Ext.getCmp("evaluate").hide(); +// } +// } +// } }] + + },{ xtype: 'fieldset', layout:'column', @@ -1230,6 +1271,9 @@ TaskContext.prototype.editTaskProperties= function() ] }] }); + + workflow.taskPropertiesTabs = taskPropertiesTabs; + //Loading Task Details into the form taskPropertiesTabs.form.load({ @@ -1237,7 +1281,8 @@ TaskContext.prototype.editTaskProperties= function() method:'GET', waitMsg:'Loading', success:function(form, action) { - if(action.result.data.TAS_START== 0) + + if(action.result.data.TAS_START== 0) workflow.checkStartingTask = false; else workflow.checkStartingTask = true; @@ -1255,14 +1300,16 @@ TaskContext.prototype.editTaskProperties= function() else if(action.result.data.TAS_ASSIGN_TYPE=='EVALUATE') { form.items.items[4].items[2].checked=true; - Ext.getCmp("evaluate").show(); + taskPropertiesTabs.getForm().findField('TAS_ASSIGN_VARIABLE').show(); } else if(action.result.data.TAS_ASSIGN_TYPE=='REPORT_TO') form.items.items[4].items[3].checked=true; else if(action.result.data.TAS_ASSIGN_TYPE=='SELF_SERVICE') - form.items.items[4].items[4].checked=true; + {form.items.items[4].items[4].checked=true; + Ext.getCmp("staticMI").hide(); + Ext.getCmp("cancelMI").hide();} else if(action.result.data.TAS_ASSIGN_TYPE=='STATIC_MI') { @@ -1285,6 +1332,10 @@ TaskContext.prototype.editTaskProperties= function() else form.items.items[13].checked=true; + + if(action.result.data.TAS_ASSIGN_TYPE == 'EVALUATE') + form.findField('TAS_ASSIGN_VARIABLE').show(); + }, failure:function(form, action) { @@ -1589,7 +1640,7 @@ TaskContext.prototype.stepTriggers = function() //cm: cm, loadMask: true, loadingText: 'Loading...', - renderTo: 'cases-grid', + //renderTo: 'cases-grid', frame: false, autoHeight:false, hidden :true, @@ -1896,7 +1947,7 @@ TaskContext.prototype.editUsersAdHoc= function() //cm: cm, loadMask: true, loadingText: 'Loading...', - renderTo: 'cases-grid', + //renderTo: 'cases-grid', frame: false, autoHeight:false, clicksToEdit: 1, @@ -2025,7 +2076,7 @@ TaskContext.prototype.editUsersAdHoc= function() var panel = new Ext.Panel({ id: 'panel', - renderTo: Ext.getBody(), + //renderTo: Ext.getBody(), items: [grid] }); @@ -2173,7 +2224,7 @@ TaskContext.prototype.editSubProcessProperties= function(_3525) remoteSort : true, fields : subProcessFields, proxy : new Ext.data.HttpProxy({ - url : 'proxySubProcessProperties?pid='+pro_uid+'&tid='+taskId+'&type=0' //type=0 specifies Variables Out (Asynchronous) + url : 'proxyExtjs?pid='+pro_uid+'&action=getSubProcessProperties&tid='+taskId+'&type=0' //type=0 specifies Variables Out (Asynchronous) }) }); variablesOutStore.load(); @@ -2186,7 +2237,7 @@ TaskContext.prototype.editSubProcessProperties= function(_3525) remoteSort : true, fields : subProcessFields, proxy : new Ext.data.HttpProxy({ - url : 'proxySubProcessProperties?pid='+pro_uid+'&tid='+taskId+'&type=1' //type=1 specifies Variables In (Synchronous) + url : 'proxyExtjs?pid='+pro_uid+'&action=getSubProcessProperties&tid='+taskId+'&type=1' //type=1 specifies Variables In (Synchronous) }) }); //taskUsers.setDefaultSort('LABEL', 'asc'); @@ -2209,9 +2260,9 @@ TaskContext.prototype.editSubProcessProperties= function(_3525) id : 'mygrid', loadMask : true, loadingText : 'Loading...', - renderTo : 'cases-grid', + //renderTo : 'cases-grid', frame : false, - autoHeight : true, + autoHeight : false, autoScroll : true, clicksToEdit: 1, layout : 'form', @@ -2263,9 +2314,9 @@ TaskContext.prototype.editSubProcessProperties= function(_3525) id : 'mygrid1', loadMask : true, loadingText : 'Loading...', - renderTo : 'cases-grid', + //renderTo : 'cases-grid', frame : false, - autoHeight : true, + autoHeight : false, autoScroll : true, clicksToEdit: 1, layout : 'form', @@ -2414,7 +2465,7 @@ TaskContext.prototype.editSubProcessProperties= function(_3525) //Loading Task Details into the form subProcessProperties.form.load({ - url:'proxySubProcessProperties?pid='+pro_uid+'&tid='+taskId+'&type=2', + url:'proxyExtjs?pid='+pro_uid+'&action=getSubProcessProperties&tid='+taskId+'&type=2', method:'GET', waitMsg:'Loading....', success:function(form, action) { diff --git a/workflow/engine/templates/bpmn/pmosExt.js b/workflow/engine/templates/bpmn/pmosExt.js index 24ddda521..dd248f4b0 100755 --- a/workflow/engine/templates/bpmn/pmosExt.js +++ b/workflow/engine/templates/bpmn/pmosExt.js @@ -219,7 +219,7 @@ pmosExt.prototype.popWebEntry= function(_5678) ] }), onSelect: function(record, index){ - var fields = this.scope.workflow.webForm.items.items; + var fields = workflow.webForm.items.items; if(index == 1) { //Select @@ -315,11 +315,11 @@ pmosExt.prototype.popWebEntry= function(_5678) url: 'processes_Ajax.php'+ args, success: function(response) { if(response.responseText == "1") - this.workflow.webEntrywindow.buttons[1].enable(); + workflow.webEntrywindow.buttons[1].enable(); else { Ext.Msg.alert (response.responseText); - this.workflow.webEntrywindow.buttons[1].disable(); + workflow.webEntrywindow.buttons[1].disable(); } }, failure: function(){ @@ -350,7 +350,7 @@ pmosExt.prototype.popWebEntry= function(_5678) workflow.webForm.items.items[0].show(); workflow.webForm.items.items[1].hide(); workflow.webForm.items.items[2].hide(); - this.workflow.webEntrywindow.buttons[1].disable(); + workflow.webEntrywindow.buttons[1].disable(); Ext.Msg.alert(response.responseText); }, failure: function(){ @@ -636,7 +636,7 @@ pmosExt.prototype.popCaseSchedular= function(_5678){ ] }), onSelect: function(record, index){ - var timefieldset = this.scope.workflow.caseSchedularForm.items.items[2]; + var timefieldset = workflow.caseSchedularForm.items.items[2]; var fields = timefieldset.items.items; var fieldsToToggle = new Array(); if(index == 0){ //Select @@ -1004,7 +1004,7 @@ pmosExt.prototype.loadTask = function(_5678){ Ext.Ajax.request({ url: "processes_Ajax.php"+ urlparams, success: function(response) { - this.workflow.taskDetails = Ext.util.JSON.decode(response.responseText); + workflow.taskDetails = Ext.util.JSON.decode(response.responseText); }, failure: function(){ PMExt.notify( _('ID_STATUS') , _('ID_FAILURE') ); @@ -1021,7 +1021,7 @@ pmosExt.prototype.getTriggerList = function(_5678){ Ext.Ajax.request({ url: "processes_Ajax.php"+ urlparams, success: function(response) { - this.workflow.triggerList = Ext.util.JSON.decode(response.responseText); + workflow.triggerList = Ext.util.JSON.decode(response.responseText); }, failure: function(){ PMExt.notify( _('ID_STATUS') , _('ID_FAILURE') ); @@ -1040,7 +1040,7 @@ pmosExt.prototype.toggleFields = function(field,bool){ field[i].hide(); //Hide-Show label - field[i].getEl().up('.x-form-item').setDisplayed(bool); + //field[i].getEl().up('.x-form-item').setDisplayed(bool); } }