From aeff548da3eab0a550306a05437300114984cab9 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sat, 15 Jul 2023 10:22:35 -0400 Subject: [PATCH] msg uid --- wrenchboard/src/shared_tool/contract.cc | 5 ++++- www-api/app/Models/ResultFormatter.php | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/wrenchboard/src/shared_tool/contract.cc b/wrenchboard/src/shared_tool/contract.cc index 09a6ae81..5ed82ded 100644 --- a/wrenchboard/src/shared_tool/contract.cc +++ b/wrenchboard/src/shared_tool/contract.cc @@ -321,7 +321,7 @@ long WrenchContractMessageList( CVars in, CVars &out ) 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,jc.member_id AS sender_id " + " jc.msg_type, jc.message,jc.member_id AS sender_id, jc.uid AS msg_uid " " 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()); @@ -353,6 +353,9 @@ long WrenchContractMessageList( CVars in, CVars &out ) snprintf(vname, sizeof (vname), "message_%05d", i); out[vname] = rec["message"]; + snprintf(vname, sizeof (vname), "msg_uid_%05d", i); + out[vname] = rec["msg_uid"]; + snprintf(vname, sizeof (vname), "who_%05d", i); if( rec["sender_id"].Long() == member_id){ out[vname] = "SENDER"; diff --git a/www-api/app/Models/ResultFormatter.php b/www-api/app/Models/ResultFormatter.php index 2afa0af7..10262ab1 100644 --- a/www-api/app/Models/ResultFormatter.php +++ b/www-api/app/Models/ResultFormatter.php @@ -300,6 +300,7 @@ class ResultFormatter extends Model "msg_id" => $out["msg_id_${key}"], "msg_type" => $out["msg_type_${key}"], "who" => $out["who_${key}"], + "msg_uid" => $out["msg_uid_${key}"], ); } break;