diff --git a/app/Http/Controllers/admin/PageController.php b/app/Http/Controllers/admin/PageController.php index 656ffcd..29f4f6a 100644 --- a/app/Http/Controllers/admin/PageController.php +++ b/app/Http/Controllers/admin/PageController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\admin; use App\Enums\ExaminationTypeEnum; use App\Http\Controllers\Controller; use App\Models\Admission; +use App\Models\Direction; use App\Models\EntranceExamination; use App\Models\Faculty; use App\Models\Subject; @@ -14,11 +15,11 @@ use Illuminate\Foundation\Application; class PageController extends Controller { - public function index(): View|Application|Factory|\Illuminate\Contracts\Foundation\Application - { - $admissions = Admission::all()->sortBy('position'); - return view('menu.reception-screen', compact('admissions')); - } +// public function index(): View|Application|Factory|\Illuminate\Contracts\Foundation\Application +// { +// $admissions = Admission::all()->sortBy('position'); +// return view('menu.reception-screen', compact('admissions')); +// } public function directions() { @@ -32,7 +33,21 @@ class PageController extends Controller $carry[$id] = $value; return $carry; }); - return view('new-design.bakalavr-special', compact('faculties', 'subjects')); + $directionsWithInstitution = Direction::with(['department']) + ->join('departments', 'directions.department_id', '=', 'departments.id') + ->join('faculties', 'departments.faculty_id', '=', 'faculties.id') + ->join( + 'educational_institutions', + 'faculties.educational_institution_id', + '=', + 'educational_institutions.id' + ) + ->get([ + 'directions.id', + 'directions.name', + "educational_institutions.name as educational_institution_name" + ]); + return view('new-design.bakalavr-special', compact('faculties', 'subjects', 'directionsWithInstitution')); }