Merge branch 'master' of ssh://gitlab.chiefsoft.net/WrenchBoard/WrenchBoradWeb

wrenchboard/src/include/wrenchboard_api.h

@@ -223,6 +223,7 @@ enum { PARTNER_STRIPE };
 //**************************************************************
 #define WRENCHBOARD_JOBS_START          13000
 
+#define WRENCHBOARD_JOB_POSTAGREE        13002
 #define WRENCHBOARD_JOB_LISTJOBS         13005
 #define WRENCHBOARD_JOB_OFFERS           13006
 

wrenchboard/src/shared_tool/jobs.cc

@@ -21,6 +21,8 @@
 long WrenchJobsQuestion(CVars in, CVars &out);
 long WrenchMarketInterestQuestion(CVars in, CVars &out);
 long WrenchReplyMessage(CVars in, CVars &out);
+long WrenchJobPostAgree(CVars in, CVars &out);
+
 
 long jobs_calls(CVars in, CVars &out) {
     logfmt(logINFO, "jobs_calls()");
@@ -28,6 +30,9 @@ long jobs_calls(CVars in, CVars &out) {
     long action = REQ_LONG(in, "action", 0, -1);
     logfmt(logINFO, "jobs_calls() action=%lu",action);
     switch (action) {
+        case WRENCHBOARD_JOB_POSTAGREE:
+            return WrenchJobPostAgree(in, out);
+        break;
         case WRENCHBOARD_JOB_LISTJOBS:
             return WrenchJobManagerList(in, out);
             break;
@@ -97,6 +102,28 @@ long jobs_calls(CVars in, CVars &out) {
     return 0;
 }
 
+long WrenchJobPostAgree(CVars in, CVars &out) {
+ logfmt(logINFO, "WrenchJobPostAgree()");
+    long ret = PHP_API_BAD_PARAM;
+    try {
+            long member_id = REQ_LONG(in, "member_id", 1, -1);
+            REQ_STRING(in, "uid", 1, 500, "(.*)"); //uid
+            if (load_db_record(out, "SELECT id AS member_id, * FROM members WHERE id  = %lu AND uid='%s' AND post_jobs IS NULL", in["member_id"].Long(), in["uid"].c_str()) ){
+                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());
+                }
+            }
+            ret = PHP_CREATED_OK;
+    } catch (bad_parameter) {
+        out["log_status"] = "Error WrenchMarketInterestQuestion";
+    }
+    logfmt(logINFO, "/WrenchJobPostAgree()");
+    return ret;
+}
+
+
 long WrenchReplyMessage(CVars in, CVars &out) {
     long member_id = REQ_LONG(in, "member_id", 1, -1);
     long message_id = REQ_LONG(in, "message_id", 1, -1);

www-api/app/Config/Constants.php

@@ -215,6 +215,7 @@ define('WRENCHBOARD_ACCOUNT_HOMEBANNERS',  11200);
 define('WRENCHBOARD_USER_DELETEACC',  11990);
 define('WRENCHBOARD_ACCOUNT_END', 11999);
 //**************************************************************
+define('WRENCHBOARD_JOB_POSTAGREE', 13002);
 define('WRENCHBOARD_JOB_LISTJOBS',  13005);
 define('WRENCHBOARD_JOB_OFFERS',    13006);
 

www-api/app/Config/Routes.php

@@ -73,8 +73,9 @@ $routes->post('/en/wrench/api/v1/stepresetpass',       'WrenchApi::apigate');
 $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/jobmanageroffers',        'WrenchApi::apigate');
 
 $routes->post('/en/wrench/api/v1/familylist',          'WrenchApi::apigate');
 $routes->post('/en/wrench/api/v1/familyadd',           'WrenchApi::apigate');

www-api/app/Controllers/WrenchApi.php

@@ -79,6 +79,7 @@ class WrenchApi extends BaseController
             'sendreferral' => ['POST'],
             'refferhx' => ['POST'],
             'accounttypes' => ['POST'],
+            'jobmanageragree' => ['POST'],
             'jobmanagerlist' => ['POST'],
             'jobmanageroffers'=> ['POST'],
             'profilepasschange' => ['POST'],
@@ -126,6 +127,9 @@ class WrenchApi extends BaseController
             case 'addrecipient':
                 $in["action"] =  WRENCHBOARD_ACCOUNT_ADD_RECIPEINT;
                 break;
+            case 'jobmanageragree':
+                $in["action"] =  WRENCHBOARD_JOB_POSTAGREE;
+                break;
             case 'jobmanagerlist':
                 $in["action"] =  WRENCHBOARD_JOB_LISTJOBS;
                 break;

www-api/app/Models/ResultFormatter.php

@@ -97,7 +97,10 @@ class ResultFormatter extends Model
                         "uid" => $out["uid_${key}"],
                         "firstname" => $out["firstname_${key}"],
                         "lastname" => $out["lastname_${key}"],
-                        "age" => $out["age_${key}"]
+                        "age" => $out["age_${key}"],
+                        "last_login" => '10-10-2024',
+                        "task_count" => rand(0,20),
+                        "added" => '10-10-2024'
                     );
                 }
 

www-api/public/svs/user/constants.php

@@ -121,6 +121,7 @@ define('WRENCHBOARD_ACCOUNT_HOMEBANNERS',  11200);
 define('WRENCHBOARD_USER_DELETEACC',  11990);
 define('WRENCHBOARD_ACCOUNT_END', 11999);
 //**************************************************************
+define('WRENCHBOARD_JOB_POSTAGREE', 13002);
 define('WRENCHBOARD_JOB_LISTJOBS',  13005);
 define('WRENCHBOARD_JOB_OFFERS',    13006);
 define('WRENCHBOARD_JOB_CREATEJOB',13010 );       

www-api/public/svs/user/formarter.php

@@ -91,7 +91,10 @@ function processOutJson($in, $out) {
                     "uid" => $out["uid_${key}"],
                     "firstname" => $out["firstname_${key}"],
                     "lastname" => $out["lastname_${key}"],
-                    "age" => $out["age_${key}"]
+                    "age" => $out["age_${key}"],
+                    "last_login" => '10-10-2024',
+                    "task_count" => rand(0,20),
+                    "added" => '10-10-2024'
                 );
             }
 

www-api/public/svs/user/userve.php

@@ -58,6 +58,7 @@ $endpoints = array(
     'sendreferral' => array('POST'),
     'refferhx' => array('POST'),
     'accounttypes' => array('POST'),
+    'jobmanageragree' => array('POST'),
     'jobmanagerlist' => array('POST'),
     'jobmanageroffers'=> array('POST'),
     'profilepasschange' => array('POST'),
@@ -161,6 +162,9 @@ switch ($endpoint) {
     case 'addrecipient':
         $in["action"] =  WRENCHBOARD_ACCOUNT_ADD_RECIPEINT;
         break;
+    case 'jobmanageragree':
+            $in["action"] =  WRENCHBOARD_JOB_POSTAGREE;
+            break;
     case 'jobmanagerlist':
         $in["action"] =  WRENCHBOARD_JOB_LISTJOBS;
         break;