fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

litle fix tu support endpoint: GET /projects

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2013-12-06 12:12:11 -04:00
parent 80286b2ebb
commit 7d95c6a056
5 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/classes/class.processMap.php
View File

@@ -88,7 +88,8 @@ class processMap
$oProcess = new Process(); $oProcess = new Process();
$aRow = $oProcess->load($sProcessUID); $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->label = htmlentities($aRow['PRO_TITLE'], ENT_QUOTES, 'UTF-8');
$oPM->title->position = new stdclass(); $oPM->title->position = new stdclass();
$oPM->title->position->x = $aRow['PRO_TITLE_X']; $oPM->title->position->x = $aRow['PRO_TITLE_X'];
@@ -114,7 +115,7 @@ class processMap
$oDataset->next(); $oDataset->next();
while ($aRow1 = $oDataset->getRow()) { while ($aRow1 = $oDataset->getRow()) {
$oTask = null; $oTask = new StdClass();
$oTask->uid = $aRow1['TAS_UID']; $oTask->uid = $aRow1['TAS_UID'];
$oTask->task_type = $aRow1['TAS_TYPE']; $oTask->task_type = $aRow1['TAS_TYPE'];
if ($aRow1['TAS_TYPE'] == 'NORMAL') { if ($aRow1['TAS_TYPE'] == 'NORMAL') {
@@ -152,9 +153,10 @@ class processMap
} }
} }
$oTask->taskINI = (strtolower($aRow1['TAS_START']) == 'true' ? true : false); $oTask->taskINI = (strtolower($aRow1['TAS_START']) == 'true' ? true : false);
$oTask->position = new StdClass();
$oTask->position->x = (int) $aRow1['TAS_POSX']; $oTask->position->x = (int) $aRow1['TAS_POSX'];
$oTask->position->y = (int) $aRow1['TAS_POSY']; $oTask->position->y = (int) $aRow1['TAS_POSY'];
$oTask->derivation = null; $oTask->derivation = new StdClass();
$oTask->derivation->to = array(); $oTask->derivation->to = array();
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->add(RoutePeer::PRO_UID, $sProcessUID); $oCriteria->add(RoutePeer::PRO_UID, $sProcessUID);
@@ -186,7 +188,7 @@ class processMap
$aRow2['ROU_TYPE'] = 8; $aRow2['ROU_TYPE'] = 8;
break; break;
} }
$oTo = null; $oTo = new StdClass();
$oTo->task = $aRow2['ROU_NEXT_TASK']; $oTo->task = $aRow2['ROU_NEXT_TASK'];
$oTo->condition = $aRow2['ROU_CONDITION']; $oTo->condition = $aRow2['ROU_CONDITION'];
$oTo->executant = $aRow2['ROU_TO_LAST_USER']; $oTo->executant = $aRow2['ROU_TO_LAST_USER'];

15
workflow/engine/src/ProcessMaker/Adapter/Bpmn/Port.php → workflow/engine/src/ProcessMaker/Adapter/Workflow.php
View File

@@ -4,14 +4,14 @@ namespace ProcessMaker\Adapter\Bpmn;
use \Process; use \Process;
/** /**
* Class Port * Class Workflow
* *
* @package ProcessMaker\Adapter\Bpmn * @package ProcessMaker\Adapter
* @author Erik Amaru Ortiz <aortiz.erik@gmail.com, erik@colosa.com> * @author Erik Amaru Ortiz <aortiz.erik@gmail.com, erik@colosa.com>
*/ */
class Port class Workflow
{ {
public function convertBpmnProjectToPmWorkflow($bpmnProject) public function loadFromBpmnProject($bpmnProject)
{ {
$proUid = $bpmnProject['prj_uid']; $proUid = $bpmnProject['prj_uid'];
@@ -33,7 +33,7 @@ class Port
'TAS_DESCRIPTION' => $activity['act_name'], 'TAS_DESCRIPTION' => $activity['act_name'],
'TAS_POSX' => $activity['bou_x'], 'TAS_POSX' => $activity['bou_x'],
'TAS_POSY' => $activity['bou_y'], '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)
{
}
} }

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

@@ -17,8 +17,6 @@ class Project extends Api
{ {
function index() function index()
{ {
//return \BusinessModel\Process::loadProcess('647625648528d91278a87f5076732980');
try { try {
$projects = BpmnModel::loadProjects(); $projects = BpmnModel::loadProjects();

3
workflow/engine/src/Services/Api/ProcessMaker/Type.php
View File

@@ -106,7 +106,8 @@ class Type
/** /**
* Custom class parameter * Custom class parameter
* *
* @param Author $author * @param array $definition
* @param StructProperties $properties
* *
* @return Author * @return Author
*/ */

2
workflow/engine/src/Services/api.ini
View File

@@ -18,3 +18,5 @@ debug = 1
assignee = "Services\Api\ProcessMaker\Project\Activity\Assignee" assignee = "Services\Api\ProcessMaker\Project\Activity\Assignee"
trigger = "Services\Api\ProcessMaker\Project\Activity\Step\Trigger" trigger = "Services\Api\ProcessMaker\Project\Activity\Step\Trigger"
[alias: projects]
project = "Services\Api\ProcessMaker\Project"