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

banner error

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2023-08-07 07:06:47 -04:00
parent 0d518c15a5
commit a3d395d3ce
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www-api/app/Controllers/BaseController.php
+1 -1
View File
@@ -232,7 +232,7 @@ abstract class BaseController extends Controller
*/ */
$incoming_job_action = $data['job_action']; $incoming_job_action = $data['job_action'];
$data['job_action'] = -1; // we dont know yet $data['job_action'] = -1; // we dont know yet
switch ($incoming_job_action) { switch ($incoming_job_action) {
case 'NOTIFY_COMPLETE': // notify completed case 'NOTIFY_COMPLETE': // notify completed
$data['job_action'] = CONTRACT_NOTIFY_COMPLETE; $data['job_action'] = CONTRACT_NOTIFY_COMPLETE;
www-api/app/Models/ResultFormatter.php
+4 -2
View File
@@ -132,6 +132,7 @@ class ResultFormatter extends Model
$key = sprintf("%05d", $i); $key = sprintf("%05d", $i);
$status_no = $out["status_${key}"]; $status_no = $out["status_${key}"];
$statusTxt = $this->suggestedStatusText($status_no); $statusTxt = $this->suggestedStatusText($status_no);
$banner_img = ( $out["banner_${key}"] !="" ) ? $out["banner_${key}"] : 'default.jpg';
$res["result_list"][] = array( $res["result_list"][] = array(
"uid" => $out["uid_${key}"], "uid" => $out["uid_${key}"],
"family_uid" => $out["family_uid_${key}"], "family_uid" => $out["family_uid_${key}"],
@@ -140,7 +141,7 @@ class ResultFormatter extends Model
"added" => $out["added_${key}"], "added" => $out["added_${key}"],
"status" => $out["status_${key}"], "status" => $out["status_${key}"],
"status_text" => $statusTxt , "status_text" => $statusTxt ,
"banner" => $out["banner_${key}"], "banner" => $banner_img,
"firstname" => $out["firstname_${key}"], "firstname" => $out["firstname_${key}"],
); );
} }
@@ -155,13 +156,14 @@ class ResultFormatter extends Model
); );
for ($i = 0; $i < $total; $i++) { for ($i = 0; $i < $total; $i++) {
$key = sprintf("%05d", $i); $key = sprintf("%05d", $i);
$banner_img = ( $out["banner_${key}"] !="" ) ? $out["banner_${key}"] : 'default.jpg';
$res["result_list"][] = array( $res["result_list"][] = array(
"uid" => $out["uid_${key}"], "uid" => $out["uid_${key}"],
"description" => $out["description_${key}"], "description" => $out["description_${key}"],
"title" => $out["title_${key}"], "title" => $out["title_${key}"],
"added" => $out["added_${key}"], "added" => $out["added_${key}"],
"age" => $out["age_${key}"], "age" => $out["age_${key}"],
"banner" => $out["banner_${key}"], "banner" => $banner_img,
); );
} }
break; break;