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

PM-1330 "No se guardan el orden establecido de condiciones de enrutamiento en los gateways" SOLVED

Browse Source
This commit is contained in:
Freddy Daniel Rojas Valda
2015-01-31 09:44:48 -04:00
parent 8c6857ee69
commit d71bd522f7
7 changed files with 123 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
workflow/engine/src/ProcessMaker/Project/Bpmn.php Normal file → Executable file
View File

@@ -684,6 +684,7 @@ class Bpmn extends Handler
$flow->fromArray($data, BasePeer::TYPE_FIELDNAME);
$flow->setPrjUid($this->getUid());
$flow->setDiaUid($this->getDiagram("object")->getDiaUid());
$flow->setFloPosition($this->getNextPosition($data["FLO_UID"], $data["FLO_TYPE"], $data["FLO_ELEMENT_ORIGIN"]));
$flow->save();
self::log("Add Flow Success!");
@@ -746,6 +747,8 @@ class Bpmn extends Handler
self::log("Remove Flow: $floUid");
$flow = FlowPeer::retrieveByPK($floUid);
$this->reOrder($flow->getFloElementOrigin(), $flow->getFloPosition());
$flow->delete();
self::log("Remove Flow Success!");
@@ -1242,5 +1245,47 @@ class Bpmn extends Handler
throw $e;
}
}
public function getNextPosition ($sFloUid, $sFloType, $sFloElementOrigin)
{
try {
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn( '(COUNT(*) + 1) AS FLOW_POS' );
$oCriteria->add(\BpmnFlowPeer::PRJ_UID, $this->getUid());
$oCriteria->add(\BpmnFlowPeer::DIA_UID, $this->getDiagram("object")->getDiaUid());
$oCriteria->add(\BpmnFlowPeer::FLO_UID, $sFloUid, \Criteria::NOT_EQUAL);
$oCriteria->add(\BpmnFlowPeer::FLO_TYPE, $sFloType);
$oCriteria->add(\BpmnFlowPeer::FLO_ELEMENT_ORIGIN, $sFloElementOrigin);
$oDataset = \BpmnFlowPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
$aRow = $oDataset->getRow();
return (int)($aRow["FLOW_POS"]);
} catch (Exception $oException) {
throw $oException;
}
}
public function reOrder ($sFloOr, $iPosition)
{
try {
$oCriteria = new Criteria( 'workflow' );
$oCriteria->add( \BpmnFlowPeer::FLO_ELEMENT_ORIGIN, $sFloOr );
$oCriteria->add( \BpmnFlowPeer::FLO_POSITION, $iPosition, '>' );
$oDataset = \BpmnFlowPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
$oFlow = \BpmnFlowPeer::retrieveByPK( $aRow['FLO_UID'] );
$oFlow->setFloPosition( ($aRow['FLO_POSITION']) - 1 );
$oFlow->save();
$oDataset->next();
}
} catch (Exception $oException) {
throw $oException;
}
}
}