From 359541c1a29161a563c0ee6b77529e710954288b Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Tue, 27 Jun 2023 16:21:57 -0400 Subject: [PATCH] Jobs currency --- wrenchboard/src/shared_tool/jobs_manager.cc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/wrenchboard/src/shared_tool/jobs_manager.cc b/wrenchboard/src/shared_tool/jobs_manager.cc index ecdf262c..c409e523 100644 --- a/wrenchboard/src/shared_tool/jobs_manager.cc +++ b/wrenchboard/src/shared_tool/jobs_manager.cc @@ -362,8 +362,10 @@ long WrenchJobManagerActiveTasksList(CVars in, CVars &out) { " 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, " - " (CASE WHEN mc.member_id = %lu THEN 'OWNER' ELSE 'WORKER' END) AS owner_status, m.firstname AS job_to " + " (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 " " FROM members_jobs_contract mc LEFT JOIN members_jobs mj ON mj.id = mc.job_id LEFT JOIN members m ON m.id=mc.client_id " + " LEFT JOIN currency c ON c.country=mj.country " " WHERE mc.member_id =%lu %s %s %s " " ORDER BY mc.id DESC LIMIT %lu OFFSET %lu", member_id, member_id ,extra_filter, status_no_filter, status_filter, limit, offset); //ORDER BY id DESC LIMIT %lu OFFSET %lu", in["member_id"].Long(), limit, offset); @@ -430,6 +432,15 @@ long WrenchJobManagerActiveTasksList(CVars in, CVars &out) { snprintf(vname, sizeof (vname), "contract_uid_%05d", i); out[vname] = rec["contract_uid"]; + snprintf(vname, sizeof (vname), "job_country_%05d", i); + out[vname] = rec["job_country"]; + + snprintf(vname, sizeof (vname), "currency_%05d", i); + out[vname] = rec["currency_description"]; + + snprintf(vname, sizeof (vname), "currency_code_%05d", i); + out[vname] = rec["currency_code"]; + } } ret = PHP_API_OK;