diff --git a/workflow/engine/src/ProcessMaker/Adapter/Workflow.php b/workflow/engine/src/ProcessMaker/Adapter/Workflow.php index 586145dad..651a13dd7 100644 --- a/workflow/engine/src/ProcessMaker/Adapter/Workflow.php +++ b/workflow/engine/src/ProcessMaker/Adapter/Workflow.php @@ -52,35 +52,31 @@ class Workflow 'TAS_DESCRIPTION' => $activity['act_name'], 'TAS_POSX' => $activity['bou_x'], 'TAS_POSY' => $activity['bou_y'], - 'TAS_START' => (self::activityIsStartTask($activity['act_uid']) ? 'TRUE' : 'FALSE') + 'TAS_START' => (self::activityIsStartTask($activity['act_uid']) ? 'TRUE' : 'FALSE'), + '_action' => 'CREATE' ); } - foreach ($diagram['flows'] as $flow) { + $process['routes'] = array(); + + /*foreach ($diagram['flows'] as $flow) { $process['routes'][] = array( 'ROU_UID' => '', 'TAS_UID' => self::getTask($activity['act_uid']), 'ROU_NEXT_TASK' => self::getNextTask($activity['act_uid']), 'ROU_TYPE' => '' ); - } - - + }*/ return $process; } - private static getTask($activity['act_uid']) + private static function getTask($actUid) { - } - private static getNextTask($activity['act_uid']) + private static function getNextTask($actUid) { - - - - } private static function activityIsStartTask($actUid) diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project.php b/workflow/engine/src/Services/Api/ProcessMaker/Project.php index 1c775a632..2075bc6ff 100644 --- a/workflow/engine/src/Services/Api/ProcessMaker/Project.php +++ b/workflow/engine/src/Services/Api/ProcessMaker/Project.php @@ -30,8 +30,14 @@ class Project extends Api { try { $bpmnModel = new BpmnModel(); + $uids = $bpmnModel->createProject($request_data); + $wfProcess = \ProcessMaker\Adapter\Workflow::loadFromBpmnProject($request_data); + $process = new \BusinessModel\Process(); + $userUid = $this->getUserId(); + $data = array('process' => $wfProcess); + $process->createProcess($userUid, $data); - return $bpmnModel->createProject($request_data); + return $uids; } catch (\Exception $e) { throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); }