diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index 9b0fe1de4..c3b679284 100755 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -88,7 +88,8 @@ class processMap $oProcess = new Process(); $aRow = $oProcess->load($sProcessUID); - $oPM->title = new stdclass(); + $oPM = new StdClass(); + $oPM->title = new StdClass(); $oPM->title->label = htmlentities($aRow['PRO_TITLE'], ENT_QUOTES, 'UTF-8'); $oPM->title->position = new stdclass(); $oPM->title->position->x = $aRow['PRO_TITLE_X']; @@ -114,7 +115,7 @@ class processMap $oDataset->next(); while ($aRow1 = $oDataset->getRow()) { - $oTask = null; + $oTask = new StdClass(); $oTask->uid = $aRow1['TAS_UID']; $oTask->task_type = $aRow1['TAS_TYPE']; if ($aRow1['TAS_TYPE'] == 'NORMAL') { @@ -152,9 +153,10 @@ class processMap } } $oTask->taskINI = (strtolower($aRow1['TAS_START']) == 'true' ? true : false); + $oTask->position = new StdClass(); $oTask->position->x = (int) $aRow1['TAS_POSX']; $oTask->position->y = (int) $aRow1['TAS_POSY']; - $oTask->derivation = null; + $oTask->derivation = new StdClass(); $oTask->derivation->to = array(); $oCriteria = new Criteria('workflow'); $oCriteria->add(RoutePeer::PRO_UID, $sProcessUID); @@ -186,7 +188,7 @@ class processMap $aRow2['ROU_TYPE'] = 8; break; } - $oTo = null; + $oTo = new StdClass(); $oTo->task = $aRow2['ROU_NEXT_TASK']; $oTo->condition = $aRow2['ROU_CONDITION']; $oTo->executant = $aRow2['ROU_TO_LAST_USER']; diff --git a/workflow/engine/src/ProcessMaker/Adapter/Bpmn/Port.php b/workflow/engine/src/ProcessMaker/Adapter/Workflow.php similarity index 80% rename from workflow/engine/src/ProcessMaker/Adapter/Bpmn/Port.php rename to workflow/engine/src/ProcessMaker/Adapter/Workflow.php index bc78df494..079aa5521 100644 --- a/workflow/engine/src/ProcessMaker/Adapter/Bpmn/Port.php +++ b/workflow/engine/src/ProcessMaker/Adapter/Workflow.php @@ -4,14 +4,14 @@ namespace ProcessMaker\Adapter\Bpmn; use \Process; /** - * Class Port + * Class Workflow * - * @package ProcessMaker\Adapter\Bpmn + * @package ProcessMaker\Adapter * @author Erik Amaru Ortiz */ -class Port +class Workflow { - public function convertBpmnProjectToPmWorkflow($bpmnProject) + public function loadFromBpmnProject($bpmnProject) { $proUid = $bpmnProject['prj_uid']; @@ -33,7 +33,7 @@ class Port 'TAS_DESCRIPTION' => $activity['act_name'], 'TAS_POSX' => $activity['bou_x'], 'TAS_POSY' => $activity['bou_y'], - 'TAS_START' => '' + 'TAS_START' => self::activityIsStartTask($activity['act_uid']) ); } @@ -45,4 +45,9 @@ class Port ); } + + 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 c065c5c91..71bf847f7 100644 --- a/workflow/engine/src/Services/Api/ProcessMaker/Project.php +++ b/workflow/engine/src/Services/Api/ProcessMaker/Project.php @@ -17,8 +17,6 @@ class Project extends Api { function index() { - //return \BusinessModel\Process::loadProcess('647625648528d91278a87f5076732980'); - try { $projects = BpmnModel::loadProjects(); diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Type.php b/workflow/engine/src/Services/Api/ProcessMaker/Type.php index 2cd02ae52..6207ef684 100644 --- a/workflow/engine/src/Services/Api/ProcessMaker/Type.php +++ b/workflow/engine/src/Services/Api/ProcessMaker/Type.php @@ -106,7 +106,8 @@ class Type /** * Custom class parameter * - * @param Author $author + * @param array $definition + * @param StructProperties $properties * * @return Author */ diff --git a/workflow/engine/src/Services/api.ini b/workflow/engine/src/Services/api.ini index 7cb335a67..ce9794af8 100644 --- a/workflow/engine/src/Services/api.ini +++ b/workflow/engine/src/Services/api.ini @@ -18,3 +18,5 @@ debug = 1 assignee = "Services\Api\ProcessMaker\Project\Activity\Assignee" trigger = "Services\Api\ProcessMaker\Project\Activity\Step\Trigger" +[alias: projects] + project = "Services\Api\ProcessMaker\Project"