From 92c5e6ccb24740d48b450a91ed640ae458e26ecc Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Thu, 11 May 2023 07:31:27 -0400 Subject: [PATCH] Job edit --- wrenchboard/src/include/wrenchboard_api.h | 3 ++- wrenchboard/src/shared_tool/jobs.cc | 25 ++++++++++++++++++----- www-api/app/Config/Constants.php | 2 ++ www-api/app/Config/Routes.php | 3 +++ www-api/app/Controllers/WrenchApi.php | 11 +++++++++- www-api/app/Models/ResultFormatter.php | 2 +- www-api/public/svs/user/constants.php | 2 ++ www-api/public/svs/user/formarter.php | 2 +- www-api/public/svs/user/userve.php | 11 +++++++++- 9 files changed, 51 insertions(+), 10 deletions(-) diff --git a/wrenchboard/src/include/wrenchboard_api.h b/wrenchboard/src/include/wrenchboard_api.h index 3483d5d8..7a07dc97 100644 --- a/wrenchboard/src/include/wrenchboard_api.h +++ b/wrenchboard/src/include/wrenchboard_api.h @@ -84,7 +84,8 @@ enum { PARTNER_STRIPE }; #define JOBS_DUE_APPROACH_MAIL 311 #define JOBS_PAYMENT_DUE_MAIL 312 - +#define ADD_JOB 10010 +#define UPDATE_JOB 10020 #define JOB_INTEREST_ACCEPT 100 #define JOB_INTEREST_REJECT 200 diff --git a/wrenchboard/src/shared_tool/jobs.cc b/wrenchboard/src/shared_tool/jobs.cc index 83502578..e1f90613 100644 --- a/wrenchboard/src/shared_tool/jobs.cc +++ b/wrenchboard/src/shared_tool/jobs.cc @@ -28,6 +28,7 @@ long jobs_calls(CVars in, CVars &out) { logfmt(logINFO, "jobs_calls()"); out["result"] = "YES I GET TO BACK END"; long action = REQ_LONG(in, "action", 0, -1); + long job_mode = 0; logfmt(logINFO, "jobs_calls() action=%lu",action); switch (action) { case WRENCHBOARD_JOB_POSTAGREE: @@ -40,7 +41,15 @@ long jobs_calls(CVars in, CVars &out) { return WrenchJobManagerOffers(in, out); break; case WRENCHBOARD_JOB_CREATEJOB: - return WrenchCreateJobs(in, out); + job_mode = REQ_LONG(in, "job_mode", 1, -1); + switch(job_mode){ + case ADD_JOB: + return WrenchCreateJobs(in, out); + break; + case UPDATE_JOB: + return WrenchEditJobs(in, out); + break; + } break; case WRENCHBOARD_JOB_DELETEJOB: return WrenchDeleteJobs(in, out); @@ -112,10 +121,16 @@ long WrenchJobPostAgree(CVars in, CVars &out) { if ( out["member_id"].Long() > 0 ) { pgsql_exec("UPDATE members SET post_jobs = now() WHERE id = %lu AND uid='%s'", in["message_id"].Long(), in["uid"].c_str()); - load_db_record(out, "SELECT * FROM members WHERE id = %lu AND uid='%s' AND post_jobs IS NOT NULL", in["member_id"].Long(), in["uid"].c_str()); + load_db_record(out, "SELECT post_jobs FROM members WHERE id = %lu AND uid='%s' AND post_jobs IS NOT NULL", in["member_id"].Long(), in["uid"].c_str()); + out["status"] = "Completed"; + out["advise"] = "Refresh Session Profile"; + ret = PHP_CREATED_OK; + } + else{ + out["status"] = "Invalid"; } } - ret = PHP_CREATED_OK; + } catch (bad_parameter) { out["log_status"] = "Error WrenchMarketInterestQuestion"; } @@ -1181,7 +1196,7 @@ long WrenchCreateJobs(CVars in, CVars &out) { long WrenchEditJobs(CVars in, CVars &out) { long ret = PHP_API_BAD_PARAM; - logfmt(logINFO, "LoginWrenchBoardAccount()"); + logfmt(logINFO, "WrenchEditJobs()"); REQ_STRING(in, "username", 5, 49, "(.*)"); REQ_STRING(in, "password", 5, 49, "(.*)"); REQ_STRING(in, "sessionid", 4, 40, "(.*)"); @@ -1199,7 +1214,7 @@ long WrenchEditJobs(CVars in, CVars &out) { } - logfmt(logINFO, "/LoginWrenchBoardAccount()"); + logfmt(logINFO, "/WrenchEditJobs()"); return ret; } diff --git a/www-api/app/Config/Constants.php b/www-api/app/Config/Constants.php index 44e77158..bbbf361b 100644 --- a/www-api/app/Config/Constants.php +++ b/www-api/app/Config/Constants.php @@ -95,6 +95,8 @@ define('EVENT_PRIORITY_HIGH', 10); +define('ADD_JOB', 10010); +define('UPDATE_JOB', 10020); define('PHP_API_OK', 0); define('PHP_LOGIN_OK', 100); diff --git a/www-api/app/Config/Routes.php b/www-api/app/Config/Routes.php index f8a9aa0e..64573175 100644 --- a/www-api/app/Config/Routes.php +++ b/www-api/app/Config/Routes.php @@ -76,6 +76,9 @@ $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/jobmanagercreatejob', 'WrenchApi::apigate'); +$routes->post('/en/wrench/api/v1/jobmanagerupdatejob', 'WrenchApi::apigate'); + $routes->post('/en/wrench/api/v1/familylist', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/familyadd', 'WrenchApi::apigate'); diff --git a/www-api/app/Controllers/WrenchApi.php b/www-api/app/Controllers/WrenchApi.php index c5eebc9d..a7721fcb 100644 --- a/www-api/app/Controllers/WrenchApi.php +++ b/www-api/app/Controllers/WrenchApi.php @@ -82,6 +82,8 @@ class WrenchApi extends BaseController 'jobmanageragree' => ['POST'], 'jobmanagerlist' => ['POST'], 'jobmanageroffers'=> ['POST'], + 'jobmanagercreatejob'=> ['POST'], + 'jobmanagerupdatejob'=> ['POST'], 'profilepasschange' => ['POST'], 'starttopup' => ['POST'], 'familylist' => ['POST'], @@ -109,7 +111,14 @@ class WrenchApi extends BaseController case 'familymanage': $in["action"] = WRENCHBOARD_FAMILY_MANAGE; break; - + case 'jobmanagercreatejob': + $in["action"] = WRENCHBOARD_JOB_CREATEJOB; + $in["job_mode"] = ADD_JOB; + break; + case 'jobmanagerupdatejob': + $in["action"] = WRENCHBOARD_JOB_CREATEJOB; + $in["job_mode"] = UPDATE_JOB; + break; case 'jobmanageroffers': $in["action"] = WRENCHBOARD_JOB_OFFERS; break; diff --git a/www-api/app/Models/ResultFormatter.php b/www-api/app/Models/ResultFormatter.php index bc8f146a..c24a3f80 100644 --- a/www-api/app/Models/ResultFormatter.php +++ b/www-api/app/Models/ResultFormatter.php @@ -100,7 +100,7 @@ class ResultFormatter extends Model "age" => $out["age_${key}"], "last_login" => '10-10-2024', "task_count" => rand(0,20), - "added" => '10-10-2024' + "added" => $out["added_${key}"], ); } diff --git a/www-api/public/svs/user/constants.php b/www-api/public/svs/user/constants.php index 3d577a5d..cb249c28 100755 --- a/www-api/public/svs/user/constants.php +++ b/www-api/public/svs/user/constants.php @@ -2,6 +2,8 @@ require_once 'config.php'; +define('ADD_JOB', 10010); +define('UPDATE_JOB', 10020); define('PHP_API_OK', 0); define('PHP_LOGIN_OK', 100); diff --git a/www-api/public/svs/user/formarter.php b/www-api/public/svs/user/formarter.php index e99044d3..f07672ca 100755 --- a/www-api/public/svs/user/formarter.php +++ b/www-api/public/svs/user/formarter.php @@ -94,7 +94,7 @@ function processOutJson($in, $out) { "age" => $out["age_${key}"], "last_login" => '10-10-2024', "task_count" => rand(0,20), - "added" => '10-10-2024' + "added" => $out["added_${key}"], ); } diff --git a/www-api/public/svs/user/userve.php b/www-api/public/svs/user/userve.php index 0428b104..f6cc02c2 100755 --- a/www-api/public/svs/user/userve.php +++ b/www-api/public/svs/user/userve.php @@ -61,6 +61,8 @@ $endpoints = array( 'jobmanageragree' => array('POST'), 'jobmanagerlist' => array('POST'), 'jobmanageroffers'=> array('POST'), + 'jobmanagercreatejob'=> array('POST'), + 'jobmanagerupdatejob'=> array('POST'), 'profilepasschange' => array('POST'), 'starttopup' => array('POST'), 'familylist' => array('POST'), @@ -144,7 +146,14 @@ switch ($endpoint) { case 'familymanage': $in["action"] = WRENCHBOARD_FAMILY_MANAGE; break; - + case 'jobmanagercreatejob': + $in["action"] = WRENCHBOARD_JOB_CREATEJOB; + $in["job_mode"] = ADD_JOB; + break; + case 'jobmanagerupdatejob': + $in["action"] = WRENCHBOARD_JOB_CREATEJOB; + $in["job_mode"] = UPDATE_JOB; + break; case 'jobmanageroffers': $in["action"] = WRENCHBOARD_JOB_OFFERS; break;