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

Worked on saving Gateway in old processmap

Browse Source
This commit is contained in:
girish
2011-01-07 13:21:16 +00:00
parent 0181f5e87c
commit d21f0c079f
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2422,7 +2422,7 @@ class processMap {
$oGateway->remove($sGatewayUID); $oGateway->remove($sGatewayUID);
} }
//Getting Gateway UID after saving gateway //Getting Gateway UID after saving gateway
if($sType != 'SEQUENTIAL' && $sGatewayUID == '') if($sType != 'SEQUENTIAL' && $sGatewayUID == '' && $sDelete == '1')
{ {
$oProcessMap = new processMap(); $oProcessMap = new processMap();
$sGatewayUID = $oProcessMap->saveNewGateway($sProcessUID, $sTaskUID); $sGatewayUID = $oProcessMap->saveNewGateway($sProcessUID, $sTaskUID);
@@ -2448,6 +2448,7 @@ class processMap {
$oTask = new Task(); $oTask = new Task();
$aTaskDetails = $oTask->load($sTaskUID); $aTaskDetails = $oTask->load($sTaskUID);
$aFields ['PRO_UID'] = $sProcessUID; $aFields ['PRO_UID'] = $sProcessUID;
$aFields ['TAS_UID'] = $sTaskUID;
$aFields ['GAT_X'] = $aTaskDetails['TAS_POSX'] + $aTaskDetails['TAS_WIDTH']/2; $aFields ['GAT_X'] = $aTaskDetails['TAS_POSX'] + $aTaskDetails['TAS_WIDTH']/2;
$aFields ['GAT_Y'] = $aTaskDetails['TAS_POSY'] + $aTaskDetails['TAS_HEIGHT'] + 10; $aFields ['GAT_Y'] = $aTaskDetails['TAS_POSY'] + $aTaskDetails['TAS_HEIGHT'] + 10;

3
workflow/engine/methods/bpmn/saveProcess.php
View File

@@ -59,7 +59,7 @@ try{
$aAnnotations = json_decode ( $_POST['annotations'] ); $aAnnotations = json_decode ( $_POST['annotations'] );
$aSubprocess = json_decode ( $_POST['subprocess'] ); $aSubprocess = json_decode ( $_POST['subprocess'] );
$fields = $oProcess->serializeProcess($idProcess); $fields = $oProcess->serializeProcess($idProcess);
//$oData = unserialize($fields); $oData = unserialize($fields);
$aRoutes = $oProcess->super_unique($aRoutes); $aRoutes = $oProcess->super_unique($aRoutes);
$sOutput = ''; $sOutput = '';
$subProcesses = array(); $subProcesses = array();
@@ -122,6 +122,7 @@ try{
$routesArray = $oProcess->createGateways($routeTransitions,$endArray,$oData->routes,$numberRoutes,$idProcess,$taskHidden); $routesArray = $oProcess->createGateways($routeTransitions,$endArray,$oData->routes,$numberRoutes,$idProcess,$taskHidden);
$oData->routes = $routesArray; $oData->routes = $routesArray;
} }
$oProcess->updateProcessFromDataXpdl($oData,$oData->tasks); $oProcess->updateProcessFromDataXpdl($oData,$oData->tasks);
} }
catch (Exception $oException) { catch (Exception $oException) {

1
workflow/engine/methods/processes/processes_Ajax.php
View File

@@ -275,6 +275,7 @@ try {
G::LoadClass('tasks'); G::LoadClass('tasks');
$oTasks = new Tasks(); $oTasks = new Tasks();
$oTasks->deleteAllRoutesOfTask($oData->pro_uid, $oData->tas_uid); $oTasks->deleteAllRoutesOfTask($oData->pro_uid, $oData->tas_uid);
$oTasks->deleteAllGatewayOfTask($oData->pro_uid, $oData->tas_uid);
} }
$oProcessMap->saveNewPattern($oData->pro_uid, $oData->tas_uid, $oData->next_task, $sType, $oData->delete); $oProcessMap->saveNewPattern($oData->pro_uid, $oData->tas_uid, $oData->next_task, $sType, $oData->delete);
break; break;