diff --git a/www-api/app/Controllers/BaseController.php b/www-api/app/Controllers/BaseController.php index 0b90b812..82ed3bfd 100644 --- a/www-api/app/Controllers/BaseController.php +++ b/www-api/app/Controllers/BaseController.php @@ -498,6 +498,10 @@ wrenchboard=# $final_out["offers_list"] = $extraOut['offers_list']; } + if( isset( $extraOut['activetaskslist'])){ + $final_out["active_tasks_list"] = $extraOut['activetaskslist']; + } + $final_out["environment"] = $this->current_env + 0; $final_out["session_image_server"] = $this->primary_image_sever; $final_out["server_tag"] = $this->server_tag; diff --git a/www-api/app/Controllers/WrenchBanners.php b/www-api/app/Controllers/WrenchBanners.php index f066d0a5..44b0f431 100644 --- a/www-api/app/Controllers/WrenchBanners.php +++ b/www-api/app/Controllers/WrenchBanners.php @@ -39,7 +39,23 @@ class WrenchBanners extends BaseController // } // return $this->summaryReturnData($in,$out); //json_encode( $final_out ); // } +//activetaskslist + private function bannerGetActiveTasks($in){ + $in["action"] = WRENCHBOARD_JOB_USERACTIVE; + $endpoint = "BANNERS_ACTIVETASK-". $in["uid"]; // str_pad($in["uid"], 12, "0", STR_PAD_LEFT); + $wrenchboard = new \App\Models\BackendModel(); + $out = $this->getCache($endpoint); + if (count($out)==0){ + $in["limit"] = 10; + $in["page"] = 0; + $ret= $wrenchboard->wrenchboard_api($in, $out); + $out['internal_return'] = $ret; + $this->saveCache($endpoint,$out,100); + } + $res = ( new \App\Models\ResultFormatter() )->processOutJson($in, $out); + return $res['result_list']; + } private function bannerGetOffers($in){ $in["action"] = WRENCHBOARD_MOBILE_OFFERSLIST; $endpoint = "BANNERS_OFFERS-". $in["uid"]; // str_pad($in["uid"], 12, "0", STR_PAD_LEFT); @@ -75,6 +91,7 @@ class WrenchBanners extends BaseController } $extra_out["offers_list"] = $this->bannerGetOffers($in); + $extra_out["activetaskslist"] = $this->bannerGetActiveTasks($in); return $this->summaryReturnData($in,$out, $extra_out); //json_encode( $final_out );