fernando/luos
1
0
Fork 0
Code Releases Activity

Saving Start event completed

Browse Source
This commit is contained in:
girish
2011-02-15 13:17:35 +00:00
parent 77c69b3153
commit e3c152cad7
4 changed files with 66 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -463,6 +463,7 @@ class processMap {
$oTrigger = new Triggers ( );
$oRoute = new Route ( );
$oGateway = new Gateway ( );
$oEvent = new Event ( );
$oSwimlaneElement = new SwimlanesElements ( );
$oConfiguration = new Configuration ( );
$oDbSource = new DbSource ( );
@@ -554,6 +555,17 @@ class processMap {
$oDataset->next();
}
//Delete the Event of process
$oCriteria = new Criteria('workflow');
$oCriteria->add(EventPeer::PRO_UID, $sProcessUID);
$oDataset = EventPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
$oEvent->remove($aRow ['EVN_UID']);
$oDataset->next();
}
//Delete the swimlanes elements of process
$oCriteria = new Criteria('workflow');
$oCriteria->add(SwimlanesElementsPeer::PRO_UID, $sProcessUID);

4
workflow/engine/methods/bpmn/openProcess.php
View File

@@ -57,7 +57,7 @@
$arrayTasks[$countTasks]['4'] = $value['TAS_WIDTH'];
$arrayTasks[$countTasks]['5'] = $value['TAS_HEIGHT'];
$arrayTasks[$countTasks]['6'] = $value['TAS_BOUNDARY'];
if($value['TAS_START'] == 'TRUE'){
/* if($value['TAS_START'] == 'TRUE'){
$arrayEvents[$count]['0'] = G::generateUniqueID();
if($value['TAS_EVN_UID'] == '')
{
@@ -84,7 +84,7 @@
$arrayRoutes[$countRoutes]['4']= '2';
$count = $count+ 1;
$countRoutes = $countRoutes+ 1;
}
}*/
$countTasks = $countTasks + 1;
}
}

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

