Merge branch 'master' of itcorp.primaya.id:rajif/aso
This commit is contained in:
@@ -8,8 +8,8 @@ use Illuminate\Routing\Controller;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Modules\Linksehat\Transformers\Dashboard\DoctorResource as DoctorResourceDashboard;
|
||||
use Modules\Linksehat\Transformers\Dashboard\HospitalResource as HospitalResourceDashboard;
|
||||
use Modules\Linksehat\Transformers\Dashboard\ArticleResource as ArticleResourceDashboard;
|
||||
use Modules\Linksehat\Transformers\Hospital\HospitalResource;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
|
||||
class DashboardController extends Controller
|
||||
@@ -38,21 +38,24 @@ class DashboardController extends Controller
|
||||
$queryHospitals = Organization::query()
|
||||
->leftJoin('addresses', function ($query) {
|
||||
$query->on('organizations.main_address_id', '=', 'addresses.id');
|
||||
$query->where('addresses.addressable_type', '=', Organization::class);
|
||||
})
|
||||
->leftJoin('cities', function ($query) {
|
||||
$query->on('addresses.city_id', '=', 'cities.id');
|
||||
})
|
||||
->where('addresses.addressable_type', '=', Organization::class)
|
||||
->where('organizations.type', 'hospital')
|
||||
->where('organizations.status', 'active')
|
||||
->when($request->lat && $request->lng, function ($query) use ($request) {
|
||||
$query->selectRaw("organizations.id, organizations.name, addresses.text AS currentAddress, 6371 * acos (cos ( radians($request->lat) ) * cos( radians( addresses.lat ) ) * cos( radians( addresses.lng ) - radians($request->lng) ) + sin ( radians($request->lat) ) * sin( radians( addresses.lat ) )) as distance");
|
||||
$query->selectRaw("organizations.id, organizations.name, addresses.text AS address, cities.name AS city_name, 6371 * acos (cos ( radians($request->lat) ) * cos( radians( addresses.lat ) ) * cos( radians( addresses.lng ) - radians($request->lng) ) + sin ( radians($request->lat) ) * sin( radians( addresses.lat ) )) as distance");
|
||||
$query->orderBy('distance', 'ASC');
|
||||
}, function ($query) {
|
||||
$query->select(['organizations.id', 'organizations.name', 'addresses.text AS currentAddress']);
|
||||
$query->select(['organizations.id', 'organizations.name', 'addresses.text AS address', 'cities.name AS city_name']);
|
||||
$query->orderBy('organizations.name', 'asc');
|
||||
})
|
||||
->limit($limit)
|
||||
->get();
|
||||
|
||||
$data = HospitalResourceDashboard::collection($queryHospitals);
|
||||
$data = HospitalResource::collection($queryHospitals);
|
||||
} elseif ($query === 'articles') {
|
||||
$data = ArticleResourceDashboard::collection(json_decode(Http::get('https://linksehat.com/api/medical-assistance-articles')));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user