diff --git a/wrenchboard/src/shared_tool/jobs_manager.cc b/wrenchboard/src/shared_tool/jobs_manager.cc index d54ddaf9..e844e6d4 100644 --- a/wrenchboard/src/shared_tool/jobs_manager.cc +++ b/wrenchboard/src/shared_tool/jobs_manager.cc @@ -383,7 +383,7 @@ long WrenchJobManagerActiveTasksList(CVars in, CVars &out) { " (CASE WHEN mc.status=4 THEN 'REVIEW' " " WHEN mc.status = 1 AND mc.delivery_date > now() THEN 'ACTIVE' " " WHEN mc.status = 1 AND mc.delivery_date < now() THEN 'PASTDUE' " - " ELSE 'OTHERS' END) AS status_description,mc.delivery_date, " + " ELSE 'OTHERS' END) AS status_description,mc.delivery_date, mc.ext_request AS ext_request, " " (CASE WHEN mc.member_id = %lu THEN 'OWNER' ELSE 'WORKER' END) AS owner_status, m.firstname AS job_to, " " c.code AS currency_code, c.description AS currency_description,mj.country, mf.uid AS family_uid " " FROM members_jobs_contract mc " @@ -445,6 +445,9 @@ long WrenchJobManagerActiveTasksList(CVars in, CVars &out) { snprintf(vname, sizeof (vname), "price_%05d", i); out[vname] = rec["price"]; + snprintf(vname, sizeof (vname), "ext_request_%05d", i); + out[vname] = rec["ext_request"]; + snprintf(vname, sizeof (vname), "job_id_%05d", i); out[vname] = rec["job_id"]; diff --git a/www-api/app/Models/ResultFormatter.php b/www-api/app/Models/ResultFormatter.php index 99cfc1ba..881391ae 100644 --- a/www-api/app/Models/ResultFormatter.php +++ b/www-api/app/Models/ResultFormatter.php @@ -618,6 +618,7 @@ class ResultFormatter extends Model 'currency_code' => $out["currency_code_${key}"], "banner" => $this->fixEmptyBanner( $out["banner_${key}"]), 'interest_count' => $out["${$int_c}"] ?? 0, + 'ext_request' => $out["ext_request_${key}"], 'category' => $this->dummyGetCategory( $cateG ) ); }