fernando/luos
1
0
Fork 0
Code Releases Activity

updates to enable save flow connections between activity->activity and activity->gateway

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2014-02-07 15:42:24 -04:00
parent 4d71995da7
commit 82da942ea1
6 changed files with 147 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
workflow/engine/classes/model/BpmnFlow.php
View File

@@ -57,6 +57,19 @@ class BpmnFlow extends BaseBpmnFlow
return $flows;
}
public static function exists($floUid)
{
$c = new Criteria('workflow');
$c->add(BpmnFlowPeer::FLO_UID, $floUid);
return BpmnFlowPeer::doCount($c) > 0 ? true : false;
}
public function fromArray($data, $type = BasePeer::TYPE_FIELDNAME)
{
parent::fromArray($data, $type);
}
public function toArray($type = BasePeer::TYPE_FIELDNAME)
{
return parent::toArray($type);

2
workflow/engine/classes/model/BpmnGateway.php
View File

@@ -122,7 +122,7 @@ class BpmnGateway extends BaseBpmnGateway
{
// first, delete the related bound object
if (! is_object($this->bound) || $this->bound->getBouUid() == "") {
$this->bound = BpmnBound::findByElement('Gateway', $this->getActUid());
$this->bound = BpmnBound::findByElement('Gateway', $this->getGatUid());
}
if (is_object($this->bound)) {

12
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -147,7 +147,10 @@ class BpmnWorkflow extends Project\Bpmn
parent::addFlow($data);
$routeData = self::mapBpmnFlowsToWorkflowRoute($data, $flows, $gateways, $events);
if ($routeData !== null) {
$this->wp->addRoute($routeData["from"], $routeData["to"], $routeData["type"]);
}
return;
@@ -258,6 +261,12 @@ class BpmnWorkflow extends Project\Bpmn
{
$fromUid = $flow['FLO_ELEMENT_ORIGIN'];
if ($flow['FLO_ELEMENT_ORIGIN_TYPE'] != "bpmnActivity") {
// skip flows that comes from a element that is not an Activity
self::log("Skip map FlowsToWorkflowRoute for -> flow with FLO_UID: {$flow['FLO_UID']}, that have FLO_ELEMENT_ORIGIN: {$flow['FLO_ELEMENT_ORIGIN_TYPE']}:$fromUid");
return null;
}
if ($flow['FLO_TYPE'] != 'SEQUENCE') {
throw new \LogicException(sprintf(
"Unsupported flow type: %s, ProcessMaker only support type '', Given: '%s'",
@@ -275,8 +284,6 @@ class BpmnWorkflow extends Project\Bpmn
// if it is a gateway it can fork one or more routes
//$gatFlows = BpmnModel::getBpmnCollectionBy('Flow', \BpmnFlowPeer::FLO_ELEMENT_ORIGIN, $gatUid);
$gatFlow = self::findInArray($gatUid, "FLO_ELEMENT_ORIGIN", $flows);
self::log($gatUid, "FLO_ELEMENT_ORIGIN", $flows);
self::log("==============111===================>", $gatFlow);
//foreach ($gatFlows as $gatFlow) {
switch ($gatFlow['FLO_ELEMENT_DEST_TYPE']) {
@@ -284,7 +291,6 @@ class BpmnWorkflow extends Project\Bpmn
// getting gateway properties
//$gateway = BpmnModel::getBpmnObjectBy('Gateway', \BpmnGatewayPeer::GAT_UID, $gatUid);
$gateway = self::findInArray($gatUid, "GAT_UID", $gateways);
self::log("==============222===================>", $gateway);
switch ($gateway['GAT_TYPE']) {
case 'SELECTION':

95
workflow/engine/src/ProcessMaker/Project/Bpmn.php
View File

@@ -344,6 +344,23 @@ class Bpmn extends Handler
return $gateway->getGatUid();
}
public function updateGateway($gatUid, $data)
{
try {
self::log("Update Gateway: $gatUid", "With data: ", $data);
$gateway = GatewayPeer::retrieveByPk($gatUid);
$gateway->fromArray($data);
$gateway->save();
self::log("Update Gateway Success!");
} catch (\Exception $e) {
self::log("Exception: ", $e->getMessage(), "Trace: ", $e->getTraceAsString());
throw $e;
}
}
public function getGateway($gatUid, $retType = 'array')
{
$gateway = GatewayPeer::retrieveByPK($gatUid);
@@ -355,20 +372,41 @@ class Bpmn extends Handler
return $gateway;
}
public function getGateways($retType = 'array')
public function getGateways($start = null, $limit = null, $filter = '', $changeCaseTo = CASE_UPPER)
{
return Gateway::getAll($this->getUid(), null, null, '', $retType);
if (is_array($start)) {
extract($start);
}
return Gateway::getAll($this->getUid(), null, null, '', $changeCaseTo);
}
public function removeGateway($gatUid)
{
try {
self::log("Remove Gateway: $gatUid");
$gateway = GatewayPeer::retrieveByPK($gatUid);
$gateway->delete();
self::log("Remove Gateway Success!");
} catch (\Exception $e) {
self::log("Exception: ", $e->getMessage(), "Trace: ", $e->getTraceAsString());
throw $e;
}
}
public function addFlow($data)
{
// setting defaults
$data['FLO_UID'] = array_key_exists('FLO_UID', $data) ? $data['FLO_UID'] : Hash::generateUID();
$data['FLO_STATE'] = is_array($data['FLO_STATE']) ? json_encode($data['FLO_STATE']) : $data['FLO_STATE'];
try {
self::log("Add Flow with data: ", $data);
// setting defaults
$data['FLO_UID'] = array_key_exists('FLO_UID', $data) ? $data['FLO_UID'] : Hash::generateUID();
if (array_key_exists('FLO_STATE', $data)) {
$data['FLO_STATE'] = is_array($data['FLO_STATE']) ? json_encode($data['FLO_STATE']) : $data['FLO_STATE'];
}
try {
$flow = new Flow();
$flow->fromArray($data, BasePeer::TYPE_FIELDNAME);
$flow->setPrjUid($this->getUid());
@@ -382,6 +420,26 @@ class Bpmn extends Handler
}
}
public function updateFlow($floUid, $data)
{
self::log("Update Flow: $floUid", "With data: ", $data);
// setting defaults
if (array_key_exists('FLO_STATE', $data)) {
$data['FLO_STATE'] = is_array($data['FLO_STATE']) ? json_encode($data['FLO_STATE']) : $data['FLO_STATE'];
}
try {
$flow = FlowPeer::retrieveByPk($floUid);
$flow->fromArray($data);
$flow->save();
self::log("Update Flow Success!");
} catch (\Exception $e) {
self::log("Exception: ", $e->getMessage(), "Trace: ", $e->getTraceAsString());
throw $e;
}
}
public function getFlow($floUid, $retType = 'array')
{
$flow = FlowPeer::retrieveByPK($floUid);
@@ -393,9 +451,28 @@ class Bpmn extends Handler
return $flow;
}
public function getFlows($retType = 'array')
public function getFlows($start = null, $limit = null, $filter = '', $changeCaseTo = CASE_UPPER)
{
return Flow::getAll($this->getUid(), null, null, '', $retType);
if (is_array($start)) {
extract($start);
}
return Flow::getAll($this->getUid(), null, null, '', $changeCaseTo);
}
public function removeFlow($floUid)
{
try {
self::log("Remove Flow: $floUid");
$flow = FlowPeer::retrieveByPK($floUid);
$flow->delete();
self::log("Remove Flow Success!");
} catch (\Exception $e) {
self::log("Exception: ", $e->getMessage(), "Trace: ", $e->getTraceAsString());
throw $e;
}
}
public function addArtifact($data)

1
workflow/engine/src/ProcessMaker/Project/Workflow.php
View File

@@ -275,6 +275,7 @@ class Workflow extends Handler
$oTasks->deleteAllRoutesOfTask($this->proUid, $fromTasUid);
//$oTasks->deleteAllGatewayOfTask($this->proUid, $fromTasUid);
}
self::log("Add Route Success!");
return $this->saveNewPattern($this->proUid, $fromTasUid, $toTasUid, $type, $delete);

65
workflow/engine/src/Services/Api/ProcessMaker/Project.php
View File

@@ -49,8 +49,8 @@ class Project extends Api
$diagram = array_change_key_case($diagram, CASE_LOWER);
$diagram["activities"] = $bwp->getActivities(array("changeCaseTo" => CASE_LOWER));
$diagram["events"] = $bwp->getEvents();
$diagram["gateways"] = $bwp->getGateways();
$diagram["flows"] = $bwp->getFlows();
$diagram["gateways"] = $bwp->getGateways(array("changeCaseTo" => CASE_LOWER));
$diagram["flows"] = $bwp->getFlows(array("changeCaseTo" => CASE_LOWER));
$diagram["artifacts"] = $bwp->getArtifacts();
$diagram["laneset"] = $bwp->getLanesets();
$diagram["lanes"] = $bwp->getLanes();
@@ -152,7 +152,7 @@ class Project extends Api
*/
$whiteList = array();
foreach ($diagram["gateways"] as $i => $gatewayData) {
$diagram["activities"][$i] = $gatewayData = array_change_key_case($gatewayData, CASE_UPPER);
$diagram["gateways"][$i] = $gatewayData = array_change_key_case($gatewayData, CASE_UPPER);
// gateway exists ?
if ($gateway = $bwp->getGateway($gatewayData["GAT_UID"])) {
@@ -164,7 +164,8 @@ class Project extends Api
// if not exists then create it
$oldActUid = $gatewayData["GAT_UID"];
$gatewayData["GAT_UID"] = Hash::generateUID();
$diagram["activities"][$i]["ACT_UID"] = $gatewayData["GAT_UID"];
Logger::log(" ==> updating gateway UID {$gatewayData["GAT_UID"]}->$oldActUid");
$diagram["gateways"][$i]["GAT_UID"] = $gatewayData["GAT_UID"];
$bwp->addGateway($gatewayData);
@@ -173,53 +174,61 @@ class Project extends Api
}
}
$activities = $bwp->getActivities();
$gateways = $bwp->getGateways();
// looking for removed elements
foreach ($activities as $activityData) {
if (! in_array($activityData["ACT_UID"], $whiteList)) {
foreach ($gateways as $gatewayData) {
if (! in_array($gatewayData["GAT_UID"], $whiteList)) {
// If it is not in the white list so, then remove them
$bwp->removeActivity($activityData["ACT_UID"]);
$bwp->removeGateway($gatewayData["GAT_UID"]);
}
}
/*
* Diagram's Flows Handling
*/
$whiteList = array();
foreach ($diagram["flows"] as $i => $flowData) {
//TODO, for test, assuming that all flows are new
$diagram["flows"][$i] = $flowData = array_change_key_case($flowData, CASE_UPPER);
$oldFloUid = $diagram["flows"][$i]["FLO_UID"];
$diagram["flows"][$i]["FLO_UID"] = Hash::generateUID();
Logger::log($flowData["FLO_ELEMENT_ORIGIN"], $result);
$diagram["flows"][$i]["FLO_ELEMENT_ORIGIN"] = self::mapUid($flowData["FLO_ELEMENT_ORIGIN"], $result);
$diagram["flows"][$i]["FLO_ELEMENT_DEST"] = self::mapUid($flowData["FLO_ELEMENT_DEST"], $result);
$whiteList[] = $diagram["flows"][$i]["FLO_UID"];
$result[] = array("object" => "flow", "new_uid" => $diagram["flows"][$i]["FLO_UID"], "old_uid" => $oldFloUid);
// if it is a new flow record
if (! \BpmnFlow::exists($flowData["FLO_UID"])) {
$oldFloUid = $flowData["FLO_UID"];
$flowData["FLO_UID"] = Hash::generateUID();
$flowData["FLO_ELEMENT_ORIGIN"] = self::mapUid($flowData["FLO_ELEMENT_ORIGIN"], $result);
$flowData["FLO_ELEMENT_DEST"] = self::mapUid($flowData["FLO_ELEMENT_DEST"], $result);
$result[] = array("object" => "flow", "new_uid" => $flowData["FLO_UID"], "old_uid" => $oldFloUid);
$diagram["flows"][$i] = $flowData;
}
$whiteList[] = $flowData["FLO_UID"];
}
foreach ($diagram["flows"] as $flowData) {
// flow exists ?
if ($flow = $bwp->getFlow($flowData["FLO_UID"])) {
if (\BpmnFlow::exists($flowData["FLO_UID"])) {
// then update activity
//$bwp->updateFlow($activityData["FLO_UID"], $flowData);
//$whiteList[] = $activityData["FLO_UID"];
$bwp->updateFlow($flowData["FLO_UID"], $flowData);
} else {
// if not exists then create it
//$bwp->addFlow($flowData);
$bwp->addFlow($flowData, $diagram["flows"], $diagram["gateways"], $diagram["events"]);
}
}
$flows = $bwp->getFlows();
// looking for removed elements
foreach ($flows as $flowData) {
if (! in_array($flowData["FLO_UID"], $whiteList)) {
// If it is not in the white list so, then remove them
$bwp->removeFlow($flowData["FLO_UID"]);
}
}
return $result;
} catch (\Exception $e) {
@@ -342,6 +351,8 @@ class Project extends Api
}
}
throw new \Exception("oldUid: $oldUid not found in list:".print_r($list, true));
return null;
}
}