From d9e1d15d94abbad1e65f12b6900006afc7cbf554 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Wed, 3 Jul 2024 23:00:33 -0400 Subject: [PATCH] added more data --- wrenchboard/src/shared_tool/account_mngt.cc | 39 +++++++++++++++++---- www-api/app/Models/ResultFormatter.php | 5 ++- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/wrenchboard/src/shared_tool/account_mngt.cc b/wrenchboard/src/shared_tool/account_mngt.cc index 6915e9db..2d0c4b5d 100644 --- a/wrenchboard/src/shared_tool/account_mngt.cc +++ b/wrenchboard/src/shared_tool/account_mngt.cc @@ -540,9 +540,14 @@ long WrenchMemberMarketMessages(CVars in, CVars &out) { const PGresult *res; - res = pgsql_query("SELECT to_char(mm.added, 'Day Mon dd, yyyy HH:MI AM') AS msg_date,mm.msg,mm.id AS msg_id ,mm.senders_id , mm.msg_type, " - " mm.memo,ms.firstname AS msg_from,mm.reply,mm.member_id,mm.uid,TRIM(mm.memo) AS memo FROM members_messages mm " - " LEFT JOIN members ms ON ms.id =mm.senders_id WHERE mm.senders_id = %lu %s %s" + res = pgsql_query("SELECT to_char(mm.added, 'Day Mon dd, yyyy HH:MI AM') AS msg_date,mm.msg,mm.id AS msg_id " + " ,mm.senders_id , mm.msg_type,j.title, j.description,mo.job_description, " + " mm.memo,ms.firstname AS msg_from,mm.reply,mm.member_id,mm.uid,TRIM(mm.memo) AS memo " + " FROM members_messages mm " + " LEFT JOIN members ms ON ms.id =mm.senders_id " + " LEFT JOIN members_jobs_offer mo ON mo.offer_code = mm.memo " + " LEFT JOIN members_jobs j ON j.id = mo.job_id " + " WHERE mm.senders_id = %lu %s %s" " ORDER BY msg_id DESC LIMIT %lu", in["member_id"].Long(),vname,vname_memo, limit); if (res != NULL && pgsql_num_rows(res) > 0) { @@ -554,6 +559,15 @@ long WrenchMemberMarketMessages(CVars in, CVars &out) { CVars rec; map_to_cvars(f, rec); + snprintf(vname, sizeof (vname), "title_%05d", i); + out[vname] = rec["title"]; + + snprintf(vname, sizeof (vname), "description_%05d", i); + out[vname] = rec["description"]; + + snprintf(vname, sizeof (vname), "job_description_%05d", i); + out[vname] = rec["job_description"]; + snprintf(vname, sizeof (vname), "msg_id_%05d", i); out[vname] = rec["msg_id"]; @@ -637,10 +651,14 @@ long WrenchMemberOwnerMarketMessages(CVars in, CVars &out) { out["total_record"] = "0"; const PGresult *res; - - res = pgsql_query("SELECT to_char(mm.added, 'Day Mon dd, yyyy HH:MI AM') AS msg_date,mm.msg,mm.id AS msg_id ,mm.senders_id , mm.msg_type,mm.uid, " +//SELECT * FROM members_jobs_offer WHERE offer_code ='47BB8B0W2B'; + res = pgsql_query("SELECT to_char(mm.added, 'Day Mon dd, yyyy HH:MI AM') AS msg_date,mm.msg,mm.id AS msg_id , " + " mm.senders_id , mm.msg_type,mm.uid, j.title, j.description,mo.job_description, " " mm.memo,ms.firstname AS msg_from,mm.reply,mm.member_id,mm.uid,TRIM(mm.memo) AS memo FROM members_messages mm " - " LEFT JOIN members ms ON ms.id =mm.senders_id WHERE mm.member_id = %lu %s %s" + " LEFT JOIN members ms ON ms.id =mm.senders_id " + " LEFT JOIN members_jobs_offer mo ON mo.offer_code = mm.memo " + " LEFT JOIN members_jobs j ON j.id = mo.job_id " + " WHERE mm.member_id = %lu %s %s AND mo.offer_code > now()" " ORDER BY msg_id DESC LIMIT %lu", in["member_id"].Long(),vname,vname_memo, limit); if (res != NULL && pgsql_num_rows(res) > 0) { @@ -652,6 +670,15 @@ long WrenchMemberOwnerMarketMessages(CVars in, CVars &out) { CVars rec; map_to_cvars(f, rec); + snprintf(vname, sizeof (vname), "title_%05d", i); + out[vname] = rec["title"]; + + snprintf(vname, sizeof (vname), "description_%05d", i); + out[vname] = rec["description"]; + + snprintf(vname, sizeof (vname), "job_description_%05d", i); + out[vname] = rec["job_description"]; + snprintf(vname, sizeof (vname), "msg_uid_%05d", i); out[vname] = rec["uid"]; diff --git a/www-api/app/Models/ResultFormatter.php b/www-api/app/Models/ResultFormatter.php index b5597f06..932e6abd 100644 --- a/www-api/app/Models/ResultFormatter.php +++ b/www-api/app/Models/ResultFormatter.php @@ -768,7 +768,10 @@ class ResultFormatter extends Model "reply" => $out["reply_${key}"], "message_mode" => $out["message_mode_${key}"], "uid" => $out["uid_${key}"], - "memo" => $out["memo_${key}"] + "memo" => $out["memo_${key}"], + "title" => $out["title_${key}"], + "description" => $out["description_${key}"], + "job_description" => $out["job_description_${key}"] ); } break;