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

fixed input,output document,steps issue..

Browse Source
This commit is contained in:
safan
2011-02-01 14:15:01 +00:00
parent 613a2f8d42
commit 171bf58153
5 changed files with 92 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4740,7 +4740,7 @@ class processMap {
$oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
$oDataset->next ();
while ( $aRow = $oDataset->getRow () ) {
$aBB [] = array ('STEP_UID' => $aRow ['INP_DOC_UID'], 'STEP_TITLE' => $aRow ['INP_DOC_TITLE'], 'STEP_TYPE_OBJ' => 'INPUT_DOCUMENT', 'STEP_MODE' => '<input type="hidden" id="STEP_MODE_' . $aRow ['INP_DOC_UID'] . '">' );
$aBB [] = array ('STEP_UID' => $aRow ['INP_DOC_UID'], 'STEP_UID_OBJ' => $aRow ['INP_DOC_UID'], 'STEP_TITLE' => $aRow ['INP_DOC_TITLE'], 'STEP_TYPE_OBJ' => 'INPUT_DOCUMENT', 'STEP_MODE' => '<input type="hidden" id="STEP_MODE_' . $aRow ['INP_DOC_UID'] . '">' );
$oDataset->next ();
}
$oCriteria = new Criteria ( 'workflow' );
@@ -4758,7 +4758,7 @@ class processMap {
$oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
$oDataset->next ();
while ( $aRow = $oDataset->getRow () ) {
$aBB [] = array ('STEP_UID' => $aRow ['OUT_DOC_UID'], 'STEP_TITLE' => $aRow ['OUT_DOC_TITLE'], 'STEP_TYPE_OBJ' => 'OUTPUT_DOCUMENT', 'STEP_MODE' => '<input type="hidden" id="STEP_MODE_' . $aRow ['OUT_DOC_UID'] . '">' );
$aBB [] = array ('STEP_UID' => $aRow ['OUT_DOC_UID'],'STEP_UID_OBJ' => $aRow ['OUT_DOC_UID'], 'STEP_TITLE' => $aRow ['OUT_DOC_TITLE'], 'STEP_TYPE_OBJ' => 'OUTPUT_DOCUMENT', 'STEP_MODE' => '<input type="hidden" id="STEP_MODE_' . $aRow ['OUT_DOC_UID'] . '">' );
$oDataset->next ();
}

12
workflow/engine/templates/bpmn/EventBoundaryTimerInter.js
View File

@@ -1,4 +1,4 @@
bpmnEventBoundaryTimerInter=function(){
bpmnEventBoundaryInter=function(){
VectorFigure.call(this);
//Setting width and height values as per the zoom ratio
if(typeof workflow.zoomWidth != 'undefined' || typeof workflow.zoomHeight != 'undefined')
@@ -7,9 +7,9 @@ else
this.setDimension(30,30);
this.stroke = 2;
};
bpmnEventBoundaryTimerInter.prototype=new VectorFigure;
bpmnEventBoundaryTimerInter.prototype.type="bpmnEventBoundaryTimerInter";
bpmnEventBoundaryTimerInter.prototype.paint=function(){
bpmnEventBoundaryInter.prototype=new VectorFigure;
bpmnEventBoundaryInter.prototype.type="bpmnEventBoundaryTimerInter";
bpmnEventBoundaryInter.prototype.paint=function(){
VectorFigure.prototype.paint.call(this);
var x_cir1=0;
var y_cir1=0;
@@ -74,7 +74,7 @@ this.output2.setPosition(this.width,this.height/2);
}
};
bpmnEventBoundaryTimerInter.prototype.setWorkflow=function(_40c5){
bpmnEventBoundaryInter.prototype.setWorkflow=function(_40c5){
VectorFigure.prototype.setWorkflow.call(this,_40c5);
if(_40c5!=null){
var eventPortName = ['input2','output2'];
@@ -94,7 +94,7 @@ if(_40c5!=null){
}
};
bpmnEventBoundaryTimerInter.prototype.getContextMenu=function(){
bpmnEventBoundaryInter.prototype.getContextMenu=function(){
if(this.id != null){
this.workflow.handleContextMenu(this);
}

2
workflow/engine/templates/bpmn/MyWorkflow.js
View File

@@ -1159,7 +1159,7 @@ MyWorkflow.prototype.AddEventInterContextMenu=function(_4093)
},
{
text: 'Intermediate Boundary Timer',
type:'bpmnEventBoundaryTimerInter',
type:'bpmnEventBoundaryInter',
scope:_4093,
handler: MyWorkflow.prototype.toggleShapes
}

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

@@ -1214,40 +1214,6 @@ ProcessOptions.prototype.addInputDoc= function(_5625)
{name : 'No', value: ''},
{name : 'Yes', value: '1'},
]})
}/*,{
layout:'column',
border:false,
// defaults for columns
defaults:{
columnWidth:0.7
,layout:'form'
,border:false
,xtype:'panel'
,bodyStyle:'padding:0 18px 0 0'
},
items:[{
//defaults:{anchor:'100%'},
items:[{
xtype: 'textfield',
//id: 'DestPath',
fieldLabel: 'Destination Path',
name: 'INP_DOC_DESTINATION_PATH',
anchor:'100%'
},{
xtype:'button',
title: ' ',
text: '@@',
name: 'selectorigin',
handler: function (s) {
workflow.variablesAction = 'form';
workflow.fieldId= 'DestPath' ;
workflow.variable = '@@',
workflow.formSelected = inputDocForm;
var rowData = ProcMapObj.ExtVariables();
}
}]
}]
},{
layout :'column',
border :false,
@@ -1257,9 +1223,9 @@ ProcessOptions.prototype.addInputDoc= function(_5625)
border :false,
items : [{
xtype : 'textfield',
//id:'tags',
fieldLabel: 'Tags',
name: 'INP_DOC_TAGS',
id : 'DestPath',
fieldLabel : 'Destination Path',
name : 'INP_DOC_DESTINATION_PATH',
anchor :'100%'
}]
},{
@@ -1273,62 +1239,36 @@ ProcessOptions.prototype.addInputDoc= function(_5625)
name : 'selectorigin',
handler: function (s) {
workflow.variablesAction = 'form';
workflow.fieldId= 'tags' ;
workflow.fieldId = 'DestPath' ;
workflow.variable = '@@',
workflow.formSelected = inputDocForm;
var rowData = ProcMapObj.ExtVariables();
}
}]
}]
}*/,{
// column layout with 2 columns
},{
layout :'column',
border :false,
// defaults for columns
defaults:{
columnWidth:0.5,
items :[{
columnWidth :.6,
layout : 'form',
border :false,
xtype:'panel',
bodyStyle:'padding:0 18px 0 0'
},
items:[{
// left column
// defaults for fields
defaults:{anchor:'100%'},
items : [{
xtype : 'textfield',
//id: 'DestPath',
fieldLabel: 'Destination Path',
name: 'INP_DOC_DESTINATION_PATH'
},{
xtype:'textfield',
// id:'tags',
id :'tags',
fieldLabel : 'Tags',
name: 'INP_DOC_TAGS'
name : 'INP_DOC_TAGS',
anchor :'100%'
}]
},{
// right column
// defaults for fields
defaults:{anchor:'10%'}
,items:[{
columnWidth :.4,
layout : 'form',
border :false,
items : [{
xtype :'button',
// title: ' ',
title : ' ',
text : '@@',
// name: 'selectorigin',
handler: function (s) {
workflow.variablesAction = 'form';
workflow.fieldId= 'tags' ;
workflow.variable = '@@',
workflow.formSelected = inputDocForm;
var rowData = ProcMapObj.ExtVariables();
}
},{
xtype:'button',
// title: ' ',
text: '@@',
// name: 'selectorigin',
name : 'selectorigin',
handler: function (s) {
workflow.variablesAction = 'form';
workflow.fieldId = 'tags' ;
@@ -1353,6 +1293,9 @@ ProcessOptions.prototype.addInputDoc= function(_5625)
var sDocTitle = getForm.INP_DOC_TITLE;
var sFormNeeded = getForm.INP_DOC_FORM_NEEDED;
var sOrig = getForm.INP_DOC_ORIGINAL;
if(sOrig == "")
sOrig = 'ORIGINAL';
if(sOrig == 'LEGAL COPY')
sOrig = 'COPYLEGAL';

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

@@ -176,10 +176,10 @@ TaskContext.prototype.editTaskSteps = function(_3252){
loadingText : 'Loading...',
frame : false,
autoHeight : false,
enableDragDrop : true,
//enableDragDrop : true,
layout : 'form',
tbar : toolbar,
ddGroup : 'firstGridDDGroup',
//ddGroup : 'firstGridDDGroup',
clicksToEdit : 1,
minHeight :400,
height :400,
@@ -211,11 +211,11 @@ TaskContext.prototype.editTaskSteps = function(_3252){
id : 'mygrid',
loadMask : true,
loadingText : 'Loading...',
renderTo : 'cases-grid',
//renderTo : 'cases-grid',
frame : false,
autoHeight : false,
enableDragDrop : true,
ddGroup : 'firstGridDDGroup',
//enableDragDrop : true,
//ddGroup : 'firstGridDDGroup',
clicksToEdit: 1,
minHeight :400,
height :400,
@@ -334,7 +334,7 @@ TaskContext.prototype.editTaskSteps = function(_3252){
Ext.MessageBox.alert ('Status','Step has been assigned successfully.');
}
});
availableSteps.reload();
//availableSteps.reload();
//Deleting previously assigned step on updating/replacing with new step.
if(changes != '' && typeof record.json != 'undefined')
{
@@ -360,7 +360,7 @@ TaskContext.prototype.editTaskSteps = function(_3252){
// Setup Drop Targets
// This will make sure we only drop to the view scroller element
var firstGridDropTargetEl = grid.getView().scroller.dom;
/* var firstGridDropTargetEl = grid.getView().scroller.dom;
var firstGridDropTarget = new Ext.dd.DropTarget(firstGridDropTargetEl, {
ddGroup : 'firstGridDDGroup',
notifyDrop : function(ddSource, e, data){
@@ -372,7 +372,7 @@ TaskContext.prototype.editTaskSteps = function(_3252){
return true
}
});
firstGridDropTarget.addToGroup('firstGridDDGroup');
firstGridDropTarget.addToGroup('firstGridDDGroup');*/
//Getting triggers data using stepTriggers function
var treeGrid = taskExtObj.stepTriggers(_3252);
@@ -756,7 +756,7 @@ TaskContext.prototype.editTaskProperties= function()
name: 'TAS_DESCRIPTION',
//dataIndex: 'TAS_DESCRIPTION',
//value: _5625.scope.workflow.taskDetails.TAS_DESCRIPTION,
allowBlank: false,
allowBlank: true,
width: 300,
height : 150
},{
@@ -1295,8 +1295,11 @@ TaskContext.prototype.editTaskProperties= function()
form.items.items[4].items[0].checked=true;
else if(action.result.data.TAS_ASSIGN_TYPE=='MANUAL')
{
form.items.items[4].items[1].checked=true;
Ext.getCmp(ID).setValue(true);
Ext.getCmp('BALANCED').setValue(true);
}
else if(action.result.data.TAS_ASSIGN_TYPE=='EVALUATE')
{
form.items.items[4].items[2].checked=true;
@@ -1405,7 +1408,7 @@ TaskContext.prototype.saveTaskProperties= function()
TaskContext.prototype.stepTriggers = function()
{
var pro_uid = _workflow.getUrlVars();
var pro_uid = workflow.getUrlVars();
var taskId = workflow.currentSelection.id;
var ProcMapObj= new ProcessMapContext();
var triggersFields = Ext.data.Record.create([