diff --git a/www-api/app/Controllers/BaseController.php b/www-api/app/Controllers/BaseController.php index 02f28cda..62632e70 100644 --- a/www-api/app/Controllers/BaseController.php +++ b/www-api/app/Controllers/BaseController.php @@ -232,7 +232,7 @@ abstract class BaseController extends Controller */ $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) { case 'NOTIFY_COMPLETE': // notify completed $data['job_action'] = CONTRACT_NOTIFY_COMPLETE; diff --git a/www-api/app/Models/ResultFormatter.php b/www-api/app/Models/ResultFormatter.php index 0904ffdd..cd82aba4 100644 --- a/www-api/app/Models/ResultFormatter.php +++ b/www-api/app/Models/ResultFormatter.php @@ -132,6 +132,7 @@ class ResultFormatter extends Model $key = sprintf("%05d", $i); $status_no = $out["status_${key}"]; $statusTxt = $this->suggestedStatusText($status_no); + $banner_img = ( $out["banner_${key}"] !="" ) ? $out["banner_${key}"] : 'default.jpg'; $res["result_list"][] = array( "uid" => $out["uid_${key}"], "family_uid" => $out["family_uid_${key}"], @@ -140,7 +141,7 @@ class ResultFormatter extends Model "added" => $out["added_${key}"], "status" => $out["status_${key}"], "status_text" => $statusTxt , - "banner" => $out["banner_${key}"], + "banner" => $banner_img, "firstname" => $out["firstname_${key}"], ); } @@ -155,13 +156,14 @@ class ResultFormatter extends Model ); for ($i = 0; $i < $total; $i++) { $key = sprintf("%05d", $i); + $banner_img = ( $out["banner_${key}"] !="" ) ? $out["banner_${key}"] : 'default.jpg'; $res["result_list"][] = array( "uid" => $out["uid_${key}"], "description" => $out["description_${key}"], "title" => $out["title_${key}"], "added" => $out["added_${key}"], "age" => $out["age_${key}"], - "banner" => $out["banner_${key}"], + "banner" => $banner_img, ); } break;