diff --git a/app/Http/Controllers/admin/Catalog/DirectionController.php b/app/Http/Controllers/admin/Catalog/DirectionController.php index 04d314e..c50c793 100644 --- a/app/Http/Controllers/admin/Catalog/DirectionController.php +++ b/app/Http/Controllers/admin/Catalog/DirectionController.php @@ -4,10 +4,10 @@ namespace App\Http\Controllers\admin\Catalog; use App\Http\Controllers\Controller; use App\Http\Requests\admin\Catalog\StoreDirectionRequest; -use App\Http\Requests\admin\Catalog\UpdateDepartmentRequest; use App\Http\Requests\admin\Catalog\UpdateDirectionRequest; use App\Models\Department; use App\Models\Direction; +use App\Models\Faculty; use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\View; use Illuminate\Foundation\Application; @@ -44,7 +44,18 @@ class DirectionController extends Controller public function show(Direction $direction): View|Application|Factory|\Illuminate\Contracts\Foundation\Application { - return view('admin.catalog.direction.show', compact('direction')); + $department = $direction->department; + $faculty = Faculty::find($department->faculty->id); + $educationalInstitution = $faculty->educationalInstitution; + return view( + 'admin.catalog.direction.show', + compact( + 'direction', + 'educationalInstitution', + 'faculty', + 'department', + ) + ); } public function edit(Direction $direction): View|Application|Factory|\Illuminate\Contracts\Foundation\Application diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index b699bca..45fe4a2 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -2,8 +2,6 @@ namespace Database\Seeders; -// use Illuminate\Database\Console\Seeds\WithoutModelEvents; -use App\Models\Faculty; use App\Models\User; use Illuminate\Database\Seeder; @@ -14,19 +12,21 @@ class DatabaseSeeder extends Seeder */ public function run(): void { -// User::factory(10)->create(); -// - User::factory()->create([ - 'name' => 'admin', - 'email' => 'test@example.com', - 'password' => 123456 - ]); + User::factory()->create([ + 'name' => 'admin', + 'email' => 'test@example.com', + 'password' => 123456 + ]); + + User::factory(10)->create(); + $this->call([ ReceptionScreenSeeder::class, - FileSeeder::class, + DocumentSeeder::class, EducationalInstitutionSeeder::class, FacultySeeder::class, DepartmentSeeder::class, + DirectionSeeder::class, ]); } } diff --git a/resources/views/admin/catalog/direction/show.blade.php b/resources/views/admin/catalog/direction/show.blade.php index 1736ceb..d3b6f8e 100644 --- a/resources/views/admin/catalog/direction/show.blade.php +++ b/resources/views/admin/catalog/direction/show.blade.php @@ -1,13 +1,3 @@ -@php - use App\Models\Direction; - use App\Models\Department; - use App\Models\EducationalInstitution;use App\Models\Faculty;use Illuminate\Support\Collection; - /** @var Collection|Direction[] $direction */ - - $department = Department::find($direction->department->id); - $faculty = Faculty::find($department->faculty->id); - $educationalInstitution = EducationalInstitution::find($faculty->educationalInstitution->id); -@endphp @extends('layouts.admin-layout') @section('content') @auth() diff --git a/resources/views/files/create.blade.php b/resources/views/admin/documents/create.blade.php similarity index 57% rename from resources/views/files/create.blade.php rename to resources/views/admin/documents/create.blade.php index 8a11f96..653f31e 100644 --- a/resources/views/files/create.blade.php +++ b/resources/views/admin/documents/create.blade.php @@ -4,16 +4,16 @@
Позиция | -Название | -
---|---|
{{ $file->position }} | -{{ $file->name }} | - @endforeach -
Позиция | --}} +{{--Название | --}} +{{--
---|---|
{{ $file->position }} | --}} +{{--{{ $file->name }} | --}} +{{-- @endforeach--}} +{{--