diff --git a/wrenchboard/src/include/wrenchboard_api.h b/wrenchboard/src/include/wrenchboard_api.h index 61dfb4e5..21e92a83 100644 --- a/wrenchboard/src/include/wrenchboard_api.h +++ b/wrenchboard/src/include/wrenchboard_api.h @@ -244,7 +244,8 @@ enum { PARTNER_STRIPE }; #define WRENCHBOARD_JOB_CREATE_GROUP 13020 #define WRENCHBOARD_JOB_DELETE_GROUP 13023 - +#define WRENCHBOARD_JOB_OFFER_SYSTEM 13025 +#define WRENCHBOARD_JOB_OFFER_FAMILY 13029 #define WRENCHBOARD_JOB_OFFER_INDVI 13030 #define WRENCHBOARD_JOB_OFFER_GROUP 13031 #define WRENCHBOARD_JOB_OFFER_PUBLIC 13032 diff --git a/wrenchboard/src/shared_tool/jobs.cc b/wrenchboard/src/shared_tool/jobs.cc index cdf4e0d5..2e9b2bee 100644 --- a/wrenchboard/src/shared_tool/jobs.cc +++ b/wrenchboard/src/shared_tool/jobs.cc @@ -80,8 +80,16 @@ long jobs_calls(CVars in, CVars &out) { return WrenchDeleteJobsGroupMember(in, out); break; + case WRENCHBOARD_JOB_OFFER_SYSTEM: + + break; + + case WRENCHBOARD_JOB_OFFER_FAMILY: + + break; + case WRENCHBOARD_JOB_OFFER_INDVI: - return WrenchSendJobsOfferIndividual(in, out); + return WrenchSendJobsOfferIndividual(in, out); break; case WRENCHBOARD_JOB_OFFER_GROUP: diff --git a/www-api/app/Config/Constants.php b/www-api/app/Config/Constants.php index bc1d8650..434af64b 100644 --- a/www-api/app/Config/Constants.php +++ b/www-api/app/Config/Constants.php @@ -233,6 +233,8 @@ define('WRENCHBOARD_JOB_DELETE_GROUPMEMBER',13017); define('WRENCHBOARD_JOB_CREATE_GROUP', 13020); define('WRENCHBOARD_JOB_DELETE_GROUP',13023); +define('WRENCHBOARD_JOB_OFFER_SYSTEM', 13025); +define('WRENCHBOARD_JOB_OFFER_FAMILY', 13029); define('WRENCHBOARD_JOB_OFFER_INDVI',13030); define('WRENCHBOARD_JOB_OFFER_GROUP',13031); define('WRENCHBOARD_JOB_OFFER_PUBLIC',13032); diff --git a/www-api/app/Config/Routes.php b/www-api/app/Config/Routes.php index 73573986..f3e1b033 100644 --- a/www-api/app/Config/Routes.php +++ b/www-api/app/Config/Routes.php @@ -125,6 +125,9 @@ $routes->post('/en/wrench/api/v1/pendingjobextend', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/pendingjobsendtome','WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/pendingjobcancel', 'WrenchApi::apigate'); +$routes->post('/en/wrench/api/v1/assigntask', 'WrenchApi::apigate'); + + //$routes->post('/en/wrench/api/v1/blogdata', 'WrenchBlog::apigate'); //$routes->post('/en/wrench/api/v1/blogitem', 'WrenchBlog::apigate'); diff --git a/www-api/app/Controllers/WrenchApi.php b/www-api/app/Controllers/WrenchApi.php index 451a601f..7c9e66db 100644 --- a/www-api/app/Controllers/WrenchApi.php +++ b/www-api/app/Controllers/WrenchApi.php @@ -97,12 +97,17 @@ class WrenchApi extends BaseController 'pendingjobextend' => ['POST'], 'pendingjobsendtome' => ['POST'], 'pendingjobcancel' => ['POST'], + 'assigntask' => ['POST'], ]; return $endpoints; } private function prepareEndPointData($endpoint, $in, &$call_backend=true,&$local_out=[]){ switch ($endpoint) { + case 'assigntask': + $in["action"] = WRENCHBOARD_JOB_OFFER_SYSTEM; + break; + case 'pendingjobextend': $in["action"] = WRENCHBOARD_JOB_EXTEND_EXPIRE; break; diff --git a/www-api/public/svs/user/constants.php b/www-api/public/svs/user/constants.php index cd6db7ce..38fcdded 100755 --- a/www-api/public/svs/user/constants.php +++ b/www-api/public/svs/user/constants.php @@ -138,8 +138,10 @@ define('WRENCHBOARD_JOB_DELETEJOB',13011 ); define('WRENCHBOARD_JOB_GROUP_MEMBER', 13015) ; define('WRENCHBOARD_JOB_DELETE_GROUPMEMBER',13017); define('WRENCHBOARD_JOB_CREATE_GROUP', 13020); -define('WRENCHBOARD_JOB_DELETE_GROUP',13023); +define('WRENCHBOARD_JOB_DELETE_GROUP',13023); +define('WRENCHBOARD_JOB_OFFER_SYSTEM', 13025); +define('WRENCHBOARD_JOB_OFFER_FAMILY', 13029); define('WRENCHBOARD_JOB_OFFER_INDVI',13030); define('WRENCHBOARD_JOB_OFFER_GROUP',13031); define('WRENCHBOARD_JOB_OFFER_PUBLIC',13032); diff --git a/www-api/public/svs/user/userve.php b/www-api/public/svs/user/userve.php index 0e32ed35..585c44be 100755 --- a/www-api/public/svs/user/userve.php +++ b/www-api/public/svs/user/userve.php @@ -76,6 +76,7 @@ $endpoints = array( 'pendingjobextend' => array('POST'), 'pendingjobsendtome' => array('POST'), 'pendingjobcancel' => array('POST'), + 'assigntask' => array('POST'), ); $call_backend = true; // sometimes we need to overwite the call to the extenstion API @@ -138,6 +139,10 @@ if ($_SERVER["REQUEST_METHOD"] == "GET") { } $in["loc"] = $_SERVER["REMOTE_ADDR"]; switch ($endpoint) { + case 'assigntask': + $in["action"] = WRENCHBOARD_JOB_OFFER_SYSTEM; + break; + case 'pendingjobextend': $in["action"] = WRENCHBOARD_JOB_EXTEND_EXPIRE; break;