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

Continued working on assigning system variables part and fixed issue in Extjs

Browse Source
This commit is contained in:
safan
2011-01-18 13:25:01 +00:00
parent 0a027babcd
commit 9487cc3a2e
4 changed files with 424 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/classes/class.processMap.php
View File

@@ -4615,6 +4615,7 @@ class processMap {
{
try {
$oTasks = new Tasks ( );
$_SESSION['TASK'] = $sTaskUID;
$aSteps = $oTasks->getStepsOfTask ( $sTaskUID );
$sUIDs = array ();
foreach ( $aSteps as $aStep ) {

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

@@ -160,36 +160,6 @@ ProcessMapContext.prototype.exportProcess= function()
workflow.FILENAME_LINK = '';
workflow.FILENAME_LINKXPDL = '';
/*var exportProcessFields = Ext.data.Record.create([
{
name: 'PRO_TITLE',
type: 'string'
},{
name: 'PRO_DESCRIPTION',
type: 'string'
},{
name: 'SIZE',
type: 'string'
},{
name: 'File',
type: 'string'
}]);
var pro_uid = workflow.getUrlVars();
exportProcess = new Ext.data.JsonStore
({
root : 'data',
totalProperty: 'totalCount',
idProperty : 'gridIndex',
remoteSort : true,
fields : exportProcessFields,
proxy : new Ext.data.HttpProxy({
url : 'proxyProcesses_Export?pro_uid='+pro_uid
})
});
//taskUsers.setDefaultSort('LABEL', 'asc');
exportProcess.load();*/
var exportProcessForm = new Ext.FormPanel({
labelWidth : 120, // label settings here cascade unless overridden
@@ -1042,7 +1012,6 @@ ProcessMapContext.prototype.processSupervisors= function()
User.data.items[selectedrowIndex].data.PU_UID = record.data.PU_UID;
User.data.items[selectedrowIndex].data.USR_UID = record.data.USR_UID;
User.data.items[selectedrowIndex].data.PU_TYPE = record.data.PU_TYPE;
//User.data.items[selectedrowIndex].data.USR_FIRSTNAME = record.data.USR_FIRSTNAME;
User.data.items[selectedrowIndex].data.USR_LASTNAME = record.data.USR_LASTNAME;
User.data.items[selectedrowIndex].data.USR_EMAIL = record.data.USR_EMAIL;
@@ -1052,7 +1021,6 @@ ProcessMapContext.prototype.processSupervisors= function()
}
})
},{
//id: 'USR_LASTNAME',
header: 'Last Name',
dataIndex: 'USR_LASTNAME',
width: 200,
@@ -1872,7 +1840,7 @@ ProcessMapContext.prototype.caseTrackerObjects= function()
var btnCondition = new Ext.Button({
var btnObjectsCondition = new Ext.Button({
id: 'btnCondition',
text: 'Assign Condition',
handler: function (s) {
@@ -1883,21 +1851,14 @@ ProcessMapContext.prototype.caseTrackerObjects= function()
workflow.gridObjectRowSelected = Objectsgrid;
else
workflow.gridObjectRowSelected = rowSelected;
//var rowSelected = Objectsgrid;
//workflow.gridObject = Objectsgrid;
var rowData = ProcMapObj.ExtVariables();
console.log(rowData);
//var a = Ext.getCmp('btnCondition');
//alert (a);
//console.log(rowData);
}
})
var tb = new Ext.Toolbar({
items: [btnAdd, btnRemove,btnCondition]
items: [btnAdd, btnRemove,btnObjectsCondition]
});
// create the Data Store of objects that are already assigned

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

@@ -1230,6 +1230,7 @@ ProcessOptions.prototype.addInputDoc= function(_5625)
handler: function (s) {
workflow.variablesAction = 'form';
workflow.fieldId= 'DestPath' ;
workflow.variable = '@@',
workflow.formSelected = inputDocForm;
var rowData = ProcMapObj.ExtVariables();
console.log(rowData);
@@ -1263,6 +1264,7 @@ ProcessOptions.prototype.addInputDoc= function(_5625)
handler: function (s) {
workflow.variablesAction = 'form';
workflow.fieldId= 'tags' ;
workflow.variable = '@@',
workflow.formSelected = inputDocForm;
var rowData = ProcMapObj.ExtVariables();
console.log(rowData);
@@ -1439,8 +1441,9 @@ ProcessOptions.prototype.addInputDoc= function(_5625)
INP_DOC_FORM_NEEDED : sFormNeeded,
INP_DOC_ORIGINAL : sOrig,
INP_DOC_VERSIONING : sVers,
INP_DOC_TAGS : 'INPUT', //By Default
INP_DOC_DESCRIPTION : sDesc
INP_DOC_TAGS : sTags,
INP_DOC_DESCRIPTION : sDesc,
INP_DOC_DESTINATION_PATH : sDestPath
},
success: function(response) {
Ext.MessageBox.alert ('Status','Input document has been updated successfully.');
@@ -1612,14 +1615,7 @@ ProcessOptions.prototype.addOutputDoc= function(_5625)
editor: new Ext.form.TextField({
//allowBlank: false
})
}/*,
{
sortable: false,
renderer: function(val, meta, record)
{
return String.format("<a href='../dynaforms/dynaforms_Editor?PRO_UID={0}&DYN_UID={1}'>Edit</a>",pro_uid,pro_uid);
}
}*/
]
});
@@ -1658,9 +1654,6 @@ ProcessOptions.prototype.addOutputDoc= function(_5625)
collapsible : false,
labelAlign : '',
items :[{
// xtype: 'hiddenfield',
// name:'OUT_DOC_UID'
// },{
xtype : 'textfield',
fieldLabel : 'Title',
allowBlank : false,
@@ -1694,13 +1687,12 @@ ProcessOptions.prototype.addOutputDoc= function(_5625)
name: 'selectorigin',
handler: function (s) {
workflow.variablesAction = 'form';
workflow.fieldId= 'filenameGenerated' ;
workflow.fieldId = 'filenameGenerated' ;
workflow.variable = '@@',
workflow.formSelected = outputDocForm;
var rowData = ProcMapObj.ExtVariables();
console.log(rowData);
}
//anchor:'95%'
}]
}]
},{
@@ -1839,12 +1831,12 @@ ProcessOptions.prototype.addOutputDoc= function(_5625)
name : 'selectorigin',
handler: function (s) {
workflow.variablesAction = 'form';
workflow.fieldId= 'DestPath' ;
workflow.fieldId = 'DestPath' ;
workflow.variable = '@@',
workflow.formSelected = outputDocForm;
var rowData = ProcMapObj.ExtVariables();
console.log(rowData);
}
//anchor :'15%'
}]
}]
},{
@@ -1872,12 +1864,12 @@ ProcessOptions.prototype.addOutputDoc= function(_5625)
name : 'selectorigin',
handler: function (s) {
workflow.variablesAction = 'form';
workflow.fieldId= 'tags' ;
workflow.fieldId = 'tags' ;
workflow.variable = '@@',
workflow.formSelected = outputDocForm;
var rowData = ProcMapObj.ExtVariables();
console.log(rowData);
}
//anchor :'15%'
}]
}]
},{
@@ -1914,8 +1906,6 @@ ProcessOptions.prototype.addOutputDoc= function(_5625)
sVersioning=1;
var sDestPath = getForm.OUT_DOC_DESTINATION_PATH;
var sTags = getForm.OUT_DOC_TAGS;
if(sDocUID == "")
{
Ext.Ajax.request({
@@ -1996,10 +1986,6 @@ ProcessOptions.prototype.addOutputDoc= function(_5625)
});
}
}
},{
@@ -2337,9 +2323,6 @@ var formWindow = new Ext.Window({
var Grid = getForm.REP_TAB_GRID;
var Fields = getForm.FIELDS;
// var VariableName = getForm.REP_VAR_NAME;
// var VariableType = getForm.REP_VAR_TYPE;
// var Connection = getForm.REP_TAB_CONNECTION
if(typeof tableUID=='undefined')
{
@@ -2354,17 +2337,12 @@ var formWindow = new Ext.Window({
REP_TAB_TYPE :Type ,
REP_TAB_GRID :Grid,
FIELDS :Fields
//REP_VAR_NAME : VariableName,
//REP_VAR_TYPE : VariableType,
//REP_TAB_CONNECTION: Connection
},
success: function(response) {
Ext.MessageBox.alert ('Status','Report Table Saved Successfully.');
}
});
}
else
{
Ext.Ajax.request({
@@ -2390,7 +2368,7 @@ var formWindow = new Ext.Window({
});
}
formWindow.close();
// reportStore.reload();
reportStore.reload();
}
},{

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

@@ -145,33 +145,27 @@ TaskContext.prototype.editTaskSteps = function(_3252){
});
var btnCondition = new Ext.Button({
var btnStepsCondition = new Ext.Button({
id: 'btnCondition',
text: 'Assign Condition',
handler: function (s) {
workflow.variablesAction = 'grid';
workflow.variable = '@@',
workflow.gridField = 'STEP_CONDITION';
var rowSelected = conditionGrid.getSelectionModel().getSelections();
if(rowSelected == '')
workflow.gridObjectRowSelected = conditionGrid;
else
workflow.gridObjectRowSelected = rowSelected;
//var rowSelected = Objectsgrid;
//workflow.gridObject = Objectsgrid;
var rowData = ProcMapObj.ExtVariables();
console.log(rowData);
//var a = Ext.getCmp('btnCondition');
//alert (a);
//console.log(rowData);
}
})
var toolbar = new Ext.Toolbar({
items: [btnCondition]
items: [btnStepsCondition]
});
//availableSteps.load();
var conditionGrid = new Ext.grid.GridPanel({
@@ -179,25 +173,22 @@ TaskContext.prototype.editTaskSteps = function(_3252){
id : 'conditiongrid',
loadMask : true,
loadingText : 'Loading...',
// renderTo : 'cases-grid',
frame : false,
autoHeight : false,
enableDragDrop : true,
layout : 'form',
tbar: toolbar,
tbar : toolbar,
ddGroup : 'firstGridDDGroup',
clicksToEdit: 1,
clicksToEdit : 1,
minHeight :400,
height :400,
plugins: [editor],
plugins : [editor],
columns : [{
id: 'STEP_TITLE',
header: 'Title',
dataIndex: 'STEP_TITLE',
width: 280,
editor: new Ext.form.TextField({
//alloBlank: false
})
},
{
@@ -209,11 +200,7 @@ TaskContext.prototype.editTaskSteps = function(_3252){
editor: new Ext.form.TextField({
})
}
]
});
@@ -242,11 +229,9 @@ TaskContext.prototype.editTaskSteps = function(_3252){
editor: new Ext.form.ComboBox({
xtype : 'combo',
fieldLabel : 'Users_groups',
//hiddenName : 'number',
store : availableSteps,
displayField : 'STEP_TITLE' ,
valueField : 'STEP_TITLE',
//name : 'STEP_TITLE',
scope : this,
triggerAction: 'all',
emptyText : 'Select Step',
@@ -260,12 +245,12 @@ TaskContext.prototype.editTaskSteps = function(_3252){
selectedrowIndex = _3252.scope.workflow.currentrowIndex; //getting Index of the row that has been edited
//User.data.items[0].data.STEP_TITLE= record.data.STEP_TITLE;
User.data.items[selectedrowIndex].data.STEP_UID= record.data.STEP_UID;
User.data.items[selectedrowIndex].data.STEP_TYPE_OBJ=record.data.STEP_TYPE_OBJ;
User.data.items[selectedrowIndex].data.STEP_CONDITION=record.data.STEP_CONDITION;
User.data.items[selectedrowIndex].data.STEP_POSITION=record.data.STEP_POSITION;
User.data.items[selectedrowIndex].data.STEP_UID_OBJ=record.data.STEP_UID_OBJ;
User.data.items[selectedrowIndex].data.STEP_MODE=record.data.STEP_MODE;
User.data.items[selectedrowIndex].data.STEP_UID = record.data.STEP_UID;
User.data.items[selectedrowIndex].data.STEP_TYPE_OBJ =record.data.STEP_TYPE_OBJ;
User.data.items[selectedrowIndex].data.STEP_CONDITION =record.data.STEP_CONDITION;
User.data.items[selectedrowIndex].data.STEP_POSITION =record.data.STEP_POSITION;
User.data.items[selectedrowIndex].data.STEP_UID_OBJ =record.data.STEP_UID_OBJ;
User.data.items[selectedrowIndex].data.STEP_MODE =record.data.STEP_MODE;
this.setValue(record.data[this.valueField || this.displayField]);
this.collapse();
@@ -419,16 +404,6 @@ TaskContext.prototype.editTaskSteps = function(_3252){
width: 400
},
items:[conditionGrid]
/*xtype: 'grid',
name: 'conditionGrid',
ds: taskSteps,
cm: conditionsColumns,
height: 350,
loadMask : true,
loadingText : 'Loading...',
border: false,
tbar: toolbar }]*/
},{
title:'Triggers',
layout:'form',
@@ -456,20 +431,7 @@ TaskContext.prototype.editTaskSteps = function(_3252){
bodyStyle: 'padding:5px;',
buttonAlign: 'center',
items: taskStepsTabs
/*buttons: [{
text: 'Save',
handler: function(){
//var getstore = grid.getStore();
//var getData = getstore.data.items;
//taskExtObj.saveTaskSteps(getData);
}
},{
text: 'Cancel',
handler: function(){
// when this button clicked,
window.close();
}
}]*/
});
window.show();
@@ -483,7 +445,6 @@ TaskContext.prototype.editUsers= function(_5625)
var taskExtObj = new TaskContext();
var pro_uid = workflow.getUrlVars();
var taskId = workflow.currentSelection.id;
var userFields = Ext.data.Record.create([
{
name: 'LABEL',
@@ -518,14 +479,11 @@ TaskContext.prototype.editUsers= function(_5625)
handler: function(){
var User = grid.getStore();
var e = new userFields({
//LABEL: 'Select User or Group',
//LABEL: User.data.items[0].data.LABEL,
TAS_UID: '',
TU_TYPE: '',
USR_UID: '',
TAS_UID : '',
TU_TYPE : '',
USR_UID : '',
TU_RELATION: ''
});
//storeUsers.reload();
if(storeUsers.data.items.length == 0)
Ext.MessageBox.alert ('Status','No users are available. All users have been already assigned.');
@@ -534,7 +492,6 @@ TaskContext.prototype.editUsers= function(_5625)
editor.stopEditing();
taskUsers.insert(0, e);
grid.getView().refresh();
//grid.getSelectionModel().selectRow(0);
editor.startEditing(0, 0);
}
}
@@ -688,7 +645,6 @@ TaskContext.prototype.editUsers= function(_5625)
editor.on({
scope: this,
afteredit: function(roweditor, changes, record, rowIndex) {
var taskId = record.data.TAS_UID;
var userId = record.data.USR_UID;
var tu_Type = record.data.TU_TYPE;
@@ -742,22 +698,6 @@ TaskContext.prototype.editUsers= function(_5625)
bodyStyle: 'padding:5px;',
buttonAlign: 'center',
items: panel
/*buttons: [{
text: 'Save',
handler: function(){
Ext.MessageBox.alert ("User has been successfully assigned");
//var getstore = grid.getStore();
//var getData = getstore.data.items;
//taskExtObj.saveTaskUsers(getData);
}
},{
text: 'Cancel',
handler: function(){
// when this button clicked,
window.close();
}
}]*/
});
window.show();
}
@@ -769,47 +709,6 @@ TaskContext.prototype.editTaskProperties= function(_5625)
var taskExtObj = new TaskContext();
var taskId = _5625.scope.workflow.currentSelection.id;
/*function setTaskAssignType(formData){
for(var i=0;i<formData.items.items.length;i++)
{
if(formData.items.items[i].xtype == 'radiogroup')
{
//var taskAssignType = formData.items.items[i].getValue();
//var taskAssignType1 = taskPropertiesTabs.getForm().findField('TAS_ASSIGN_TYPE').getGroupValue();
//var taskAssignType1 = Ext.getCmp("assignType").items.get(0).getGroupValue();
//var checkedItem = Ext.getCmp('assignType').items.first().getGroupValue();
switch(checkedItem)
{
case 'SELF_SERVICE':
this.workflow.selfServiceChecked = true;
break;
case 'REPORT_TO':
this.workflow.reportToChecked = true;
break;
case 'BALANCED':
this.workflow.balancedChecked = true;
break;
case 'MANUAL':
this.workflow.manualChecked = true;
break;
case 'EVALUATE':
this.workflow.evaluateChecked = true;
this.workflow.hideEvaluateField = false;
break;
case 'STATIC_MI':
this.workflow.staticMIChecked = true;
this.workflow.hidePartialJoinField = false;
break;
case 'CANCEL_MI':
this.workflow.cancelMIChecked = true;
this.workflow.hidePartialJoinField = false;
break;
}
}
}
}*/
// create the Data Store for processes
var taskDetails = new Ext.data.JsonStore({
root : 'data',
@@ -862,8 +761,7 @@ TaskContext.prototype.editTaskProperties= function(_5625)
allowBlank: false,
width: 300,
height : 150
},
{
},{
xtype: 'fieldset',
layout:'column',
border:false,
@@ -891,20 +789,17 @@ TaskContext.prototype.editTaskProperties= function(_5625)
name: 'selectorigin',
handler: function (s) {
workflow.variablesAction = 'form';
workflow.fieldId= 'priorityVariable' ;
workflow.fieldId = 'priorityVariable' ;
workflow.formSelected = taskPropertiesTabs;
var rowData = ProcMapObj.ExtVariables();
console.log(rowData);
}
//anchor:'15%'
}]
}]
},
{
},{
xtype: 'checkbox',
fieldLabel: 'Starting Task',
name: 'TAS_START',
//dataIndex: 'TAS_START'
checked: 'TAS_START'
}]
},{
@@ -913,7 +808,6 @@ TaskContext.prototype.editTaskProperties= function(_5625)
defaults: {
width: 260
},
//defaultType: 'textfield',
items: [{
xtype: 'radiogroup',
id: 'assignType',
@@ -1093,9 +987,7 @@ TaskContext.prototype.editTaskProperties= function(_5625)
//anchor:'35%'
}]
}]
}
]
}]
},{
title:'Timing Control Rules',
layout:'form',
@@ -1123,9 +1015,7 @@ TaskContext.prototype.editTaskProperties= function(_5625)
}
}
},
{
},{
xtype: 'fieldset',
layout:'form',
border:false,
@@ -1141,8 +1031,7 @@ TaskContext.prototype.editTaskProperties= function(_5625)
//value: _5625.scope.workflow.taskDetails.TAS_DURATION,
width : 100,
allowBlank:false
},
{
},{
width: 100,
xtype: 'combo',
mode: 'local',
@@ -1161,16 +1050,12 @@ TaskContext.prototype.editTaskProperties= function(_5625)
{
name : 'Days',
value: 'Days'
},
{
},{
name : 'Hours',
value: 'Hours'
},
]
}]
})
},
{
},{
width: 120,
xtype: 'combo',
mode: 'local',
@@ -1198,8 +1083,7 @@ TaskContext.prototype.editTaskProperties= function(_5625)
},
]
})
},
{
},{
width: 100,
xtype: 'combo',
mode: 'local',
@@ -1230,8 +1114,7 @@ TaskContext.prototype.editTaskProperties= function(_5625)
}]
}]
},
{
},{
title:'Permission',
layout:'form',
defaults: {
@@ -1245,9 +1128,7 @@ TaskContext.prototype.editTaskProperties= function(_5625)
checked: 'TAS_TYPE',
name: 'TAS_TYPE'
}]
},
{
},{
title:'Case Labels',
layout:'form',
defaults: {
@@ -1285,16 +1166,15 @@ TaskContext.prototype.editTaskProperties= function(_5625)
name: 'selectCaseTitle',
handler: function (s) {
workflow.variablesAction = 'form';
workflow.fieldId= 'caseTitle' ;
workflow.variable = '@%23',
workflow.fieldId = 'caseTitle' ;
workflow.formSelected = taskPropertiesTabs;
var rowData = ProcMapObj.ExtVariables();
console.log(rowData);
}
//anchor:'10%'
}]
}]
},
{
},{
xtype: 'fieldset',
layout:'column',
border:false,
@@ -1324,6 +1204,7 @@ TaskContext.prototype.editTaskProperties= function(_5625)
name: 'selectCaseDesc',
handler: function (s) {
workflow.variablesAction = 'form';
workflow.variable = '@%23',
workflow.fieldId= 'caseDescription' ;
workflow.formSelected = taskPropertiesTabs;
var rowData = ProcMapObj.ExtVariables();
@@ -1333,8 +1214,7 @@ TaskContext.prototype.editTaskProperties= function(_5625)
}]
}]
}]
},
{
},{
title:'Notification',
layout:'form',
defaultType: 'textfield',
@@ -1637,11 +1517,12 @@ TaskContext.prototype.stepTriggers = function(_5625)
});
var btnCondition = new Ext.Button({
id: 'btnCondition',
var btnTriggerCondition = new Ext.Button({
//id: 'btnCondition',
text: 'Assign Condition',
handler: function (s) {
workflow.variablesAction = 'grid';
workflow.variable = '@@',
workflow.gridField = 'ST_CONDITION';
var rowSelected = triggerGrid.getSelectionModel().getSelections();
if(rowSelected == '')
@@ -1662,7 +1543,7 @@ TaskContext.prototype.stepTriggers = function(_5625)
});
var toolBar = new Ext.Toolbar({
items: [addBtn, removeBtn, btnCondition]
items: [addBtn, removeBtn, btnTriggerCondition]
});
@@ -1808,6 +1689,8 @@ TaskContext.prototype.stepTriggers = function(_5625)
var sTrigger = record.json.TRI_UID;
sType = record.json.ST_TYPE;
var iPosition = record.json.ST_POSITION;
var condition = record.json.ST_CONDITION;
var urlparams = '?action=ofToAssignTrigger&sStep=' + stepUID + '&sTrigger=' + sTrigger + '&sType=' + sType + '&iPosition=' + iPosition
Ext.Ajax.request({
@@ -1846,59 +1729,27 @@ TaskContext.prototype.stepTriggers = function(_5625)
});
return treeGrid;
/*var window = new Ext.Window({
title: 'Steps Of',
collapsible: false,
maximizable: false,
width: 700,
height: 500,
//minWidth: 200,
//autoHeight: true,
minHeight : 150,
layout : 'fit',
plain: true,
bodyStyle: 'padding:5px;',
buttonAlign: 'center',
items: [treeGrid],
buttons: [{
text: 'Save',
handler: function(){
}
},{
text: 'Cancel',
handler: function(){
// when this button clicked,
window.close();
}
}]
});
window.show();*/
}
TaskContext.prototype.editUsersAdHoc= function(_5625)
{
var taskExtObj = new TaskContext();
var pro_uid = workflow.getUrlVars();
var taskId = workflow.currentSelection.id;
var userFields = Ext.data.Record.create([
{
name: 'LABEL',
type: 'string'
},
{
},{
name: 'TU_TYPE',
type: 'string'
},
{
},{
name: 'TU_RELATION',
type: 'string'
},
{
},{
name: 'TAS_UID',
type: 'string'
},
{
},{
name: 'USR_UID',
type: 'string'
}