WrenchBoard/WrenchBoradWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

minimum_due

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2024-10-03 04:35:17 -04:00
parent 1ab4a71543
commit 4efc69f411
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wrenchboard/src/shared_tool/jobs_manager.cc
+3 -3
View File
@@ -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"];
www-api/app/Models/ResultFormatter.php
+3 -1
View File
@@ -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}"]
);
}