diff --git a/workflow/engine/src/ProcessMaker/Adapter/Bpmn/Model.php b/workflow/engine/src/ProcessMaker/Adapter/Bpmn/Model.php index 194982e72..3022610b5 100644 --- a/workflow/engine/src/ProcessMaker/Adapter/Bpmn/Model.php +++ b/workflow/engine/src/ProcessMaker/Adapter/Bpmn/Model.php @@ -280,6 +280,30 @@ class Model $flows = self::getBpmnCollectionBy('Flow', FlowPeer::PRJ_UID, $prjUid, true); $artifacts = self::getBpmnCollectionBy('Artifact', ArtifactPeer::PRJ_UID, $prjUid, true); + // getting activity bound data + foreach ($activities as $i => $activity) { + $activities[$i] = array_merge( + $activities[$i], + self::getBpmnObjectBy('Bound', BoundPeer::ELEMENT_UID, $activity['act_uid'], true) + ); + } + + // getting event bound data + foreach ($events as $i => $event) { + $events[$i] = array_merge( + $events[$i], + self::getBpmnObjectBy('Bound', BoundPeer::ELEMENT_UID, $event['evn_uid'], true) + ); + } + + // getting gateway bound data + foreach ($gateways as $i => $gateway) { + $gateways[$i] = array_merge( + $gateways[$i], + self::getBpmnObjectBy('Bound', BoundPeer::ELEMENT_UID, $gateway['gat_uid'], true) + ); + } + $project = array_change_key_case($project); $project['diagrams'] = array($diagram); $project['diagrams'][0]['lanesets'] = $lanesets; diff --git a/workflow/engine/src/ProcessMaker/Adapter/Bpmn/Transform.php b/workflow/engine/src/ProcessMaker/Adapter/Bpmn/Transform.php deleted file mode 100644 index d74206a33..000000000 --- a/workflow/engine/src/ProcessMaker/Adapter/Bpmn/Transform.php +++ /dev/null @@ -1,28 +0,0 @@ - - */ -class Transform -{ - -} \ No newline at end of file diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project.php b/workflow/engine/src/Services/Api/ProcessMaker/Project.php index 71bf847f7..c065c5c91 100644 --- a/workflow/engine/src/Services/Api/ProcessMaker/Project.php +++ b/workflow/engine/src/Services/Api/ProcessMaker/Project.php @@ -17,6 +17,8 @@ class Project extends Api { function index() { + //return \BusinessModel\Process::loadProcess('647625648528d91278a87f5076732980'); + try { $projects = BpmnModel::loadProjects();