WrenchBoard/WrenchBoradWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Active job list

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2023-05-18 10:27:38 -04:00
parent 1dfdebf8ca
commit c9983673b3
8 changed files with 75 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wrenchboard/src/include/contract.h
+1
View File
@@ -6,6 +6,7 @@
long contract_calls(CVars in, CVars &out);
long WrenchContractMessage( CVars in, CVars &out );
long WrenchContractStatus( CVars in, CVars &out );
long WrenchContractMessageList( CVars in, CVars &out );
#endif
wrenchboard/src/include/wrenchboard_api.h
+2
View File
@@ -255,6 +255,8 @@ enum { PARTNER_STRIPE };
#define WRENCHBOARD_CONTRACT_START 14000
#define WRENCHBOARD_CONTRACT_MESSAGE 14010
#define WRENCHBOARD_CONTRACT_MSGLIST 14011
#define WRENCHBOARD_CONTRACT_STATUS 14015
#define WRENCHBOARD_CONTRACT_END 14999
//**************************************************************
wrenchboard/src/shared_tool/contract.cc
+57 -16
View File
@@ -29,7 +29,10 @@ long contract_calls(CVars in, CVars &out)
case WRENCHBOARD_CONTRACT_STATUS:
return WrenchContractStatus( in, out);
break;
case WRENCHBOARD_CONTRACT_MSGLIST:
return WrenchContractMessageList( in, out);
break;
}
logfmt( logINFO, "/contract_calls()" );
return 0;
@@ -261,28 +264,66 @@ long WrenchContractMessage( CVars in, CVars &out )
return ret;
}
long WrenchEditJobs33( CVars in, CVars &out )
long WrenchContractMessageList( CVars in, CVars &out )
{
long ret = PHP_API_BAD_PARAM;
logfmt( logINFO, "LoginWrenchBoardAccount()" );
REQ_STRING (in, "username", 5, 49, "(.*)");
REQ_STRING (in, "password", 5, 49, "(.*)");
REQ_STRING (in, "sessionid", 4, 40, "(.*)");
OPTIONAL( in, "loc" ) REQ_STRING (in, "loc", 3, 15, "(.*)");
logfmt( logINFO, "WrenchContractMessageList()" );
const char * loc = getenv("REMOTE_ADDR");
in["loc"] = loc; in["loc"].set_valid(true);
ret = load_db_record( out, "SELECT *,id AS member_id FROM members WHERE status=1 AND LOWER(username)=LOWER('%s') AND password= md5('%s')", in["username"].c_str(), in["password"].c_str() );
if (ret) {
} else {
out["status"] = "Invalid username and/or password";
}
try {
long member_id = REQ_LONG(in, "member_id", 1, -1);
REQ_STRING (in, "contract", 10, 25, "(.*)");
out["total_record"] = "0";
const PGresult *res;
res = pgsql_query(" SELECT to_char(jc.created, 'YYYY-MM-DD HH24:MI') AS msg_date,"
" m.firstname AS msg_firstname,jc.id as msg_id,jc.message AS msg,"
" jc.msg_type, jc.message "
" FROM jobs_contract_message jc "
" LEFT JOIN members m ON m.id=jc.member_id "
" WHERE jc.contract='%s' ORDER by jc.id DESC", in["contract"].c_str());
if (res != NULL && pgsql_num_rows(res) > 0) {
out["total_record"] = pgsql_num_rows(res);
for (int i = 0, n = pgsql_num_rows(res); i < n; i++) {
map<const char*, const char*>f = pgsql_fetch_assoc(res, i);
if (f.empty()) continue;
CVars rec;
map_to_cvars(f, rec);
snprintf(vname, sizeof (vname), "msg_date_%05d", i);
out[vname] = rec["msg_date"];
snprintf(vname, sizeof (vname), "msg_firstname_%05d", i);
out[vname] = rec["msg_firstname"];
snprintf(vname, sizeof (vname), "msg_id_%05d", i);
out[vname] = rec["msg_id"];
snprintf(vname, sizeof (vname), "msg_%05d", i);
out[vname] = rec["msg"];
snprintf(vname, sizeof (vname), "msg_type_%05d", i);
out[vname] = rec["msg_type"];
snprintf(vname, sizeof (vname), "message_%05d", i);
out[vname] = rec["message"];
}
}
ret = PHP_API_OK;
out["status"] = "OK";
} catch (bad_parameter) {
logfmt(logINFO, "ERROR CALL long WrenchContractMessageList(CVars in, CVars &out)");
}
logfmt( logINFO, "/LoginWrenchBoardAccount()" );
logfmt( logINFO, "/WrenchContractMessageList()" );
return ret;
}
www-api/app/Config/Constants.php
+2 -1
View File
@@ -255,7 +255,8 @@ define('WRENCHBOARD_GROUP_END', 12999);
//**************************************************************
define('WRENCHBOARD_CONTRACT_MESSAGE', 14010);
define('WRENCHBOARD_CONTRACT_STATUS', 14015);
define('WRENCHBOARD_CONTRACT_MSGLIST', 14011);
define('WRENCHBOARD_CONTRACT_STATUS', 14015);
define('WRENCHBOARD_MOBILE_OFFERSLIST', 15010);
www-api/app/Config/Routes.php
+2
View File
@@ -106,6 +106,8 @@ $routes->post('/en/wrench/api/v1/sendmoneyfee', 'WrenchApi::apigate');
$routes->post('/en/wrench/api/v1/getpendingjobs', 'WrenchApi::apigate');
$routes->post('/en/wrench/api/v1/taskmessage', 'WrenchApi::apigate');
$routes->post('/en/wrench/api/v1/sendtaskmessage', 'WrenchApi::apigate');
$routes->post('/en/wrench/api/v1/activejobmsglist', 'WrenchApi::apigate');
$routes->post('/en/wrench/api/v1/getwallets', 'WrenchApi::apigate');
$routes->post('/en/wrench/api/v1/sitecontact', 'WrenchApi::apigate');
$routes->post('/en/wrench/api/v1/signupcountry', 'WrenchApi::apigate');
www-api/app/Controllers/WrenchApi.php
+4 -1
View File
@@ -61,6 +61,7 @@ class WrenchApi extends BaseController
'getpendingjobs' => ['POST'],
'taskmessage' => ['POST'],
'sendtaskmessage' => ['POST'],
'activejobmsglist' => ['POST'],
'getwallets' => ['POST'],
'sitecontact' => ['POST'],
'signupcountry' => ['POST'],
@@ -354,7 +355,9 @@ class WrenchApi extends BaseController
break;
case 'sendtaskmessage': $in["action"] = WRENCHBOARD_MOBILE_SENDTASKMESSAGE;
break;
case 'activejobmsglist':
$in["action"] = WRENCHBOARD_CONTRACT_MSGLIST;
break;
case 'getwallets': $in["action"] = WRENCHBOARD_ACCOUNT_WALLETS;
break;
case WRENCHBOARD_ACCOUNT_PRICE_COMBO: break ; // 11171);
www-api/public/svs/user/constants.php
+3 -1
View File
@@ -164,7 +164,9 @@ define('WRENCHBOARD_FAMILY_ADD', 22015);
define('WRENCHBOARD_FAMILY_UPDATE', 22020);
define('WRENCHBOARD_FAMILY_MANAGE', 22025);
define('WRENCHBOARD_CONTRACT_MESSAGE', 14010);
define('WRENCHBOARD_CONTRACT_MESSAGE', 14010);
define('WRENCHBOARD_CONTRACT_MSGLIST', 14011);
define('WRENCHBOARD_CONTRACT_STATUS', 14015);
www-api/public/svs/user/userve.php
+4 -1
View File
@@ -41,6 +41,7 @@ $endpoints = array(
'getpendingjobs' => array('POST'),
'taskmessage' => array('POST'),
'sendtaskmessage' => array('POST'),
'activejobmsglist' => array('POST'),
'getwallets' => array('POST'),
'sitecontact' => array('POST'),
'signupcountry' => array('POST'),
@@ -383,7 +384,9 @@ switch ($endpoint) {
break;
case 'sendtaskmessage': $in["action"] = WRENCHBOARD_MOBILE_SENDTASKMESSAGE;
break;
case 'activejobmsglist':
$in["action"] = WRENCHBOARD_CONTRACT_MSGLIST;
break;
case 'getwallets': $in["action"] = WRENCHBOARD_ACCOUNT_WALLETS;
break;