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

Modified saving of End , Start and Gateway

Browse Source
This commit is contained in:
girish
2011-02-18 12:38:10 +00:00
parent 30133456f5
commit 7f8ecc4da7
6 changed files with 134 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
workflow/engine/classes/class.xpdl.php
View File

@@ -3452,10 +3452,12 @@ class Xpdl extends processes
if($idVal['TAS_UID']==$idTask){ if($idVal['TAS_UID']==$idTask){
$coordinateX=$idVal['TAS_POSX']; $coordinateX=$idVal['TAS_POSX'];
$coordinateY=$idVal['TAS_POSY']; $coordinateY=$idVal['TAS_POSY'];
} $tas_width =$idVal['TAS_WIDTH'];
$tas_height =$idVal['TAS_HEIGHT'];
}
} }
$positionX=$coordinateX+62; $positionX = $coordinateX + $tas_width/1.5 + 19;
$positionY=$coordinateY+55; $positionY = $coordinateY + $tas_height/2;
if($idTask != $taskParallel){ if($idTask != $taskParallel){
$taskParallel = $idTask; $taskParallel = $idTask;
$routeParallel = $sGateUID; $routeParallel = $sGateUID;
@@ -3493,10 +3495,12 @@ class Xpdl extends processes
if($idVal['TAS_UID']==$nextTask){ if($idVal['TAS_UID']==$nextTask){
$coordinateX=$idVal['TAS_POSX']; $coordinateX=$idVal['TAS_POSX'];
$coordinateY=$idVal['TAS_POSY']; $coordinateY=$idVal['TAS_POSY'];
} $tas_width =$idVal['TAS_WIDTH'];
$tas_height =$idVal['TAS_HEIGHT'];
}
} }
$positionX=$coordinateX+60; $positionX = $coordinateX + $tas_width/1.5 + 19;
$positionY=$coordinateY-45; $positionY = $coordinateY + $tas_height/2;
if($nextTask != $taskSecJoin){ if($nextTask != $taskSecJoin){
$taskSecJoin = $nextTask; $taskSecJoin = $nextTask;
$routeSecJoin = $sGateUID; $routeSecJoin = $sGateUID;
@@ -3534,10 +3538,12 @@ class Xpdl extends processes
if($idVal['TAS_UID']==$idTask){ if($idVal['TAS_UID']==$idTask){
$coordinateX=$idVal['TAS_POSX']; $coordinateX=$idVal['TAS_POSX'];
$coordinateY=$idVal['TAS_POSY']; $coordinateY=$idVal['TAS_POSY'];
} $tas_width =$idVal['TAS_WIDTH'];
$tas_height =$idVal['TAS_HEIGHT'];
}
} }
$positionX=$coordinateX+62; $positionX = $coordinateX + $tas_width/1.5 + 19;
$positionY=$coordinateY+55; $positionY = $coordinateY + $tas_height/2;
if($idTask != $taskEvaluate){ if($idTask != $taskEvaluate){
$taskEvaluate = $idTask; $taskEvaluate = $idTask;
$routeEvaluate = $sGateUID; $routeEvaluate = $sGateUID;
@@ -3582,10 +3588,12 @@ class Xpdl extends processes
if($idVal['TAS_UID']==$idTask){ if($idVal['TAS_UID']==$idTask){
$coordinateX = $idVal['TAS_POSX']; $coordinateX = $idVal['TAS_POSX'];
$coordinateY = $idVal['TAS_POSY']; $coordinateY = $idVal['TAS_POSY'];
} $tas_width =$idVal['TAS_WIDTH'];
$tas_height =$idVal['TAS_HEIGHT'];
}
} }
$positionX=$coordinateX+62; $positionX = $coordinateX + $tas_width/1.5 + 19;
$positionY=$coordinateY+55; $positionY = $coordinateY + $tas_height/2;
if($idTask != $taskParallelEv){ if($idTask != $taskParallelEv){
$taskParallelEv = $idTask; $taskParallelEv = $idTask;
$routeParallelEv = $sGateUID; $routeParallelEv = $sGateUID;
@@ -3621,12 +3629,14 @@ class Xpdl extends processes
$coordinateY=0; $coordinateY=0;
foreach ($tasks as $taskVal => $idVal ){ foreach ($tasks as $taskVal => $idVal ){
if($idVal['TAS_UID']==$idTask){ if($idVal['TAS_UID']==$idTask){
$coordinateX=$idVal['TAS_POSX']; $coordinateX=$idVal['TAS_POSX'];
$coordinateY=$idVal['TAS_POSY']; $coordinateY=$idVal['TAS_POSY'];
$tas_width =$idVal['TAS_WIDTH'];
$tas_height =$idVal['TAS_HEIGHT'];
} }
} }
$positionX=$coordinateX+60; $positionX = $coordinateX + $tas_width/1.5 + 19;
$positionY=$coordinateY+40; $positionY = $coordinateY + $tas_height/2;
if($idTask != $taskSelect){ if($idTask != $taskSelect){
$taskSelect = $idTask; $taskSelect = $idTask;
$routeSelect = $sGateUID; $routeSelect = $sGateUID;
@@ -3668,12 +3678,14 @@ class Xpdl extends processes
$optional = $val['ROU_OPTIONAL']; $optional = $val['ROU_OPTIONAL'];
foreach ($tasks as $taskVal => $idVal ){ foreach ($tasks as $taskVal => $idVal ){
if($idVal['TAS_UID']==$nextTask){ if($idVal['TAS_UID']==$nextTask){
$coordinateX=$idVal['TAS_POSX']; $coordinateX=$idVal['TAS_POSX'];
$coordinateY=$idVal['TAS_POSY']; $coordinateY=$idVal['TAS_POSY'];
$tas_width =$idVal['TAS_WIDTH'];
$tas_height =$idVal['TAS_HEIGHT'];
} }
} }
$positionX=$coordinateX+60; $positionX = $coordinateX + $tas_width/1.5 + 19;
$positionY=$coordinateY-45; $positionY = $coordinateY + $tas_height/2;
if($nextTask != $taskDiscriminator){ if($nextTask != $taskDiscriminator){
$taskDiscriminator = $nextTask; $taskDiscriminator = $nextTask;
$routeDiscriminator = $sGateUID; $routeDiscriminator = $sGateUID;
@@ -3714,19 +3726,37 @@ class Xpdl extends processes
if($idVal['TAS_UID']==$idTask){ if($idVal['TAS_UID']==$idTask){
$coordinateX=$idVal['TAS_POSX']; $coordinateX=$idVal['TAS_POSX'];
$coordinateY=$idVal['TAS_POSY']; $coordinateY=$idVal['TAS_POSY'];
$tas_width =$idVal['TAS_WIDTH'];
$tas_height =$idVal['TAS_HEIGHT'];
$tas_uid =$idVal['TAS_UID']; $tas_uid =$idVal['TAS_UID'];
} }
}
$positionX = $coordinateX + $tas_width/1.5 + 19;
$positionY = $coordinateY + $tas_height/2;
$evn_uid = $val['ROU_EVN_UID'];
if($evn_uid != ''){
$oEvent = new Event();
$aEvent = $oEvent->load($evn_uid);
$events[$countEvents]['0'] = $evn_uid;
$events[$countEvents]['1'] = $aEvent['EVN_TYPE'];
$events[$countEvents]['2'] = $aEvent['EVN_POSX'];
$events[$countEvents]['3'] = $aEvent['EVN_POSY'];
$events[$countEvents]['4'] = $tas_uid;
$countEvents = $countEvents + 1;
$arrayRoutes[$countRoutes]['0']= G::generateUniqueID();
$arrayRoutes[$countRoutes]['1']= $idTask;
$arrayRoutes[$countRoutes]['2']= $evn_uid;
$arrayRoutes[$countRoutes]['3']= $toPort;
$arrayRoutes[$countRoutes]['4']= $fromPort;
$arrayRoutes[$countRoutes]['5']= $typeRoute;
$countRoutes = $countRoutes + 1;
$end = 0;
$endEvent = 0;
} }
$positionX = $coordinateX+65;
$positionY = $coordinateY+40;
//$arrayRoutes[$countRoutes]['0']= G::generateUniqueID();
$arrayRoutes[$countRoutes]['0']= $idRoute;
$arrayRoutes[$countRoutes]['1']= $idTask;
$arrayRoutes[$countRoutes]['2']= $nextTask;
$arrayRoutes[$countRoutes]['3']= $toPort;
$arrayRoutes[$countRoutes]['4']= $fromPort;
$countRoutes = $countRoutes + 1;
} }
//For $typeRoute Evaluate Function
else{ else{
$coordinateX=0; $coordinateX=0;
$coordinateY=0; $coordinateY=0;
@@ -3734,11 +3764,13 @@ class Xpdl extends processes
if($idVal['TAS_UID']==$idTask){ if($idVal['TAS_UID']==$idTask){
$coordinateX=$idVal['TAS_POSX']; $coordinateX=$idVal['TAS_POSX'];
$coordinateY=$idVal['TAS_POSY']; $coordinateY=$idVal['TAS_POSY'];
$tas_width =$idVal['TAS_WIDTH'];
$tas_height =$idVal['TAS_HEIGHT'];
$tas_uid =$idVal['TAS_UID']; $tas_uid =$idVal['TAS_UID'];
} }
} }
$positionX = $coordinateX + 120; $positionX = $coordinateX + $tas_width/1.5 + 19;
$positionY = $coordinateY + 40; $positionY = $coordinateY + $tas_height/2;
$idTask = $routeEnd; $idTask = $routeEnd;
$arrayRoutes[$countRoutes]['0']= G::generateUniqueID(); $arrayRoutes[$countRoutes]['0']= G::generateUniqueID();
$arrayRoutes[$countRoutes]['1']= $idTask; $arrayRoutes[$countRoutes]['1']= $idTask;
@@ -3747,15 +3779,16 @@ class Xpdl extends processes
$arrayRoutes[$countRoutes]['4']= $fromPort; $arrayRoutes[$countRoutes]['4']= $fromPort;
$arrayRoutes[$countRoutes]['5']= $typeRoute; $arrayRoutes[$countRoutes]['5']= $typeRoute;
$countRoutes = $countRoutes + 1; $countRoutes = $countRoutes + 1;
$events[$countEvents]['0'] = $idRoute;
$events[$countEvents]['1'] = 'bpmnEventEmptyEnd';
$events[$countEvents]['2'] = $positionX-25;
$events[$countEvents]['3'] = $positionY+35;
$events[$countEvents]['4'] = $tas_uid;
$countEvents = $countEvents + 1;
$end = 0;
$endEvent = 0;
} }
$events[$countEvents]['0'] = $idRoute;
$events[$countEvents]['1'] = 'bpmnEventEmptyEnd';
$events[$countEvents]['2'] = $positionX-25;
$events[$countEvents]['3'] = $positionY+35;
$events[$countEvents]['4'] = $tas_uid;
$countEvents = $countEvents + 1;
$end = 0;
$endEvent = 0;
} }
else{ else{
if ($typeRoute == "SEQUENTIAL"){ if ($typeRoute == "SEQUENTIAL"){
@@ -3769,17 +3802,19 @@ class Xpdl extends processes
if($idVal['TAS_UID']==$idTask){ if($idVal['TAS_UID']==$idTask){
$coordinateX=$idVal['TAS_POSX']; $coordinateX=$idVal['TAS_POSX'];
$coordinateY=$idVal['TAS_POSY']; $coordinateY=$idVal['TAS_POSY'];
$tas_width =$idVal['TAS_WIDTH'];
$tas_height =$idVal['TAS_HEIGHT'];
} }
} }
$positionX = $coordinateX + 65; $positionX = $coordinateX + $tas_width/1.5 + 19;
$positionY = $coordinateY + 40; $positionY = $coordinateY + $tas_height/2;
$oEvent = new Event(); $oEvent = new Event();
$aEvent = $oEvent->load($evn_uid); $aEvent = $oEvent->load($evn_uid);
$events[$countEvents]['0'] = $evn_uid; $events[$countEvents]['0'] = $evn_uid;
$events[$countEvents]['1'] = $aEvent['EVN_TYPE']; $events[$countEvents]['1'] = $aEvent['EVN_TYPE'];
$events[$countEvents]['2'] = $positionX-25; $events[$countEvents]['2'] = $aEvent['EVN_POSX'];
$events[$countEvents]['3'] = $positionY+35; $events[$countEvents]['3'] = $aEvent['EVN_POSY'];
$countEvents = $countEvents + 1; $countEvents = $countEvents + 1;
$arrayRoutes[$countRoutes]['0']= G::generateUniqueID(); $arrayRoutes[$countRoutes]['0']= G::generateUniqueID();

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

@@ -139,7 +139,7 @@
$fields['TRANSITION'][$countRoutes]['4']= '1'; $fields['TRANSITION'][$countRoutes]['4']= '1';
$countRoutes = $countRoutes + 1; $countRoutes = $countRoutes + 1;
} }
else if($value['TAS_UID'] == '' && $value['EVN_TAS_UID_FROM'] != ''){ //Check for Intermediate Events else if($value['TAS_UID'] == '' && $value['EVN_TAS_UID_FROM'] != '' && ! preg_match("/End/", $value['EVN_TYPE'])){ //Check for Intermediate Events
$evn_uid = $value['EVN_UID']; $evn_uid = $value['EVN_UID'];
$idTask = $value['EVN_TAS_UID_FROM']; $idTask = $value['EVN_TAS_UID_FROM'];
@@ -173,12 +173,28 @@
foreach($oData->gateways as $id => $value) foreach($oData->gateways as $id => $value)
{ {
if($value['GAT_NEXT_TASK'] == '' && $value['TAS_UID'] == ''){ if($value['GAT_NEXT_TASK'] != '' && $value['TAS_UID'] != ''){
$fields['GATEWAYS'][$countGateway]['0'] = $value['GAT_UID']; $fields['GATEWAYS'][$countGateway]['0'] = $value['GAT_UID'];
$fields['GATEWAYS'][$countGateway]['1'] = $value['GAT_TYPE']; $fields['GATEWAYS'][$countGateway]['1'] = $value['GAT_TYPE'];
$fields['GATEWAYS'][$countGateway]['2'] = $value['GAT_X']; $fields['GATEWAYS'][$countGateway]['2'] = $value['GAT_X'];
$fields['GATEWAYS'][$countGateway]['3'] = $value['GAT_Y']; $fields['GATEWAYS'][$countGateway]['3'] = $value['GAT_Y'];
$countGateway += 1; $fields['GATEWAYS'][$countGateway]['4'] = $value['TAS_UID'];
$fields['GATEWAYS'][$countGateway]['5'] = $value['TAS_UID'];
$countGateway+=1;
$fields['TRANSITION'][$countTransitions]['0'] = G::generateUniqueID();
$fields['TRANSITION'][$countTransitions]['1'] = $value['TAS_UID'];
$fields['TRANSITION'][$countTransitions]['2'] = $value['GAT_UID'];
$fields['TRANSITION'][$countTransitions]['3'] = '1';
$fields['TRANSITION'][$countTransitions]['4'] = '2';
$countTransitions += 1;
$fields['TRANSITION'][$countTransitions]['0'] = G::generateUniqueID();
$fields['TRANSITION'][$countTransitions]['1'] = $value['GAT_UID'];
$fields['TRANSITION'][$countTransitions]['2'] = $value['GAT_NEXT_TASK'];
$fields['TRANSITION'][$countTransitions]['3'] = '2';
$fields['TRANSITION'][$countTransitions]['4'] = '1';
$countTransitions += 1;
} }
//creating gateway and route from gateway to task i.e if target task is not NULL //creating gateway and route from gateway to task i.e if target task is not NULL
else if($value['GAT_NEXT_TASK'] != '' && $value['TAS_UID'] == ''){ else if($value['GAT_NEXT_TASK'] != '' && $value['TAS_UID'] == ''){
@@ -188,7 +204,7 @@
$fields['GATEWAYS'][$countGateway]['3'] = $value['GAT_Y']; $fields['GATEWAYS'][$countGateway]['3'] = $value['GAT_Y'];
$fields['GATEWAYS'][$countGateway]['4'] = $value['TAS_UID']; $fields['GATEWAYS'][$countGateway]['4'] = $value['TAS_UID'];
$fields['GATEWAYS'][$countGateway]['5'] = $value['GAT_NEXT_TASK']; $fields['GATEWAYS'][$countGateway]['5'] = $value['GAT_NEXT_TASK'];
$fields['TRANSITION'][$countTransitions]['0'] = G::generateUniqueID(); $fields['TRANSITION'][$countTransitions]['0'] = G::generateUniqueID();
$fields['TRANSITION'][$countTransitions]['1'] = $value['GAT_UID']; $fields['TRANSITION'][$countTransitions]['1'] = $value['GAT_UID'];
$fields['TRANSITION'][$countTransitions]['2'] = $value['GAT_NEXT_TASK']; $fields['TRANSITION'][$countTransitions]['2'] = $value['GAT_NEXT_TASK'];
@@ -214,37 +230,12 @@
$countGateway+=1; $countGateway+=1;
$countTransitions += 1; $countTransitions += 1;
} }
else if($value['GAT_NEXT_TASK'] != '' && $value['TAS_UID'] != ''){ else if($value['GAT_NEXT_TASK'] == '' && $value['TAS_UID'] == ''){
$fields['GATEWAYS'][$countGateway]['0'] = $value['GAT_UID']; $fields['GATEWAYS'][$countGateway]['0'] = $value['GAT_UID'];
$fields['GATEWAYS'][$countGateway]['1'] = $value['GAT_TYPE']; $fields['GATEWAYS'][$countGateway]['1'] = $value['GAT_TYPE'];
$fields['GATEWAYS'][$countGateway]['2'] = $value['GAT_X']; $fields['GATEWAYS'][$countGateway]['2'] = $value['GAT_X'];
$fields['GATEWAYS'][$countGateway]['3'] = $value['GAT_Y']; $fields['GATEWAYS'][$countGateway]['3'] = $value['GAT_Y'];
$fields['GATEWAYS'][$countGateway]['4'] = $value['TAS_UID']; $countGateway += 1;
$fields['GATEWAYS'][$countGateway]['5'] = $value['TAS_UID'];
$countGateway+=1;
$fields['GATEWAYS'][$countGateway]['0'] = $value['GAT_UID'];
$fields['GATEWAYS'][$countGateway]['1'] = $value['GAT_TYPE'];
$fields['GATEWAYS'][$countGateway]['2'] = $value['GAT_X'];
$fields['GATEWAYS'][$countGateway]['3'] = $value['GAT_Y'];
$fields['GATEWAYS'][$countGateway]['4'] = $value['TAS_UID'];
$fields['GATEWAYS'][$countGateway]['5'] = $value['GAT_NEXT_TASK'];
$countGateway+=1;
$fields['TRANSITION'][$countTransitions]['0'] = G::generateUniqueID();
$fields['TRANSITION'][$countTransitions]['1'] = $value['TAS_UID'];
$fields['TRANSITION'][$countTransitions]['2'] = $value['GAT_UID'];
$fields['TRANSITION'][$countTransitions]['3'] = '1';
$fields['TRANSITION'][$countTransitions]['4'] = '2';
$countTransitions += 1;
$fields['TRANSITION'][$countTransitions]['0'] = G::generateUniqueID();
$fields['TRANSITION'][$countTransitions]['1'] = $value['GAT_UID'];
$fields['TRANSITION'][$countTransitions]['2'] = $value['GAT_NEXT_TASK'];
$fields['TRANSITION'][$countTransitions]['3'] = '2';
$fields['TRANSITION'][$countTransitions]['4'] = '1';
$countTransitions += 1;
} }
} }
//$subProcess = $oProcess->createSubProcessesPM($oData->subProcess); //$subProcess = $oProcess->createSubProcessesPM($oData->subProcess);

46
workflow/engine/methods/bpmn/patterns_Ajax.php
View File

@@ -38,6 +38,7 @@ if($aData['ROU_TYPE'] != 'SEQUENTIAL')
$oProcessMap = new processMap(); $oProcessMap = new processMap();
//$sGatewayUID = $oProcessMap->saveNewGateway($aData['PROCESS'], $aData['TASK'][0], $aData['ROU_NEXT_TASK'][0]); //$sGatewayUID = $oProcessMap->saveNewGateway($aData['PROCESS'], $aData['TASK'][0], $aData['ROU_NEXT_TASK'][0]);
$oGateway = new Gateway ( ); $oGateway = new Gateway ( );
$aGatewayFields = array(); $aGatewayFields = array();
$aGatewayFields['GAT_UID'] = $aData['GAT_UID']; $aGatewayFields['GAT_UID'] = $aData['GAT_UID'];
$aGatewayFields['TAS_UID'] = $aData['TASK'][0]; $aGatewayFields['TAS_UID'] = $aData['TASK'][0];
@@ -56,42 +57,38 @@ $rou_id = 0;
$aFields['GAT_UID'] = $aData['GAT_UID']; $aFields['GAT_UID'] = $aData['GAT_UID'];
switch ($aData['action']) { switch ($aData['action']) {
case 'savePattern': case 'savePattern':
//if ($aData['ROU_TYPE'] != $aData['ROU_TYPE_OLD'])
//{
foreach ($aData['TASK'] as $iKey => $aRow) foreach ($aData['TASK'] as $iKey => $aRow)
{ {
$oTasks->deleteAllRoutesOfTask($aData['PROCESS'], $aRow); $oTasks->deleteAllRoutesOfTask($aData['PROCESS'], $aRow);
} }
//}
require_once 'classes/model/Route.php'; require_once 'classes/model/Route.php';
require_once 'classes/model/Event.php';
$oEvent = new Event ( );
$oRoute = new Route(); $oRoute = new Route();
switch ($aData['ROU_TYPE']) { switch ($aData['ROU_TYPE']) {
case 'SEQUENTIAL': case 'SEQUENTIAL':
case 'SEC-JOIN': case 'SEC-JOIN':
/*if ($aData['ROU_UID'] != '')
{
$aFields['ROU_UID'] = $aData['ROU_UID'];
}*/
$aFields['PRO_UID'] = $aData['PROCESS']; $aFields['PRO_UID'] = $aData['PROCESS'];
$aFields['TAS_UID'] = $aData['TASK'][0]; $aFields['TAS_UID'] = $aData['TASK'][0];
$aFields['ROU_NEXT_TASK'] = $aData['ROU_NEXT_TASK'][0]; $aFields['ROU_NEXT_TASK'] = $aData['ROU_NEXT_TASK'][0];
$aFields['ROU_TYPE'] = $aData['ROU_TYPE']; $aFields['ROU_TYPE'] = $aData['ROU_TYPE'];
if(isset($aData['ROU_EVN_UID'])) if(isset($aData['ROU_EVN_UID'])){
$aFields['ROU_EVN_UID'] = $aData['ROU_EVN_UID']; $aFields['ROU_EVN_UID'] = $aData['ROU_EVN_UID'];
$aDataEvent = array();
$aDataEvent['EVN_UID'] = $aData['ROU_EVN_UID'];
$aDataEvent['EVN_TAS_UID_FROM'] = $aData['TASK'][0];
$aDataEvent['EVN_RELATED_TO'] = 'MULTIPLE';
$oEvent->update($aDataEvent);
}
if(isset($aData['PORT_NUMBER_IP'])) if(isset($aData['PORT_NUMBER_IP']))
$aFields['ROU_TO_PORT'] = $aData['PORT_NUMBER_IP']; $aFields['ROU_TO_PORT'] = $aData['PORT_NUMBER_IP'];
if(isset($aData['PORT_NUMBER_OP'])) if(isset($aData['PORT_NUMBER_OP']))
$aFields['ROU_FROM_PORT'] = $aData['PORT_NUMBER_OP']; $aFields['ROU_FROM_PORT'] = $aData['PORT_NUMBER_OP'];
//$aFields['ROU_TO_LAST_USER'] = $aData['ROU_TO_LAST_USER'];
$rou_id = $oRoute->create($aFields); $rou_id = $oRoute->create($aFields);
break; break;
case 'SELECT': case 'SELECT':
foreach ($aData['GRID_SELECT_TYPE'] as $iKey => $aRow) foreach ($aData['GRID_SELECT_TYPE'] as $iKey => $aRow)
{ {
/*if ($aRow['ROU_UID'] != '')
{
$aFields['ROU_UID'] = $aRow['ROU_UID'];
}*/
$aFields['PRO_UID'] = $aData['PROCESS']; $aFields['PRO_UID'] = $aData['PROCESS'];
$aFields['TAS_UID'] = $aData['TASK']; $aFields['TAS_UID'] = $aData['TASK'];
$aFields['ROU_NEXT_TASK'] = $aRow; $aFields['ROU_NEXT_TASK'] = $aRow;
@@ -101,8 +98,6 @@ switch ($aData['action']) {
$aFields['ROU_TO_PORT'] = $aData['PORT_NUMBER_IP']; $aFields['ROU_TO_PORT'] = $aData['PORT_NUMBER_IP'];
if(isset($aData['PORT_NUMBER_OP'])) if(isset($aData['PORT_NUMBER_OP']))
$aFields['ROU_FROM_PORT'] = $aData['PORT_NUMBER_OP']; $aFields['ROU_FROM_PORT'] = $aData['PORT_NUMBER_OP'];
// $aFields['ROU_CONDITION'] = $aRow['ROU_CONDITION'];
//$aFields['ROU_TO_LAST_USER'] = $aRow['ROU_TO_LAST_USER'];
$rou_id = $oRoute->create($aFields); $rou_id = $oRoute->create($aFields);
unset($aFields); unset($aFields);
} }
@@ -130,10 +125,6 @@ switch ($aData['action']) {
case 'PARALLEL': case 'PARALLEL':
foreach ($aData['ROU_NEXT_TASK'] as $iKey => $aRow) foreach ($aData['ROU_NEXT_TASK'] as $iKey => $aRow)
{ {
/*if ($aRow['ROU_UID'] != '')
{
$aFields['ROU_UID'] = $aRow['ROU_UID'];
}*/
$aFields['PRO_UID'] = $aData['PROCESS']; $aFields['PRO_UID'] = $aData['PROCESS'];
$aFields['TAS_UID'] = $aData['TASK'][0]; $aFields['TAS_UID'] = $aData['TASK'][0];
$aFields['ROU_NEXT_TASK'] = $aRow; $aFields['ROU_NEXT_TASK'] = $aRow;
@@ -153,11 +144,6 @@ switch ($aData['action']) {
case 'PARALLEL-BY-EVALUATION': case 'PARALLEL-BY-EVALUATION':
foreach ($aData['ROU_NEXT_TASK'] as $iKey => $aRow) foreach ($aData['ROU_NEXT_TASK'] as $iKey => $aRow)
{ {
/*if ($aRow['ROU_UID'] != '')
{
$aFields['ROU_UID'] = $aRow['ROU_UID'];
}*/
$aFields['PRO_UID'] = $aData['PROCESS']; $aFields['PRO_UID'] = $aData['PROCESS'];
$aFields['TAS_UID'] = $aData['TASK'][0]; $aFields['TAS_UID'] = $aData['TASK'][0];
$aFields['ROU_NEXT_TASK'] = $aRow; $aFields['ROU_NEXT_TASK'] = $aRow;
@@ -169,8 +155,6 @@ switch ($aData['action']) {
$aFields['ROU_TO_PORT'] = $aData['PORT_NUMBER_IP']; $aFields['ROU_TO_PORT'] = $aData['PORT_NUMBER_IP'];
if(isset($aData['PORT_NUMBER_OP'])) if(isset($aData['PORT_NUMBER_OP']))
$aFields['ROU_FROM_PORT']= $aData['PORT_NUMBER_OP']; $aFields['ROU_FROM_PORT']= $aData['PORT_NUMBER_OP'];
// $aFields['ROU_CONDITION'] = $aRow['ROU_CONDITION'];
// $aFields['ROU_OPTIONAL'] = $aRow['ROU_OPTIONAL'];
$rou_id = $oRoute->create($aFields); $rou_id = $oRoute->create($aFields);
unset($aFields); unset($aFields);
} }
@@ -189,14 +173,10 @@ switch ($aData['action']) {
$aFields['ROU_TO_PORT'] = $aData['PORT_NUMBER_IP']; $aFields['ROU_TO_PORT'] = $aData['PORT_NUMBER_IP'];
if(isset($aData['PORT_NUMBER_OP'])) if(isset($aData['PORT_NUMBER_OP']))
$aFields['ROU_FROM_PORT'] = $aData['PORT_NUMBER_OP']; $aFields['ROU_FROM_PORT'] = $aData['PORT_NUMBER_OP'];
// $aFields['ROU_CONDITION'] = $aRow['ROU_CONDITION'];
// $aFields['ROU_OPTIONAL'] = $aRow['ROU_OPTIONAL'];
$routeData = $oTasks->getRouteByType($aData['PROCESS'], $aData['ROU_NEXT_TASK'][0], $aData['ROU_TYPE']); $routeData = $oTasks->getRouteByType($aData['PROCESS'], $aData['ROU_NEXT_TASK'][0], $aData['ROU_TYPE']);
foreach($routeData as $route) foreach($routeData as $route)
{ {
$sFields['ROU_UID'] = $route['ROU_UID']; $sFields['ROU_UID'] = $route['ROU_UID'];
// $sFields['ROU_CONDITION'] = $aRow['ROU_CONDITION'];
// $sFields['ROU_OPTIONAL'] = $aRow['ROU_OPTIONAL'];
$rou_id = $oRoute->update($sFields); $rou_id = $oRoute->update($sFields);
} }
$rou_id =$oRoute->create($aFields); $rou_id =$oRoute->create($aFields);

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

@@ -1154,6 +1154,9 @@ MyWorkflow.prototype.saveShape= function(oNewShape)
else if(oNewShape.type.match(/Start/) && oNewShape.type.match(/Event/)){ else if(oNewShape.type.match(/Start/) && oNewShape.type.match(/Event/)){
workflow.saveEvents(oNewShape); workflow.saveEvents(oNewShape);
} }
else if(oNewShape.type.match(/End/) && oNewShape.type.match(/Event/)){
workflow.saveRoute(workflow.currentSelection,oNewShape);
}
else if(oNewShape.type.match(/Gateway/)){ else if(oNewShape.type.match(/Gateway/)){
workflow.saveGateways(oNewShape); workflow.saveGateways(oNewShape);
} }
@@ -1583,8 +1586,6 @@ MyWorkflow.prototype.saveEvents = function(oEvent,sTaskUID)
*/ */
MyWorkflow.prototype.saveRoute = function(preObj,newObj) MyWorkflow.prototype.saveRoute = function(preObj,newObj)
{ {
var pro_uid = this.getUrlVars();
var task_uid = new Array(); var task_uid = new Array();
var next_task_uid = new Array(); var next_task_uid = new Array();
var rou_type =''; var rou_type ='';
@@ -1603,13 +1604,12 @@ MyWorkflow.prototype.saveRoute = function(preObj,newObj)
port_numberIP = sPortTypeIP.charAt(sPortType_lenIP-1); port_numberIP = sPortTypeIP.charAt(sPortType_lenIP-1);
port_numberOP = sPortTypeOP.charAt(sPortType_lenOP-1); port_numberOP = sPortTypeOP.charAt(sPortType_lenOP-1);
} }
if(preObj.type.match(/Task/) && newObj.type.match(/Event/) && newObj.type.match(/Inter/)) if(preObj.type.match(/Task/) && newObj.type.match(/Event/) && newObj.type.match(/Inter/))
{ {
task_uid[0] = preObj.id; task_uid[0] = preObj.id;
next_task_uid[0] = newObj.task_to; next_task_uid[0] = newObj.task_to;
rou_type = 'SEQUENTIAL'; rou_type = 'SEQUENTIAL';
rou_evn_uid = newObj.evn_uid; rou_evn_uid = newObj.id;
} }
//If both the Object are Task //If both the Object are Task
else if(preObj.type.match(/Task/) && newObj.type.match(/Task/)) else if(preObj.type.match(/Task/) && newObj.type.match(/Task/))
@@ -1622,23 +1622,17 @@ MyWorkflow.prototype.saveRoute = function(preObj,newObj)
{ {
//this.deleteRoute(newObj.conn,1); //this.deleteRoute(newObj.conn,1);
if(newObj.reverse == 1) //Reverse Routing if(newObj.reverse == 1) //Reverse Routing
task_uid[0] = newObj.id; task_uid[0] = newObj.id;
else else
task_uid[0] = preObj.id; task_uid[0] = preObj.id;
next_task_uid[0] = '-1'; next_task_uid[0] = '-1';
rou_type = 'SEQUENTIAL'; rou_type = 'SEQUENTIAL';
rou_evn_uid = newObj.id;
} }
/*else if(preObj.type.match(/Event/) && preObj.type.match(/End/) && newObj.type.match(/Task/))
{
this.deleteRoute(newObj.conn,1);
task_uid[0] = newObj.id;
next_task_uid[0] = '-1';
rou_type = 'SEQUENTIAL';
}*/
else if(preObj.type.match(/Gateway/)) else if(preObj.type.match(/Gateway/))
{ {
// var task_uid = new Array();
// var next_task_uid = new Array();
switch(preObj.type){ switch(preObj.type){
case 'bpmnGatewayParallel': case 'bpmnGatewayParallel':
rou_type ='PARALLEL'; rou_type ='PARALLEL';
@@ -1706,13 +1700,6 @@ MyWorkflow.prototype.saveRoute = function(preObj,newObj)
var resp = response.responseText; //resp[0] => gateway UID OR event_UID , resp[1] => route UID var resp = response.responseText; //resp[0] => gateway UID OR event_UID , resp[1] => route UID
newObj.conn.html.id = resp; newObj.conn.html.id = resp;
newObj.conn.id = resp; newObj.conn.id = resp;
//replacing old gateway UID with response UID
/*if(! preObj.type.match(/Task/))
{
preObj.html.id = resp[0];
preObj.id = resp[0];
}*/
} }
} }
}, },
@@ -1722,12 +1709,12 @@ MyWorkflow.prototype.saveRoute = function(preObj,newObj)
params: { params: {
action :'savePattern', action :'savePattern',
PROCESS : pro_uid, PROCESS : pro_uid,
TASK :staskUid, TASK : staskUid,
ROU_NEXT_TASK :sNextTaskUid, ROU_NEXT_TASK : sNextTaskUid,
ROU_TYPE :rou_type, ROU_TYPE : rou_type,
ROU_EVN_UID :rou_evn_uid, ROU_EVN_UID : rou_evn_uid,
PORT_NUMBER_IP:port_numberIP, PORT_NUMBER_IP: port_numberIP,
PORT_NUMBER_OP:port_numberOP, PORT_NUMBER_OP: port_numberOP,
GAT_UID : sGatUid, GAT_UID : sGatUid,
GAT_TYPE : sGatType, GAT_TYPE : sGatType,
mode:'Ext' mode:'Ext'

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

@@ -383,7 +383,6 @@ OutputPort.prototype.onDrop = function (port) {
var preObj = new Array(); var preObj = new Array();
var bpmnType = this.workflow.currentSelection.type; var bpmnType = this.workflow.currentSelection.type;
if(bpmnType.match(/Event/) && port.parentNode.type.match(/Task/)){ if(bpmnType.match(/Event/) && port.parentNode.type.match(/Task/)){
var tas_uid = port.parentNode.id; var tas_uid = port.parentNode.id;
this.workflow.saveEvents(this.workflow.currentSelection,tas_uid); this.workflow.saveEvents(this.workflow.currentSelection,tas_uid);
@@ -393,17 +392,7 @@ OutputPort.prototype.onDrop = function (port) {
newObj.conn = _4070.connection; newObj.conn = _4070.connection;
this.workflow.saveRoute(preObj,newObj); this.workflow.saveRoute(preObj,newObj);
}else if(port.parentNode.type.match(/Task/) && bpmnType.match(/Inter/) && bpmnType.match(/Event/)){ }else if(port.parentNode.type.match(/Task/) && bpmnType.match(/Inter/) && bpmnType.match(/Event/)){
//var taskFrom = workflow.getStartEventConn(this,'sourcePort','InputPort');
//var taskTo = workflow.getStartEventConn(this,'targetPort','OutputPort');
//if(typeof taskFrom[0] != 'undefined' || typeof taskTo[0] != 'undefined'){
//preObj.type = 'Task';
//preObj.taskFrom = taskFrom[0].value;
//preObj.taskTo = taskTo[0].value;
//save Event First
// tas_uid = port.parentNode.id;
this.workflow.saveEvents(workflow.currentSelection); this.workflow.saveEvents(workflow.currentSelection);
// }
}else if(port.parentNode.type.match(/Event/) && port.parentNode.type.match(/Inter/) && bpmnType.match(/Task/)){ }else if(port.parentNode.type.match(/Event/) && port.parentNode.type.match(/Inter/) && bpmnType.match(/Task/)){
this.workflow.saveEvents(port.parentNode); this.workflow.saveEvents(port.parentNode);
} }
@@ -809,11 +798,11 @@ bpmnTask.prototype.addShapes = function (oStore) {
newShape.conn = conn; newShape.conn = conn;
workflow.saveShape(newShape); //Saving Task automatically (Async Ajax Call) workflow.saveShape(newShape); //Saving Task automatically (Async Ajax Call)
} }
if (oStore.newShapeName.match(/Event/) && oStore.newShapeName.match(/End/)) { /*if (oStore.newShapeName.match(/Event/) && oStore.newShapeName.match(/End/)) {
newShape.conn = conn; newShape.conn = conn;
workflow.saveRoute(workflow.currentSelection,newShape); workflow.saveRoute(workflow.currentSelection,newShape);
} }*/
else if (oStore.newShapeName == 'bpmnTask') { if (oStore.newShapeName == 'bpmnTask') {
newShape.actiontype = 'addTask'; newShape.actiontype = 'addTask';
newShape.conn = conn; newShape.conn = conn;
workflow.saveShape(newShape); //Saving Task automatically (Async Ajax Call) workflow.saveShape(newShape); //Saving Task automatically (Async Ajax Call)

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

@@ -907,12 +907,7 @@ Ext.onReady ( function() {
} }
for(var conn =0; conn < this.workflow.figures.data.length ; conn++){ for(var conn =0; conn < this.workflow.figures.data.length ; conn++){
if(typeof this.workflow.figures.data[conn] === 'object'){ if(typeof this.workflow.figures.data[conn] === 'object'){
//If End Process or Evaluate if(targetid == this.workflow.figures.data[conn].id ){
if(targetid == '-1' || typeof shapes.routes[i][5] != 'undefined' && shapes.routes[i][5] == 'EVALUATE'){
targetObj = eval("new bpmnEventEmptyEnd (this.workflow)");
this.workflow.addFigure(targetObj,sourceObj.x+67,sourceObj.y+60);
break;
}else if(targetid == this.workflow.figures.data[conn].id ){
targetObj = this.workflow.figures.data[conn]; targetObj = this.workflow.figures.data[conn];
} }
} }
@@ -1041,7 +1036,7 @@ Ext.onReady ( function() {
for(var k=0;k<shapes.events.length;k++){ for(var k=0;k<shapes.events.length;k++){
var srceventtype = shapes.events[k][1]; var srceventtype = shapes.events[k][1];
var tas_uid = shapes.events[k][4]; var tas_uid = shapes.events[k][4];
if(! srceventtype.match(/End/) && tas_uid != '') if(tas_uid != '')
{ {
NewShape = eval("new "+srceventtype+"(workflow)"); NewShape = eval("new "+srceventtype+"(workflow)");
NewShape.x = shapes.events[k][2]; NewShape.x = shapes.events[k][2];