@@ -1214,6 +1214,9 @@ MyWorkflow.prototype.saveShape= function(oNewShape)
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);
}
}
},
failure: function(){
@@ -1506,16 +1509,16 @@ MyWorkflow.prototype.saveEvents = function(oEvent,sTaskUID)
if(response.responseText != '')
{
//Save Route
if(workflow.currentSelection.type.match(/Inter/) && workflow.currentSelection.type.match(/Event/)){
workflow.currentSelection.id = response.responseText;
var newObj = workflow.currentSelection;
var preObj = new Array();
preObj.type = 'bpmnTask';
preObj.id = task_uid[0];
newObj.evn_uid = workflow.currentSelection.id;
newObj.task_to = next_task_uid[0];
this.workflow.saveRoute(preObj,newObj);
}
// if(workflow.currentSelection.type.match(/Inter/) && workflow.currentSelection.type.match(/Event/)){
// workflow.currentSelection.id = response.responseText;
// var newObj = workflow.currentSelection;
// var preObj = new Array();
// preObj.type = 'bpmnTask';
// preObj.id = task_uid[0];
// newObj.evn_uid = workflow.currentSelection.id;
// newObj.task_to = next_task_uid[0];
// this.workflow.saveRoute(preObj,newObj);
// }
}
},
failure: function(){
@@ -1569,7 +1572,7 @@ MyWorkflow.prototype.saveRoute = function(preObj,newObj)
}
else if(preObj.type.match(/Task/) && newObj.type.match(/End/) && newObj.type.match(/Event/) || newObj.reverse == 1)
{
this.deleteRoute(newObj.conn,1);
//this.deleteRoute(newObj.conn,1);
if(newObj.reverse == 1) //Reverse Routing
task_uid[0] = newObj.id;
else
@@ -1818,6 +1821,7 @@ MyWorkflow.prototype.getDeleteCriteria = function()
MyWorkflow.prototype.zoom = function(sType)
{
//workflow.zoomFactor = 1;
var loadMask = new Ext.LoadMask(document.body, {msg:'Zooming..'});
var figures = workflow.getDocument().getFigures();
var lines=workflow.getLines();
@@ -1828,73 +1832,59 @@ MyWorkflow.prototype.zoom = function(sType)
var figSize = figures.getSize();
for(f = 0;f<figures.getSize();f++){
var fig = figures.get(f);
if(typeof fig.limitFlag == 'undefined' || fig.limitFlag == false)
{
loadMask.show();
if(typeof fig.limitFlag == 'undefined' || fig.limitFlag == false){
fig.originalWidth = fig.getWidth();
fig.originalHeight = fig.getHeight();
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;
}
if(fig.boundaryEvent == true){
fig.orgx3Pos = fig.x3;
fig.orgy4Pos = fig.y4;
fig.orgy5Pos = fig.y5;
}
fig.limitFlag = true;
}
//If zooming is 100% disable resizing of shapes again
if(sType == '1')
{
fig.limitFlag = false;
}
if(sType == '1'){
fig.limitFlag = false;
}
var width = fig.originalWidth*sType;
var height = fig.originalHeight*sType;
if(fig.boundaryEvent == true)
{
fig.x3 = fig.orgx3Pos *sType;
fig.y4 = fig.orgy4Pos *sType;
fig.y5 = fig.orgy5Pos *sType;
}
if(fig.boundaryEvent == true){
fig.x3 = fig.orgx3Pos *sType;
fig.y4 = fig.orgy4Pos *sType;
fig.y5 = fig.orgy5Pos *sType;
}
var xPos = fig.orgXPos * sType;
var yPos = fig.orgYPos * sType;
if(fig.type == 'bpmnTask')
{
fig.fontSize = parseInt(fig.orgFontSize) * sType;
//fig.bpmnText.drawStringRect(fig.taskName, fig.padleft, fig.padtop, fig.rectWidth, fig.rectheight, 'center');
fig.bpmnText.paint();
}
else if(fig.type == 'bpmnAnnotation')
{
fig.fontSize = parseInt(fig.orgFontSize) * sType;
fig.bpmnText.paint();
}
fig.setPosition(xPos,yPos);
fig.setDimension(width,height);
if(fig.type == 'bpmnTask'){
fig.fontSize = parseInt(fig.orgFontSize) * sType;
//fig.bpmnText.drawStringRect(fig.taskName, fig.padleft, fig.padtop, fig.rectWidth, fig.rectheight, 'center');
fig.bpmnText.paint();
}
else if(fig.type == 'bpmnAnnotation'){
fig.fontSize = parseInt(fig.orgFontSize) * sType;
fig.bpmnText.paint();
}
fig.setPosition(xPos,yPos);
fig.setDimension(width,height);
}
loadMask.hide();
}
MyWorkflow.prototype.redrawTaskText = function(fig)
{
MyWorkflow.prototype.redrawTaskText = function(fig){
//Setting font minimum limit
if(this.fontSize < 11)
this.fontSize = 11;
fig.paint();
this.fontSize = 11;
fig.paint();
}
MyWorkflow.prototype.redrawAnnotationText = function(fig,sType)
{
MyWorkflow.prototype.redrawAnnotationText = function(fig,sType){
if(sType == 'in')
fig.fontSize = parseInt(fig.fontSize) + 4;
fig.fontSize = parseInt(fig.fontSize) + 4;
else
fig.fontSize = parseInt(fig.fontSize) - 4;
fig.fontSize = parseInt(fig.fontSize) - 4;
//Setting font minimum limit i.e. 11px
if(fig.fontSize < 11)

8
workflow/engine/templates/bpmn/bpmnShapes.js
View File

@@ -752,12 +752,12 @@ bpmnTask.prototype.addShapes = function (oStore) {
//newShape.actiontype = 'addGateway';
//workflow.saveShape(newShape);
}
if (newShape.type.match(/Start/)) {
else if (newShape.type.match(/Start/)) {
conn.setTarget(newShape.getPort("output1"));
conn.setSource(workflow.currentSelection.getPort("input2"));
workflow.addFigure(conn);
}
if (newShape.type.match(/Event/)) {
else if (newShape.type.match(/Event/)) {
conn.setTarget(newShape.getPort("input2"));
conn.setSource(workflow.currentSelection.getPort("output1"));
workflow.addFigure(conn);
@@ -765,12 +765,12 @@ bpmnTask.prototype.addShapes = function (oStore) {
newShape.actiontype = 'addEvent';
workflow.saveShape(newShape);
}
if (newShape.type.match(/Task/)) {
else if (newShape.type.match(/Task/)) {
conn.setTarget(newShape.getPort("input2"));
conn.setSource(workflow.currentSelection.getPort("output1"));
workflow.addFigure(conn);
}
if (newShape.type.match(/Annotation/)) {
else if (newShape.type.match(/Annotation/)) {
conn.setTarget(newShape.getPort("input1"));
conn.setSource(workflow.currentSelection.getPort("output2"));
workflow.addFigure(conn);