From e991a3f82abb66ad30477bf5938d701b6dcfff80 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Mon, 5 May 2014 12:27:27 -0400 Subject: [PATCH 1/2] Adicion en BE para end process despues de gateway --- .../engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php index bc7810d00..c7776609a 100644 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php @@ -407,10 +407,10 @@ class BpmnWorkflow extends Project\Bpmn $gatewayFlow = $gatewayFlow->toArray(); switch ($gatewayFlow['FLO_ELEMENT_DEST_TYPE']) { + case 'bpmnEvent': case 'bpmnActivity': // (gateway -> activity) $gateway = \BpmnGateway::findOneBy(\BpmnGatewayPeer::GAT_UID, $gatUid)->toArray(); - switch ($gateway["GAT_TYPE"]) { //case 'SELECTION': case self::BPMN_GATEWAY_COMPLEX: @@ -453,6 +453,9 @@ class BpmnWorkflow extends Project\Bpmn $condition = array_key_exists('FLO_CONDITION', $gatewayFlow) ? $gatewayFlow["FLO_CONDITION"] : ''; $this->wp->addRoute($activity["ACT_UID"], $gatewayFlow['FLO_ELEMENT_DEST'], $routeType, $condition); + if ($gatewayFlow['FLO_ELEMENT_DEST_TYPE'] == 'bpmnEvent') { + $this->wp->addRoute($activity["ACT_UID"], -1, $routeType, $condition); + } break; default: // for processmaker is only allowed flows between "gateway -> activity" From 48682402504ce0f71a47923662596c81eb6db6d3 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Tue, 6 May 2014 10:34:22 -0400 Subject: [PATCH 2/2] Adicion de flow entre gateway y un event --- .../engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php index c7776609a..47cb2ab38 100644 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php @@ -452,9 +452,10 @@ class BpmnWorkflow extends Project\Bpmn } $condition = array_key_exists('FLO_CONDITION', $gatewayFlow) ? $gatewayFlow["FLO_CONDITION"] : ''; - $this->wp->addRoute($activity["ACT_UID"], $gatewayFlow['FLO_ELEMENT_DEST'], $routeType, $condition); if ($gatewayFlow['FLO_ELEMENT_DEST_TYPE'] == 'bpmnEvent') { $this->wp->addRoute($activity["ACT_UID"], -1, $routeType, $condition); + } else { + $this->wp->addRoute($activity["ACT_UID"], $gatewayFlow['FLO_ELEMENT_DEST'], $routeType, $condition); } break; default: