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

fixed issue with gateway duplication

Browse Source
This commit is contained in:
safan
2011-02-24 07:40:37 +00:00
parent 07f2f1dfb8
commit cade0eb61a
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2590,7 +2590,7 @@ class processMap {
if($sType != 'SEQUENTIAL') if($sType != 'SEQUENTIAL')
{ {
$oProcessMap = new processMap(); $oProcessMap = new processMap();
$sGatewayUID = $oProcessMap->saveNewGateway($sProcessUID, $sTaskUID, $sNextTask,$sType); $sGatewayUID = $oProcessMap->saveNewGateway($sProcessUID, $sTaskUID, $sNextTask);
} }
$aFields ['GAT_UID'] = (isset($sGatewayUID))?$sGatewayUID:''; $aFields ['GAT_UID'] = (isset($sGatewayUID))?$sGatewayUID:'';
@@ -2643,6 +2643,7 @@ class processMap {
} }
$oGateway = new Gateway ( ); $oGateway = new Gateway ( );
$sGatewayUID = $oGateway->create($aFields); $sGatewayUID = $oGateway->create($aFields);
return $sGatewayUID; return $sGatewayUID;
@@ -5485,7 +5486,6 @@ class processMap {
$oCriteria = new Criteria ( 'workflow' ); $oCriteria = new Criteria ( 'workflow' );
$del = DBAdapter::getStringDelimiter (); $del = DBAdapter::getStringDelimiter ();
$oCriteria->add ( SubProcessPeer::PRO_PARENT, $sProcessUID ); $oCriteria->add ( SubProcessPeer::PRO_PARENT, $sProcessUID );
$oCriteria->add ( SubProcessPeer::PRO_PARENT, $sProcessUID );
$oCriteria->add ( SubProcessPeer::TAS_PARENT, $sTaskUID ); $oCriteria->add ( SubProcessPeer::TAS_PARENT, $sTaskUID );
$oCriteria->addAsColumn ( 'CON_VALUE', 'C1.CON_VALUE', 'CON_TITLE' ); $oCriteria->addAsColumn ( 'CON_VALUE', 'C1.CON_VALUE', 'CON_TITLE' );
@@ -5521,11 +5521,11 @@ class processMap {
$SP_VARIABLES_OUT = unserialize ( $aRow ['SP_VARIABLES_OUT'] ); $SP_VARIABLES_OUT = unserialize ( $aRow ['SP_VARIABLES_OUT'] );
if (is_array ( $SP_VARIABLES_OUT )) { if (is_array ( $SP_VARIABLES_OUT )) {
$i = 0; $i = 0;
$aRow1 = array(); //$aRow1 = array();
foreach ( $SP_VARIABLES_OUT as $indice => $valor ) { foreach ( $SP_VARIABLES_OUT as $indice => $valor ) {
$aRow1 [$i] = $aRow; //$aRow1 [$i] = $aRow;
$aRow1 [$i]['VAR_OUT1'] = $indice; $aRow [$i]['VAR_OUT1'] = $indice;
$aRow1 [$i]['VAR_OUT2'] = $valor; $aRow [$i]['VAR_OUT2'] = $valor;
//$aRow1 [$i]['PROCESSES'] = $_DBArray ['TheProcesses']; //$aRow1 [$i]['PROCESSES'] = $_DBArray ['TheProcesses'];
$i ++; $i ++;
} }
@@ -5548,7 +5548,7 @@ class processMap {
} }
$aRow ['INDEX'] = $sIndex; $aRow ['INDEX'] = $sIndex;
//print '<hr>';print_r($aRow); //print '<hr>';print_r($aRow);
return $aRow1; return $aRow;
//return $aSubProcess; //return $aSubProcess;
} catch ( Exception $oError ) { } catch ( Exception $oError ) {

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

@@ -37,13 +37,14 @@ 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]);
require_once 'classes/model/Gateway.php';
$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];
$aGatewayFields['GAT_NEXT_TASK'] = $aData['ROU_NEXT_TASK'][0]; $aGatewayFields['GAT_NEXT_TASK'] = $aData['ROU_NEXT_TASK'][0];
$aGatewayFields['GAT_TYPE'] = $aData['GAT_TYPE']; $aGatewayFields['GAT_TYPE'] = '';
$oGateway->update($aGatewayFields); $oGateway->update($aGatewayFields);
//$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]);
//echo $sGatewayUID.'|'; //echo $sGatewayUID.'|';