From 7123bd94f7592990acaed3eb6246effe174158d0 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 14 May 2023 15:31:59 -0400 Subject: [PATCH] format active jobs --- wrenchboard/src/shared_tool/jobs_manager.cc | 6 +++--- www-api/app/Models/ResultFormatter.php | 1 + www-api/public/svs/user/formarter.php | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/wrenchboard/src/shared_tool/jobs_manager.cc b/wrenchboard/src/shared_tool/jobs_manager.cc index 46b8c5f8..49bb6fe3 100644 --- a/wrenchboard/src/shared_tool/jobs_manager.cc +++ b/wrenchboard/src/shared_tool/jobs_manager.cc @@ -268,7 +268,7 @@ return 0; long WrenchJobManagerActiveTasksList(CVars in, CVars &out) { - logfmt(logINFO, "WrenchMemberActiveJobs()"); + logfmt(logINFO, "WrenchJobManagerActiveTasksList()"); char vname[30]; long ret = PHP_API_BAD_PARAM; @@ -341,9 +341,9 @@ long WrenchJobManagerActiveTasksList(CVars in, CVars &out) { ret = PHP_API_OK; out["status"] = "OK"; } catch (bad_parameter) { - logfmt(logINFO, "ERROR CALL long WrenchMemberActiveJobs(CVars in, CVars &out)"); + logfmt(logINFO, "ERROR CALL long WrenchJobManagerActiveTasksList(CVars in, CVars &out)"); } - logfmt(logINFO, "/WrenchMemberActiveJobs()"); + logfmt(logINFO, "/WrenchJobManagerActiveTasksList()"); return ret; diff --git a/www-api/app/Models/ResultFormatter.php b/www-api/app/Models/ResultFormatter.php index a4f7ef1e..ffe917cf 100644 --- a/www-api/app/Models/ResultFormatter.php +++ b/www-api/app/Models/ResultFormatter.php @@ -220,6 +220,7 @@ class ResultFormatter extends Model case WRENCHBOARD_MOBILE_OFFERSLIST: case WRENCHBOARD_JOB_LISTJOBS: case WRENCHBOARD_JOB_OFFERS: + case WRENCHBOARD_JOB_ACTIVE: $total = $out["total_record"]; $res = array( diff --git a/www-api/public/svs/user/formarter.php b/www-api/public/svs/user/formarter.php index b1c4590d..4d8f1039 100755 --- a/www-api/public/svs/user/formarter.php +++ b/www-api/public/svs/user/formarter.php @@ -215,7 +215,9 @@ function processOutJson($in, $out) { case WRENCHBOARD_MOBILE_ACTIVEJOB: case WRENCHBOARD_MOBILE_OFFERSLIST: case WRENCHBOARD_JOB_LISTJOBS: - /* case WRENCHBOARD_JOB_OFFERS: */ + case WRENCHBOARD_JOB_ACTIVE: + + /* case WRENCHBOARD_JOB_OFFERS: */ $total = $out["total_record"]; $res = array(