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

Endpoint: POST /project is ready

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2013-12-17 11:14:36 -04:00
parent 7f93ff5a43
commit 2b7b59aaf4
6 changed files with 115 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
workflow/engine/classes/model/Process.php
View File

@@ -48,7 +48,7 @@ class Process extends BaseProcess
* @var string
*/
protected $pro_title = '';
public $dir = 'ASC';
public $dir = 'ASC';
public $sort = 'PRO_TITLE';
/**
@@ -152,16 +152,20 @@ class Process extends BaseProcess
* @return void
*/
public function create ($aData)
public function create ($aData, $generateUid = true)
{
if (! isset( $aData['USR_UID'] )) {
throw (new PropelException( 'The process cannot be created. The USR_UID is empty.' ));
}
$con = Propel::getConnection( ProcessPeer::DATABASE_NAME );
try {
do {
$sNewProUid = G::generateUniqueID();
} while ($this->processExists( $sNewProUid ));
if ($generateUid) {
do {
$sNewProUid = G::generateUniqueID();
} while ($this->processExists( $sNewProUid ));
} else {
$sNewProUid = $aData['PRO_UID'];
}
$this->setProUid( $sNewProUid );
$this->setProParent( $sNewProUid );
@@ -389,10 +393,10 @@ class Process extends BaseProcess
}
}
if ($this->dir=='ASC') {
usort( $processes, array($this, "ordProcessAsc") );
} else {
usort( $processes, array($this, "ordProcessDesc") );
if ($this->dir=='ASC') {
usort( $processes, array($this, "ordProcessAsc") );
} else {
usort( $processes, array($this, "ordProcessDesc") );
}
return $processes;
@@ -750,10 +754,10 @@ class Process extends BaseProcess
if ($limit == '') {
$limit = count($aProcesses);
}
if ($this->dir=='ASC') {
usort( $aProcesses, array($this, "ordProcessAsc") );
} else {
usort( $aProcesses, array($this, "ordProcessDesc") );
if ($this->dir=='ASC') {
usort( $aProcesses, array($this, "ordProcessAsc") );
} else {
usort( $aProcesses, array($this, "ordProcessDesc") );
}
return $aProcesses;
@@ -881,27 +885,27 @@ class Process extends BaseProcess
if (($this->sort) == '') {
$this->sort = 'PRO_TITLE';
}
if ($a[$this->sort] > $b[$this->sort]) {
return 1;
if ($a[$this->sort] > $b[$this->sort]) {
return 1;
} elseif ($a[$this->sort] < $b[$this->sort]) {
return - 1;
} else {
return 0;
return - 1;
} else {
return 0;
}
}
public function ordProcessDesc ($a, $b)
public function ordProcessDesc ($a, $b)
{
if (($this->sort) == '') {
$this->sort = 'PRO_TITLE';
}
if ($a[$this->sort] > $b[$this->sort]) {
return - 1;
} elseif ($a[$this->sort] < $b[$this->sort]) {
return 1;
} else {
return 0;
}
if (($this->sort) == '') {
$this->sort = 'PRO_TITLE';
}
if ($a[$this->sort] > $b[$this->sort]) {
return - 1;
} elseif ($a[$this->sort] < $b[$this->sort]) {
return 1;
} else {
return 0;
}
}
}

9
workflow/engine/classes/model/Task.php
View File

@@ -356,12 +356,17 @@ class Task extends BaseTask
* @param array $aData with new values
* @return void
*/
public function create($aData)
public function create($aData, $generateUid = true)
{
$con = Propel::getConnection(TaskPeer::DATABASE_NAME);
try {
$sTaskUID = G::generateUniqueID();
if ($generateUid) {
$sTaskUID = G::generateUniqueID();
} else {
$sTaskUID = $aData['TAS_UID'];
}
$con->begin();
$this->setProUid($aData['PRO_UID']);
$this->setTasUid($sTaskUID);

3
workflow/engine/controllers/processProxy.php
View File

@@ -84,6 +84,9 @@ class ProcessProxy extends HttpProxyController
$this->success = true;
$this->PRO_UID = $sProUid;
$this->msg = G::LoadTranslation( 'ID_CREATE_PROCESS_SUCCESS' );
//TODO save bpmn project
}
/**

6
workflow/engine/src/BusinessModel/Process.php
View File

@@ -108,7 +108,7 @@ class Process
switch ($option) {
case "CREATE":
$processUid = $process->create($arrayProcessData);
$processUid = $process->create($arrayProcessData, false);
//Call plugins
//$arrayData = array(
@@ -155,7 +155,7 @@ class Process
case "CREATE":
//Create task
$arrayDataAux = array(
//"TAS_UID" => $arrayData["TAS_UID"],
"TAS_UID" => $arrayData["TAS_UID"],
"PRO_UID" => $arrayData["PRO_UID"],
"TAS_TITLE" => $arrayData["TAS_TITLE"],
"TAS_DESCRIPTION" => $arrayData["TAS_DESCRIPTION"],
@@ -166,7 +166,7 @@ class Process
$task = new \Task();
$taskUid = $task->create($arrayDataAux);
$taskUid = $task->create($arrayDataAux, false);
$uidAux = $arrayDefineProcessData["process"]["tasks"][$index]["TAS_UID"];
$arrayDefineProcessData["process"]["tasks"][$index]["TAS_UID"] = $taskUid;

5
workflow/engine/src/ProcessMaker/Adapter/Bpmn/Model.php
View File

@@ -200,6 +200,11 @@ class Model
foreach($gateways as $gatewayData) {
$gatewayData = array_change_key_case((array) $gatewayData, CASE_UPPER);
// fix data
if ($gatewayData['GAT_DIRECTION'] === null) {
unset($gatewayData['GAT_DIRECTION']);
}
$gateway = new Gateway();
$gateway->fromArray($gatewayData, BasePeer::TYPE_FIELDNAME);
$gateway->setGatUid(Hash::generateUID());

132
workflow/engine/src/ProcessMaker/Adapter/Workflow.php
View File

@@ -4,6 +4,7 @@ namespace ProcessMaker\Adapter;
use \Process;
use \ProcessMaker\Adapter\Bpmn\Model as BpmnModel;
use \ProcessMaker\Util\Hash;
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
/**
* Class Workflow
@@ -13,26 +14,8 @@ use \ProcessMaker\Util\Hash;
*/
class Workflow
{
public static $bpmnTypesEquiv = array(
'event' => array(
'START' => 'START' // to define task start
),
'flow' => array(
'SEQUENCE' => 'SEQUENTIAL' // to define task start
)
);
public function loadFromBpmnProject($prjUid)
public static function loadFromBpmnProject($prjUid)
{
$bpmnTypesEquiv = array(
'event' => array(
'start' => 'start' // to define task start
),
'flow' => array(
'SEQUENCE' => 'SEQUENTIAL' // to define task start
)
);
$project = BpmnModel::getBpmnObjectBy('Project', \BpmnProjectPeer::PRJ_UID, $prjUid);
$process = array();
@@ -62,15 +45,6 @@ class Workflow
$process['routes'] = array_merge($process['routes'], self::getRoutesFromBpmnFlows($prjUid, $activity['ACT_UID']));
}
/*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;
}
@@ -84,49 +58,69 @@ class Workflow
foreach ($flows as $flow) {
$fromUid = $flow['FLO_ELEMENT_ORIGIN'];
$type = $flow['FLO_TYPE'];
switch ($type) {
switch ($flow['FLO_TYPE']) {
case 'SEQUENCE':
$type = 'SEQUENTIAL';
break;
}
//$elFlow = BpmnModel::getBpmnObjectBy('Flow', \BpmnFlowPeer::FLO_ELEMENT_DEST, $elementUid);
default:
throw new \LogicException(sprintf(
"Unsupported flow type: %s, ProcessMaker only support type '', Given: '%s'",
'SEQUENCE', $flow['FLO_TYPE']
));
}
switch ($flow['FLO_ELEMENT_DEST_TYPE']) {
case 'bpmnActivity':
// the most easy case, when the flow is connecting a activity with another activity
$routes[] = array(
'ROU_UID' => Hash::generateUID(),
'ROU_UID' => $flow['FLO_UID'], //Hash::generateUID(),
'PRO_UID' => $prjUid,
'TAS_UID' => $fromUid,
'ROU_NEXT_TASK' => $flow['FLO_ELEMENT_DEST'],
'ROU_TYPE' => $type,
'ROU_TYPE' => 'SEQUENTIAL',
'_action' => 'CREATE'
);
break;
case 'bpmnGateway':
// if it is a gateway it can fork one or more routes
$gatUid = $flow['FLO_ELEMENT_DEST'];
// if it is a gateway it can fork one or more routes
$gatFlows = BpmnModel::getBpmnCollectionBy('Flow', \BpmnFlowPeer::FLO_ELEMENT_ORIGIN, $gatUid);
foreach ($gatFlows as $gatFlow) {
switch ($gatFlow['FLO_ELEMENT_DEST_TYPE']) {
case 'bpmnActivity':
// getting gateway properties
$gateway = BpmnModel::getBpmnObjectBy('Gateway', \BpmnFlowPeer::GAT_UID, $gatUid);
$gateway = BpmnModel::getBpmnObjectBy('Gateway', \BpmnGatewayPeer::GAT_UID, $gatUid);
switch ($gateway['GAT_TYPE']) {
//TODO we need to know gateways types to match with routes types of processmaker
case '':
$routeType = '';
case 'SELECTION':
$routeType = 'SELECT';
break;
case 'EVALUATION':
$routeType = 'EVALUATE';
break;
case 'PARALLEL':
$routeType = 'PARALLEL';
break;
case 'PARALLEL_EVALUATION':
$routeType = 'PARALLEL-BY-EVALUATION';
break;
case 'PARALLEL_JOIN':
$routeType = 'SEC-JOIN';
break;
default:
throw new \LogicException(sprintf("Unsupported Gateway type: %s", $gateway['GAT_TYPE']));
}
$routes[] = array(
'ROU_UID' => Hash::generateUID(),
'ROU_UID' => $gatFlow['FLO_UID'], //Hash::generateUID(),
'PRO_UID' => $prjUid,
'TAS_UID' => $fromUid,
'ROU_NEXT_TASK' => $gatFlow['FLO_ELEMENT_DEST'],
@@ -137,45 +131,47 @@ class Workflow
default:
// for processmaker is only allowed flows between "gateway -> activity"
// any another flow is considered invalid
throw new \LogicException("For ProcessMaker is only allowed flows between \"gateway -> activity\"");
throw new \LogicException(sprintf(
"For ProcessMaker is only allowed flows between \"gateway -> activity\" " . PHP_EOL .
"Given: bpmnGateway -> " . $gatFlow['FLO_ELEMENT_DEST_TYPE']
));
}
}
break;
case 'bpmnEvent':
$evnUid = $flow['FLO_ELEMENT_DEST'];
$event = BpmnModel::getBpmnObjectBy('Event', \BpmnEventPeer::EVN_UID, $evnUid);
switch ($event['EVN_TYPE']) {
case 'END':
$routeType = 'SEQUENTIAL';
$routes[] = array(
'ROU_UID' => $flow['FLO_UID'], //Hash::generateUID(),
'PRO_UID' => $prjUid,
'TAS_UID' => $fromUid,
'ROU_NEXT_TASK' => '-1',
'ROU_TYPE' => $routeType,
'_action' => 'CREATE'
);
break;
default:
throw new \LogicException("Invalid connection to Event object type");
}
break;
}
}
return $routes;
}
private static function getRoutesFromBpmnFlows2($flows)
{
// get bpmnActivities on flo_element_origin
$flowsOriginActivities = array();
foreach ($flows as $i => $flow) {
if ($flow['flo_element_origin_type'] == 'bpmnActivity') {
$flowsOriginActivities[] = $flow;
unset($flows[$i]);
}
}
}
private static function getTask($actUid)
{
}
private static function getNextTask($actUid)
{
}
private static function activityIsStartTask($actUid)
{
/*
* 1. find bpmn flows related to target activity
* 2. verify is the flow_element_origin_type is a BpmnEvent and it have a evn_type = start
* 2. verify is the flow_element_origin_type is a BpmnEvent and it have a evn_type=start
*/
$selection = BpmnModel::select('*', 'Flow', array(
\BpmnFlowPeer::FLO_ELEMENT_DEST => $actUid,
@@ -186,7 +182,7 @@ class Workflow
if ($elementOrigin['FLO_ELEMENT_ORIGIN_TYPE'] == 'bpmnEvent') {
$event = BpmnModel::getBpmnObjectBy('Event', \BpmnEventPeer::EVN_UID, $elementOrigin['FLO_ELEMENT_ORIGIN']);
if ($event['EVN_TYPE'] == self::$bpmnTypesEquiv['event']['START']) {
if ($event['EVN_TYPE'] == 'START') {
return true;
}
}