Correcion de conflictos
This commit is contained in:
@@ -182,5 +182,23 @@ class Project extends Api
|
||||
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @url GET /:projectUid/web-entries
|
||||
*
|
||||
* @param string $projectUid {@min 32}{@max 32}
|
||||
*/
|
||||
public function doGetWebEntries($projectUid)
|
||||
{
|
||||
try {
|
||||
$process = new \BusinessModel\Process();
|
||||
|
||||
$response = $process->getWebEntries($projectUid);
|
||||
|
||||
return $response;
|
||||
} catch (\Exception $e) {
|
||||
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@ class Assignee extends Api
|
||||
/**
|
||||
* @url GET /:prjUid/activity/:actUid/assignee
|
||||
*
|
||||
* @param string $prjUid
|
||||
* @param string $actUid
|
||||
* @param string $prjUid {@min 32} {@max 32}
|
||||
* @param string $actUid {@min 32} {@max 32}
|
||||
* @param string $filter
|
||||
* @param int $start
|
||||
* @param int $limit
|
||||
@@ -39,8 +39,8 @@ class Assignee extends Api
|
||||
/**
|
||||
* @url GET /:prjUid/activity/:actUid/available-assignee
|
||||
*
|
||||
* @param string $prjUid
|
||||
* @param string $actUid
|
||||
* @param string $prjUid {@min 32} {@max 32}
|
||||
* @param string $actUid {@min 32} {@max 32}
|
||||
* @param string $filter
|
||||
* @param int $start
|
||||
* @param int $limit
|
||||
@@ -64,9 +64,9 @@ class Assignee extends Api
|
||||
/**
|
||||
* @url GET /:prjUid/activity/:actUid/assignee/:aasUid
|
||||
*
|
||||
* @param string $prjUid
|
||||
* @param string $actUid
|
||||
* @param string $aasUid
|
||||
* @param string $prjUid {@min 32} {@max 32}
|
||||
* @param string $actUid {@min 32} {@max 32}
|
||||
* @param string $aasUid {@min 32} {@max 32}
|
||||
*
|
||||
*/
|
||||
public function doGetActivityAssignee($prjUid, $actUid, $aasUid)
|
||||
@@ -87,9 +87,9 @@ class Assignee extends Api
|
||||
/**
|
||||
* @url POST /:prjUid/activity/:actUid/assignee
|
||||
*
|
||||
* @param string $prjUid
|
||||
* @param string $actUid
|
||||
* @param string $aas_uid
|
||||
* @param string $prjUid {@min 32} {@max 32}
|
||||
* @param string $actUid {@min 32} {@max 32}
|
||||
* @param string $aas_uid {@min 32} {@max 32}
|
||||
* @param string $aas_type {@choice user,group}
|
||||
*
|
||||
* @status 201
|
||||
@@ -109,9 +109,9 @@ class Assignee extends Api
|
||||
/**
|
||||
* @url DELETE /:prjUid/activity/:actUid/assignee/:aasUid
|
||||
*
|
||||
* @param string $prjUid
|
||||
* @param string $actUid
|
||||
* @param string $aasUid
|
||||
* @param string $prjUid {@min 32} {@max 32}
|
||||
* @param string $actUid {@min 32} {@max 32}
|
||||
* @param string $aasUid {@min 32} {@max 32}
|
||||
*
|
||||
*/
|
||||
public function doDeleteActivityAssignee($prjUid, $actUid, $aasUid)
|
||||
@@ -129,8 +129,8 @@ class Assignee extends Api
|
||||
/**
|
||||
* @url GET /:prjUid/activity/:actUid/adhoc-assignee
|
||||
*
|
||||
* @param string $prjUid
|
||||
* @param string $actUid
|
||||
* @param string $prjUid {@min 32} {@max 32}
|
||||
* @param string $actUid {@min 32} {@max 32}
|
||||
* @param string $filter
|
||||
* @param int $start
|
||||
* @param int $limit
|
||||
@@ -154,8 +154,8 @@ class Assignee extends Api
|
||||
/**
|
||||
* @url GET /:prjUid/activity/:actUid/adhoc-available-assignee
|
||||
*
|
||||
* @param string $prjUid
|
||||
* @param string $actUid
|
||||
* @param string $prjUid {@min 32} {@max 32}
|
||||
* @param string $actUid {@min 32} {@max 32}
|
||||
* @param string $filter
|
||||
* @param int $start
|
||||
* @param int $limit
|
||||
@@ -179,9 +179,9 @@ class Assignee extends Api
|
||||
/**
|
||||
* @url GET /:prjUid/activity/:actUid/adhoc-assignee/:aasUid
|
||||
*
|
||||
* @param string $prjUid
|
||||
* @param string $actUid
|
||||
* @param string $assUid
|
||||
* @param string $prjUid {@min 32} {@max 32}
|
||||
* @param string $actUid {@min 32} {@max 32}
|
||||
* @param string $assUid {@min 32} {@max 32}
|
||||
*
|
||||
*/
|
||||
public function doGetActivityAdhocAssignee($prjUid, $actUid, $aasUid)
|
||||
@@ -202,9 +202,9 @@ class Assignee extends Api
|
||||
/**
|
||||
* @url POST /:prjUid/activity/:actUid/adhoc-assignee
|
||||
*
|
||||
* @param string $prjUid
|
||||
* @param string $actUid
|
||||
* @param string $ada_uid
|
||||
* @param string $prjUid {@min 32} {@max 32}
|
||||
* @param string $actUid {@min 32} {@max 32}
|
||||
* @param string $ada_uid {@min 32} {@max 32}
|
||||
* @param string $ada_type {@choice user,group}
|
||||
*
|
||||
* @status 201
|
||||
@@ -224,9 +224,9 @@ class Assignee extends Api
|
||||
/**
|
||||
* @url DELETE /:prjUid/activity/:actUid/adhoc-assignee/:adaUid
|
||||
*
|
||||
* @param string $prjUid
|
||||
* @param string $actUid
|
||||
* @param string $adaUid
|
||||
* @param string $prjUid {@min 32} {@max 32}
|
||||
* @param string $actUid {@min 32} {@max 32}
|
||||
* @param string $adaUid {@min 32} {@max 32}
|
||||
*
|
||||
*/
|
||||
public function doDeleteActivityAdhocAssignee($prjUid, $actUid, $adaUid)
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
<?php
|
||||
namespace Services\Api\ProcessMaker\Project;
|
||||
|
||||
use \ProcessMaker\Services\Api;
|
||||
use \Luracast\Restler\RestException;
|
||||
|
||||
/**
|
||||
* Project\ProjectUsers Api Controller
|
||||
*
|
||||
* @protected
|
||||
*/
|
||||
class ProjectUsers extends Api
|
||||
{
|
||||
/**
|
||||
* @param string $prjUid {@min 32} {@max 32}
|
||||
*
|
||||
* @url GET /:prjUid/users
|
||||
*/
|
||||
public function doGetProjectUsers($prjUid)
|
||||
{
|
||||
try {
|
||||
$supervisor = new \BusinessModel\ProjectUser();
|
||||
$arrayData = $supervisor->getProjectUsers($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}
|
||||
*
|
||||
* @url GET /:prjUid/starting-tasks
|
||||
*/
|
||||
public function doGetProjectStartingTasks($prjUid)
|
||||
{
|
||||
try {
|
||||
$supervisor = new \BusinessModel\ProjectUser();
|
||||
$arrayData = $supervisor->getProjectStartingTasks($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 $usrUid {@min 32} {@max 32}
|
||||
*
|
||||
* @url GET /:prjUid/user/:usrUid/starting-tasks
|
||||
*/
|
||||
public function doGetProjectStartingTaskUsers($prjUid, $usrUid)
|
||||
{
|
||||
try {
|
||||
$supervisor = new \BusinessModel\ProjectUser();
|
||||
$arrayData = $supervisor->getProjectStartingTaskUsers($prjUid, $usrUid);
|
||||
//Response
|
||||
$response = $arrayData;
|
||||
} catch (\Exception $e) {
|
||||
//response
|
||||
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
|
||||
}
|
||||
return $response;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
<?php
|
||||
namespace Services\Api\ProcessMaker\Project;
|
||||
|
||||
use \ProcessMaker\Services\Api;
|
||||
use \Luracast\Restler\RestException;
|
||||
|
||||
/**
|
||||
* Project\WebEntry Api Controller
|
||||
*
|
||||
* @protected
|
||||
*/
|
||||
class WebEntry extends Api
|
||||
{
|
||||
/**
|
||||
* @url GET /:projectUid/web-entry/:activityUid/:dynaFormUid
|
||||
*
|
||||
* @param string $dynaFormUid {@min 32}{@max 32}
|
||||
* @param string $activityUid {@min 32}{@max 32}
|
||||
* @param string $projectUid {@min 32}{@max 32}
|
||||
*/
|
||||
public function doGetWebEntry($dynaFormUid, $activityUid, $projectUid)
|
||||
{
|
||||
try {
|
||||
$webEntry = new \BusinessModel\WebEntry();
|
||||
|
||||
$response = $webEntry->getWebEntry($projectUid, $activityUid, $dynaFormUid);
|
||||
|
||||
return $response;
|
||||
} catch (\Exception $e) {
|
||||
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
///**
|
||||
// * @url POST /:projectUid/case-tracker/object
|
||||
// *
|
||||
// * @param string $projectUid {@min 32}{@max 32}
|
||||
// * @param array $request_data
|
||||
// * @param string $cto_type_obj {@from body}{@choice DYNAFORM,INPUT_DOCUMENT,OUTPUT_DOCUMENT}{@required true}
|
||||
// * @param string $cto_uid_obj {@from body}{@min 32}{@max 32}{@required true}
|
||||
// * @param string $cto_condition
|
||||
// * @param int $cto_position {@from body}{@min 1}
|
||||
// *
|
||||
// * @status 201
|
||||
// */
|
||||
//public function doPostWebEntry(
|
||||
// $projectUid,
|
||||
// $request_data,
|
||||
// $cto_type_obj = "DYNAFORM",
|
||||
// $cto_uid_obj = "00000000000000000000000000000000",
|
||||
// $cto_condition = "",
|
||||
// $cto_position = 1
|
||||
//) {
|
||||
// try {
|
||||
// $caseTrackerObject = new \BusinessModel\WebEntry();
|
||||
//
|
||||
// $arrayData = $caseTrackerObject->create($projectUid, $request_data);
|
||||
//
|
||||
// $response = $arrayData;
|
||||
//
|
||||
// return $response;
|
||||
// } catch (\Exception $e) {
|
||||
// throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
|
||||
// }
|
||||
//}
|
||||
|
||||
/**
|
||||
* @url DELETE /:projectUid/web-entry/:activityUid/:dynaFormUid
|
||||
*
|
||||
* @param string $dynaFormUid {@min 32}{@max 32}
|
||||
* @param string $activityUid {@min 32}{@max 32}
|
||||
* @param string $projectUid {@min 32}{@max 32}
|
||||
*/
|
||||
public function doDeleteWebEntry($dynaFormUid, $activityUid, $projectUid)
|
||||
{
|
||||
try {
|
||||
$webEntry = new \BusinessModel\WebEntry();
|
||||
|
||||
$webEntry->delete($projectUid, $activityUid, $dynaFormUid);
|
||||
} catch (\Exception $e) {
|
||||
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user