prodV1 #2

Open
RomanGolienko wants to merge 309 commits from prodV1 into main
1 changed files with 21 additions and 6 deletions
Showing only changes of commit c3eed199ac - Show all commits

View File

@ -5,6 +5,7 @@ namespace App\Http\Controllers\admin;
use App\Enums\ExaminationTypeEnum; use App\Enums\ExaminationTypeEnum;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\Admission; use App\Models\Admission;
use App\Models\Direction;
use App\Models\EntranceExamination; use App\Models\EntranceExamination;
use App\Models\Faculty; use App\Models\Faculty;
use App\Models\Subject; use App\Models\Subject;
@ -14,11 +15,11 @@ use Illuminate\Foundation\Application;
class PageController extends Controller class PageController extends Controller
{ {
public function index(): View|Application|Factory|\Illuminate\Contracts\Foundation\Application // public function index(): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
{ // {
$admissions = Admission::all()->sortBy('position'); // $admissions = Admission::all()->sortBy('position');
return view('menu.reception-screen', compact('admissions')); // return view('menu.reception-screen', compact('admissions'));
} // }
public function directions() public function directions()
{ {
@ -32,7 +33,21 @@ class PageController extends Controller
$carry[$id] = $value; $carry[$id] = $value;
return $carry; 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'));
} }