From 4efc69f41103c782923c210114ec2297a8f714f6 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Thu, 3 Oct 2024 04:35:17 -0400
Subject: [PATCH] minimum_due

---
 wrenchboard/src/shared_tool/jobs_manager.cc | 6 +++---
 www-api/app/Models/ResultFormatter.php      | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/wrenchboard/src/shared_tool/jobs_manager.cc b/wrenchboard/src/shared_tool/jobs_manager.cc
index 0923176c..5f53b54b 100644
--- a/wrenchboard/src/shared_tool/jobs_manager.cc
+++ b/wrenchboard/src/shared_tool/jobs_manager.cc
@@ -602,7 +602,7 @@ long WrenchUsersActiveTasksList(CVars in, CVars &out) {
         const PGresult *res;
         res = pgsql_query("SELECT mc.id AS contract_id, mc.job_id AS job_id, mc.price, mc.timeline_days,mc.contract,mc.strict_timeline, "
                 "  mj.title, mj.description AS description,mc.job_detail AS job_description,mc.uid AS contract_uid, mj.job_type AS job_type, mj.media_uid AS media_uid, "
-                "  mj.banner AS banner, c.code AS currency_code, c.description AS currency_description, mj.uid AS job_uid, "
+                "  mj.banner AS banner, c.code AS currency_code, c.description AS currency_description, mj.uid AS job_uid, (mc.delivery_date - interval ' 10 hours') AS minimum_due,"
                 " (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' "
@@ -627,8 +627,8 @@ long WrenchUsersActiveTasksList(CVars in, CVars &out) {
 				snprintf(vname, sizeof (vname), "id_%05d", i);
                 out[vname] = rec["contract_id"];
 
-			//	snprintf(vname, sizeof (vname), "strict_timeline_%05d", i);
-             //   out[vname] = rec["strict_timeline"];
+			    snprintf(vname, sizeof (vname), "minimum_due_%05d", i);
+                out[vname] = rec["minimum_due"];
 
                 snprintf(vname, sizeof (vname), "job_detail_%05d", i);
                 out[vname] = rec["job_description"];
diff --git a/www-api/app/Models/ResultFormatter.php b/www-api/app/Models/ResultFormatter.php
index 1ad55e88..e8756a07 100644
--- a/www-api/app/Models/ResultFormatter.php
+++ b/www-api/app/Models/ResultFormatter.php
@@ -769,7 +769,9 @@ class ResultFormatter extends Model
                         'ext_request' => $out["ext_request_${key}"],
                         'category' => $this->dummyGetCategory( $cateG ),
                         'depend_uid' => $out["depend_uid_${key}"],
-                        'strict_timeline' => $out["strict_timeline_${key}"]
+                        'strict_timeline' => $out["strict_timeline_${key}"],
+                        'minimum_due' => $out["minimum_due_${key}"]
+
                     );
                 }