diff --git a/wrenchboard/src/include/wrenchboard_api.h b/wrenchboard/src/include/wrenchboard_api.h index 7a07dc97..4bac821b 100644 --- a/wrenchboard/src/include/wrenchboard_api.h +++ b/wrenchboard/src/include/wrenchboard_api.h @@ -227,6 +227,7 @@ enum { PARTNER_STRIPE }; #define WRENCHBOARD_JOB_POSTAGREE 13002 #define WRENCHBOARD_JOB_LISTJOBS 13005 #define WRENCHBOARD_JOB_OFFERS 13006 +#define WRENCHBOARD_JOB_ACTIVE 13008 #define WRENCHBOARD_JOB_CREATEJOB 13010 #define WRENCHBOARD_JOB_DELETEJOB 13011 diff --git a/www-api/app/Config/Constants.php b/www-api/app/Config/Constants.php index bbbf361b..fa57529f 100644 --- a/www-api/app/Config/Constants.php +++ b/www-api/app/Config/Constants.php @@ -220,6 +220,7 @@ define('WRENCHBOARD_ACCOUNT_END', 11999); define('WRENCHBOARD_JOB_POSTAGREE', 13002); define('WRENCHBOARD_JOB_LISTJOBS', 13005); define('WRENCHBOARD_JOB_OFFERS', 13006); +define('WRENCHBOARD_JOB_ACTIVE', 13008); define('WRENCHBOARD_JOB_CREATEJOB',13010 ); define('WRENCHBOARD_JOB_DELETEJOB',13011 ); diff --git a/www-api/app/Config/Routes.php b/www-api/app/Config/Routes.php index e7364f1c..a5bf0f2b 100644 --- a/www-api/app/Config/Routes.php +++ b/www-api/app/Config/Routes.php @@ -76,6 +76,7 @@ $routes->post('/en/wrench/api/v1/starttopup', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/jobmanageragree', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/jobmanagerlist', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/jobmanageroffers', 'WrenchApi::apigate'); +$routes->post('/en/wrench/api/v1/jobmanageractive', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/jobmanagercreatejob', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/jobmanagerupdatejob', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/jobmanagerdeletejob', 'WrenchApi::apigate'); diff --git a/www-api/app/Controllers/WrenchApi.php b/www-api/app/Controllers/WrenchApi.php index 2fad6c11..149fd44d 100644 --- a/www-api/app/Controllers/WrenchApi.php +++ b/www-api/app/Controllers/WrenchApi.php @@ -82,6 +82,7 @@ class WrenchApi extends BaseController 'jobmanageragree' => ['POST'], 'jobmanagerlist' => ['POST'], 'jobmanageroffers'=> ['POST'], + 'jobmanageractive'=> ['POST'], 'jobmanagercreatejob'=> ['POST'], 'jobmanagerupdatejob'=> ['POST'], 'jobmanagerdeletejob'=> ['POST'], @@ -112,6 +113,9 @@ class WrenchApi extends BaseController case 'familymanage': $in["action"] = WRENCHBOARD_FAMILY_MANAGE; break; + case 'jobmanageractive': + $in["action"] = WRENCHBOARD_JOB_ACTIVE; + break; case 'jobmanagercreatejob': $in["action"] = WRENCHBOARD_JOB_CREATEJOB; $in["job_mode"] = ADD_JOB; @@ -188,7 +192,7 @@ class WrenchApi extends BaseController $call_backend = false; break; case 'blogitem': - $blogData = getBlogItem(); + $blogData = (new \App\Models\ResultFormatter() )->getBlogItem(); $local_out = [ 'result'=>'100', 'blog_data'=> $blogData @@ -196,7 +200,7 @@ class WrenchApi extends BaseController $call_backend = false; break; case 'blogdata': - $blogData = getBlogData(); + $blogData = (new \App\Models\ResultFormatter() )->getBlogData(); $local_out = [ 'result'=>'100', 'blog_data'=> $blogData @@ -545,22 +549,22 @@ class WrenchApi extends BaseController ]; $call_backend = false; break; - case 'blogitem': - $blogData = getBlogItem(); - $local_out = [ - 'result'=>'100', - 'blog_data'=> $blogData - ]; - $call_backend = false; - break; - case 'blogdata': - $blogData = getBlogData(); - $local_out = [ - 'result'=>'100', - 'blog_data'=> $blogData - ]; - $call_backend = false; - break; +// case 'blogitem': +// $blogData = (new \App\Models\ResultFormatter() )->getBlogItem(); +// $local_out = [ +// 'result'=>'100', +// 'blog_data'=> $blogData +// ]; +// $call_backend = false; +// break; +// case 'blogdata': +// $blogData = (new \App\Models\ResultFormatter() )->getBlogData(); +// $local_out = [ +// 'result'=>'100', +// 'blog_data'=> $blogData +// ]; +// $call_backend = false; +// break; case 'userscards': $in["action"] = WRENCHBOARD_CARDS_GETCARDLIST; $local_out = [ diff --git a/www-api/public/svs/user/constants.php b/www-api/public/svs/user/constants.php index cb249c28..54a2e5f1 100755 --- a/www-api/public/svs/user/constants.php +++ b/www-api/public/svs/user/constants.php @@ -126,6 +126,8 @@ define('WRENCHBOARD_ACCOUNT_END', 11999); define('WRENCHBOARD_JOB_POSTAGREE', 13002); define('WRENCHBOARD_JOB_LISTJOBS', 13005); define('WRENCHBOARD_JOB_OFFERS', 13006); +define('WRENCHBOARD_JOB_ACTIVE', 13008); + define('WRENCHBOARD_JOB_CREATEJOB',13010 ); define('WRENCHBOARD_JOB_DELETEJOB',13011 ); diff --git a/www-api/public/svs/user/userve.php b/www-api/public/svs/user/userve.php index 6a9a7db8..6bbd4cb5 100755 --- a/www-api/public/svs/user/userve.php +++ b/www-api/public/svs/user/userve.php @@ -61,6 +61,7 @@ $endpoints = array( 'jobmanageragree' => array('POST'), 'jobmanagerlist' => array('POST'), 'jobmanageroffers'=> array('POST'), + 'jobmanageractive'=> array('POST'), 'jobmanagercreatejob'=> array('POST'), 'jobmanagerupdatejob'=> array('POST'), 'jobmanagerdeletejob'=> array('POST'), @@ -147,6 +148,9 @@ switch ($endpoint) { case 'familymanage': $in["action"] = WRENCHBOARD_FAMILY_MANAGE; break; + case 'jobmanageractive': + $in["action"] = WRENCHBOARD_JOB_ACTIVE; + break; case 'jobmanagercreatejob': $in["action"] = WRENCHBOARD_JOB_CREATEJOB; $in["job_mode"] = ADD_JOB;