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

Updated Old Processmap Task size

Browse Source
This commit is contained in:
girish
2011-02-24 13:06:37 +00:00
parent 93ea13a75a
commit eb77ec83a2
3 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6616,9 +6616,10 @@ function saveExtEvents($oData)
$aDataTask['EVN_TYPE'] = $oData->evn_type;
$aDataTask['TAS_EVN_UID'] = $oData->evn_uid;
$oTask->update($aDataTask);
$aDataEvent['EVN_TAS_UID_TO'] = $oData->tas_uid;
$output = $oEvent->update($aDataEvent);
}
$aDataEvent['EVN_TAS_UID_TO'] = $oData->tas_uid;
$output = $oEvent->update($aDataEvent);
}
else if(preg_match("/Inter/", $sEvn_type)){
$aDataEvent['EVN_TAS_UID_FROM'] = $oData->tas_from;

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

@@ -1154,12 +1154,12 @@ MyWorkflow.prototype.saveShape= function(oNewShape)
else if(oNewShape.type == 'bpmnSubProcess'){
oNewShape.subProcessName = this.workflow.newTaskInfo.label;
}
else if(oNewShape.type.match(/Inter/) && oNewShape.type.match(/Start/)) {
/*else if(oNewShape.type.match(/Inter/) && oNewShape.type.match(/Start/)) {
workflow.saveEvents(oNewShape);
}
else if(oNewShape.type.match(/Start/) && oNewShape.type.match(/Event/)) {
workflow.saveEvents(oNewShape);
}
}*/
else if(oNewShape.type.match(/End/) && oNewShape.type.match(/Event/)) {
if(workflow.currentSelection != null && workflow.currentSelection != '') //will check for standalone event
workflow.saveRoute(workflow.currentSelection,oNewShape);
@@ -1851,9 +1851,9 @@ MyWorkflow.prototype.zoom = function(sType)
sType =sType/100;
workflow.zoomfactor = sType;
var figSize = figures.getSize();
loadMask.show();
for(f = 0;f<figures.getSize();f++){
var fig = figures.get(f);
loadMask.show();
if(typeof fig.limitFlag == 'undefined'){
fig.orgXPos = fig.getX();
fig.orgYPos = fig.getY();
@@ -1865,7 +1865,6 @@ MyWorkflow.prototype.zoom = function(sType)
}
fig.limitFlag = true;
}
if(fig.limitFlag == false){
fig.originalWidth = fig.getWidth();
fig.originalHeight = fig.getHeight();
@@ -1873,10 +1872,6 @@ MyWorkflow.prototype.zoom = function(sType)
}
//If zooming is 100% disable resizing of shapes again
if(sType == '1'){
fig.limitFlag = true;
}
var width = fig.originalWidth*sType;
var height = fig.originalHeight*sType;
if(fig.boundaryEvent == true) {
@@ -1900,6 +1895,18 @@ MyWorkflow.prototype.zoom = function(sType)
fig.setPosition(xPos,yPos);
fig.setDimension(width,height);
}
//If zooming is 100% disable resizing of shapes again
if(sType == '1'){
fig.orgXPos = fig.getX();
fig.orgYPos = fig.getY();
fig.orgFontSize =fig.fontSize;
if(fig.boundaryEvent == true){
fig.orgx3Pos = fig.x3;
fig.orgy4Pos = fig.y4;
fig.orgy5Pos = fig.y5;
}
}
loadMask.hide();
}

17
workflow/engine/templates/bpmn/designer.js
View File

@@ -1036,9 +1036,20 @@ Ext.onReady ( function() {
if(k != 0)
workflow.taskNo++;
workflow.taskName = shapes.tasks[k][1];
workflow.task_width = shapes.tasks[k][4];
workflow.task_height = shapes.tasks[k][5];
workflow.taskName = shapes.tasks[k][1];
//workaround for Old Processmap widht and height
if(shapes.tasks[k][4] == 110) {
workflow.task_width = 165;
}
else {
workflow.task_width = shapes.tasks[k][4];
}
if(shapes.tasks[k][5] == 60) {
workflow.task_height = 40;
}
else {
workflow.task_height = shapes.tasks[k][5];
}
NewShape = eval("new bpmnTask(workflow)");
NewShape.x = shapes.tasks[k][2];
NewShape.y = shapes.tasks[k][3];