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

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2014-01-09 17:21:02 -04:00
parent daaa1f1a81 e96ebac8ac
commit 0c4735a48e
16 changed files with 1476 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php
View File

@@ -204,16 +204,16 @@ class Assignee extends Api
*
* @param string $prjUid
* @param string $actUid
* @param string $ass_uid
* @param string $ass_type {@choice user,group}
* @param string $ada_uid
* @param string $ada_type {@choice user,group}
*
* @status 201
*/
public function doPostActivityAdhocAssignee($prjUid, $actUid, $ass_uid, $ass_type)
public function doPostActivityAdhocAssignee($prjUid, $actUid, $ada_uid, $ada_type)
{
try {
$task = new \BusinessModel\Task();
$arrayData = $task->addTaskAdhocAssignee($prjUid, $actUid, $ass_uid, $ass_type);
$arrayData = $task->addTaskAdhocAssignee($prjUid, $actUid, $ada_uid, $ada_type);
} catch (\Exception $e) {
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
@@ -222,18 +222,18 @@ class Assignee extends Api
}
/**
* @url DELETE /:prjUid/activity/:actUid/adhoc-assignee/:assUid
* @url DELETE /:prjUid/activity/:actUid/adhoc-assignee/:adaUid
*
* @param string $prjUid
* @param string $actUid
* @param string $assUid
* @param string $adaUid
*
*/
public function doDeleteActivityAdhocAssignee($prjUid, $actUid, $assUid)
public function doDeleteActivityAdhocAssignee($prjUid, $actUid, $adaUid)
{
try {
$task = new \BusinessModel\Task();
$arrayData = $task->removeTaskAdhocAssignee($prjUid, $actUid, $assUid);
$arrayData = $task->removeTaskAdhocAssignee($prjUid, $actUid, $adaUid);
} catch (\Exception $e) {
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());

14
workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Step/Trigger.php
View File

@@ -12,14 +12,20 @@ use \Luracast\Restler\RestException;
class Trigger extends Api
{
/**
* @url GET /:projectUid/activity/:activityUid/step/:stepUid/trigger/:triggerUid
* @url GET /:projectUid/activity/:activityUid/step/:stepUid/trigger/:triggerUid/:type
*
* @param string $triggerUid
* @param string $stepUid
* @param string $activityUid
* @param string $projectUid
* @param string $type {@from body}{@choice before,after}
*/
public function doGetActivityStepTrigger($triggerUid, $stepUid, $activityUid, $projectUid)
public function doGetActivityStepTrigger($triggerUid, $stepUid, $activityUid, $projectUid, $type)
{
try {
$trigger = new \BusinessModel\Trigger();
$stepTrigger = new \BusinessModel\Step\Trigger();
$response = $trigger->getTrigger($triggerUid);
$response = $stepTrigger->getTrigger($stepUid, strtoupper($type), $triggerUid);
return $response;
} catch (\Exception $e) {

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

@@ -13,17 +13,113 @@ class ProcessSupervisors extends Api
{
/**
* @param string $prjUid {@min 32} {@max 32}
* @param string $filter
* @param int $start
* @param int $limit
*
* @url GET /:prjUid/supervisors
* @url GET /:prjUid/process-supervisors
*/
public function doGetSupervisors($prjUid, $filter = '', $start = null, $limit = null)
public function doGetProcessSupervisors($prjUid)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$arrayData = $supervisor->getSupervisors($prjUid, $filter, $start, $limit);
$arrayData = $supervisor->getProcessSupervisors($prjUid);
//Response
$response = $arrayData;
} catch (\Exception $e) {
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
/**
* @param string $prjUid {@min 32} {@max 32}
* @param string $puUid {@min 32} {@max 32}
*
* @url GET /:prjUid/process-supervisor/:puUid
*/
public function doGetProcessSupervisor($prjUid, $puUid)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$objectData = $supervisor->getProcessSupervisor($prjUid, $puUid);
//Response
$response = $objectData;
} catch (\Exception $e) {
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
/**
* @param string $prjUid {@min 32} {@max 32}
* @param string $obj_type
*
* @url GET /:prjUid/available-process-supervisors
*/
public function doGetAvailableSupervisors($prjUid, $obj_type = '')
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$arrayData = $supervisor->getAvailableProcessSupervisors($prjUid, $obj_type);
//Response
$response = $arrayData;
} catch (\Exception $e) {
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
/**
* @param string $prjUid {@min 32} {@max 32}
*
* @url GET /:prjUid/process-supervisor/dynaforms
*/
public function doGetProcessSupervisorDynaforms($prjUid)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$arrayData = $supervisor->getProcessSupervisorDynaforms($prjUid);
//Response
$response = $arrayData;
} catch (\Exception $e) {
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
/**
* @param string $prjUid {@min 32} {@max 32}
* @param string $pudUid {@min 32} {@max 32}
*
* @url GET /:prjUid/process-supervisor/dynaform/:pudUid
*/
public function doGetProcessSupervisorDynaform($prjUid, $pudUid)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$objectData = $supervisor->getProcessSupervisorDynaform($prjUid, $pudUid);
//Response
$response = $objectData;
} catch (\Exception $e) {
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
/**
* @param string $prjUid {@min 32} {@max 32}
*
* @url GET /:prjUid/process-supervisor/available-dynaforms
*/
public function doGetAvailableProcessSupervisorDynaform($prjUid)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$arrayData = $supervisor->getAvailableProcessSupervisorDynaform($prjUid);
//Response
$response = $arrayData;
} catch (\Exception $e) {
@@ -36,13 +132,13 @@ class ProcessSupervisors extends Api
/**
* @param string $prjUid {@min 32} {@max 32}
*
* @url GET /:prjUid/inputdocument-supervisor
* @url GET /:prjUid/process-supervisor/input-documents
*/
public function doGetInputDocumentSupervisor($prjUid)
public function doGetProcessSupervisorInputDocuments($prjUid)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$arrayData = $supervisor->getInputDocumentSupervisor($prjUid);
$arrayData = $supervisor->getProcessSupervisorInputDocuments($prjUid);
//Response
$response = $arrayData;
} catch (\Exception $e) {
@@ -54,38 +150,17 @@ class ProcessSupervisors extends Api
/**
* @param string $prjUid {@min 32} {@max 32}
* @param string $puiUid {@min 32} {@max 32}
*
* @url GET /:prjUid/dynaform-supervisor
* @url GET /:prjUid/process-supervisor/input-document/:puiUid
*/
public function doGetDynaformSupervisor($prjUid)
public function doGetProcessSupervisorInputDocument($prjUid, $puiUid)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$arrayData = $supervisor->getDynaformSupervisor($prjUid);
$objectData = $supervisor->getProcessSupervisorInputDocument($prjUid, $puiUid);
//Response
$response = $arrayData;
} catch (\Exception $e) {
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
/**
* @param string $prjUid {@min 32} {@max 32}
* @param string $filter
* @param int $start
* @param int $limit
*
* @url GET /:prjUid/available-supervisors
*/
public function doGetAvailableSupervisors($prjUid, $filter = '', $start = null, $limit = null)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$arrayData = $supervisor->getAvailableSupervisors($prjUid, $filter, $start, $limit);
//Response
$response = $arrayData;
$response = $objectData;
} catch (\Exception $e) {
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
@@ -96,13 +171,14 @@ class ProcessSupervisors extends Api
/**
* @param string $prjUid {@min 32} {@max 32}
*
* @url GET /:prjUid/available-dynaform-supervisor
* @url GET /:prjUid/process-supervisor/available-input-documents
*/
public function doGetAvailableDynaformSupervisor($prjUid)
public function doGetAvailableProcessSupervisorInputDocument($prjUid)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$arrayData = $supervisor->getAvailableDynaformSupervisors($prjUid);
$arrayData = $supervisor->getAvailableProcessSupervisorInputDocument($prjUid);
//Response
$response = $arrayData;
} catch (\Exception $e) {
@@ -113,98 +189,21 @@ class ProcessSupervisors extends Api
}
/**
* @url POST /:prjUid/process-supervisor
*
* @param string $prjUid {@min 32} {@max 32}
*
* @url GET /:prjUid/available-inputdocument-supervisor
*/
public function doGetAvailableInputDocumentSupervisor($prjUid)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$arrayData = $supervisor->getAvailableInputDocumentSupervisor($prjUid);
//Response
$response = $arrayData;
} catch (\Exception $e) {
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
/**
* @url DELETE /:prjUid/supervisor/:supUid
*
* @param string $prjUid
* @param string $supUid
*
*/
public function doDeleteSupervisor($prjUid, $supUid)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$arrayData = $supervisor->removeProcessSupervisor($prjUid, $supUid);
} catch (\Exception $e) {
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
/**
* @url DELETE /:prjUid/dynaform-supervisor/:dynUid
*
* @param string $prjUid
* @param string $dynUid
*
*/
public function doDeleteDynaformSupervisor($prjUid, $dynUid)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$arrayData = $supervisor->removeDynaformSupervisor($prjUid, $dynUid);
} catch (\Exception $e) {
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
/**
* @url DELETE /:prjUid/inputdocument-supervisor/:inputDocUid
*
* @param string $prjUid
* @param string $inputDocUid
*
*/
public function doDeleteInputDocumentSupervisor($prjUid, $inputDocUid)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$arrayData = $supervisor->removeInputDocumentSupervisor($prjUid, $inputDocUid);
} catch (\Exception $e) {
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
/**
* @url POST /:prjUid/supervisor
*
* @param string $prjUid
* @param string $sup_uid
* @param string $sup_type {@choice user,group}
* @param string $usr_uid {@min 32} {@max 32}
* @param string $pu_type {@choice SUPERVISOR,GROUP_SUPERVISOR}
*
* @status 201
*/
public function doPostSupervisors($prjUid, $sup_uid, $sup_type)
public function doPostProcessSupervisor($prjUid, $usr_uid, $pu_type)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$sup_type=ucwords($sup_type);
$arrayData = $supervisor->addSupervisor($prjUid, $sup_uid, $sup_type);
$objectData = $supervisor->addProcessSupervisor($prjUid, $usr_uid, $pu_type);
//Response
$response = $objectData;
} catch (\Exception $e) {
//Response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
@@ -213,18 +212,20 @@ class ProcessSupervisors extends Api
}
/**
* @url POST /:prjUid/dynaform-supervisor
* @url POST /:prjUid/process-supervisor/dynaform
*
* @param string $prjUid
* @param string $dyn_uid
* @param string $prjUid {@min 32} {@max 32}
* @param string $dyn_uid {@min 32} {@max 32}
*
* @status 201
*/
public function doPostDynaformSupervisors($prjUid, $dyn_uid)
public function doPostProcessSupervisorDynaform($prjUid, $dyn_uid)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$arrayData = $supervisor->addDynaformSupervisor($prjUid, $dyn_uid);
$objectData = $supervisor->addProcessSupervisorDynaform($prjUid, $dyn_uid);
//Response
$response = $objectData;
} catch (\Exception $e) {
//Response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
@@ -233,18 +234,20 @@ class ProcessSupervisors extends Api
}
/**
* @url POST /:prjUid/inputdocument-supervisor
* @url POST /:prjUid/process-supervisor/input-document
*
* @param string $prjUid
* @param string $inp_doc_uid
* @param string $prjUid {@min 32} {@max 32}
* @param string $inp_doc_uid {@min 32} {@max 32}
*
* @status 201
*/
public function doPostInputDocumentSupervisors($prjUid, $inp_doc_uid)
public function doPostProcessSupervisorInputDocument($prjUid, $inp_doc_uid)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$arrayData = $supervisor->addInputDocumentSupervisor($prjUid, $inp_doc_uid);
$objectData = $supervisor->addProcessSupervisorInputDocument($prjUid, $inp_doc_uid);
//Response
$response = $objectData;
} catch (\Exception $e) {
//Response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
@@ -252,4 +255,64 @@ class ProcessSupervisors extends Api
return $response;
}
/**
* @url DELETE /:prjUid/process-supervisor/:puUid
*
* @param string $prjUid {@min 32} {@max 32}
* @param string $puUid {@min 32} {@max 32}
*
*/
public function doDeleteSupervisor($prjUid, $puUid)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$arrayData = $supervisor->removeProcessSupervisor($prjUid, $puUid);
} catch (\Exception $e) {
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
/**
* @url DELETE /:prjUid/process-supervisor/dynaform/:pudUid
*
* @param string $prjUid {@min 32} {@max 32}
* @param string $pudUid {@min 32} {@max 32}
*
*/
public function doDeleteDynaformSupervisor($prjUid, $pudUid)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$arrayData = $supervisor->removeDynaformSupervisor($prjUid, $pudUid);
} catch (\Exception $e) {
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
/**
* @url DELETE /:prjUid/process-supervisor/input-document/:puiUid
*
* @param string $prjUid {@min 32} {@max 32}
* @param string $puiUid {@min 32} {@max 32}
*
*/
public function doDeleteInputDocumentSupervisor($prjUid, $puiUid)
{
try {
$supervisor = new \BusinessModel\ProcessSupervisor();
$arrayData = $supervisor->removeInputDocumentSupervisor($prjUid, $puiUid);
} catch (\Exception $e) {
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
}

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

@@ -15,7 +15,7 @@ class Test3 extends Api
/**
* @status 201
*/
function post()
function post2()
{
return array('success' => true);
}