Refactoring Faculty and Education Institution views

This commit is contained in:
aslan 2024-02-08 16:01:40 +03:00
parent 3ef7a84f7e
commit 00266b9fa0
6 changed files with 42 additions and 5 deletions

View File

@ -1,7 +1,8 @@
<?php
namespace App\Http\Controllers;
namespace App\Http\Controllers\Catalog;
use App\Http\Controllers\Controller;
use App\Http\Requests\StoreEducationalInstitutionRequest;
use App\Http\Requests\UpdateEducationalInstitutionRequest;
use App\Models\EducationalInstitution;

View File

@ -1,9 +1,11 @@
<?php
namespace App\Http\Controllers;
namespace App\Http\Controllers\Catalog;
use App\Http\Controllers\Controller;
use App\Http\Requests\StoreFacultyRequest;
use App\Http\Requests\UpdateFacultyRequest;
use App\Models\Department;
use App\Models\EducationalInstitution;
use App\Models\Faculty;
use Illuminate\Contracts\View\Factory;
@ -39,6 +41,11 @@ class FacultyController extends Controller
return redirect()->route('faculties.index');
}
public function show(Faculty $faculty): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
{
return view('catalog.faculty.show', compact('faculty'));
}
public function edit(Faculty $faculty): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
{
$educationalInstitutions = EducationalInstitution::pluck('name', 'id');
@ -60,6 +67,9 @@ class FacultyController extends Controller
public function destroy(Faculty $faculty): RedirectResponse
{
if ($faculty->departments()->exists()) {
return back();
}
$faculty->delete();
return redirect()->route('faculties.index');
}

View File

@ -5,6 +5,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
class Faculty extends Model
{
@ -21,4 +22,9 @@ class Faculty extends Model
{
return $this->belongsTo(EducationalInstitution::class);
}
public function departments(): HasMany
{
return $this->hasMany('App\Models\Department', 'faculty_id');
}
}

View File

@ -22,8 +22,8 @@
@foreach($faculties as $faculty)
<tr class="">
<th scope="row">{{ $faculty->position }}</th>
<td>{{ $faculty->name }}</td>
<td>{{ $faculty->description }}</td>
<td><a href="{{ route('faculties.show', $faculty) }}">{{ $faculty->name }}</a></td>
<td>{{ Str::words($faculty->description, 10, '...') }}</td>
<td>{{ $faculty->educationalInstitution->name }}</td>
<td><a href="{{ route("faculties.edit", $faculty) }}"
class="btn btn-secondary">редактировать</a>

View File

@ -0,0 +1,19 @@
@extends('layouts.admin-layout')
@section('content')
@auth()
<h6><a href="{{ route('educational-institutions.show', $faculty->educationalInstitution) }}">{{ $faculty->educationalInstitution->name }}</a> -> {{ $faculty->name }}</h6>
<div class="container mt-4">
<h2>Название</h2>
<p>{{ $faculty->name }}</p>
<h2>Описание</h2>
<p>{{ $faculty->description }}</p>
<h2>Позиция</h2>
<p>{{ $faculty->position }}</p>
<h2>Кафедры</h2>
@foreach($faculty->departments as $department)
<p><a href="{{ route('departments.show', $department) }}">{{ $department->name }}</a></p>
@endforeach
</div>
@endauth
@endsection

View File

@ -61,9 +61,10 @@
<li class="list-group-item"><a href="{{ route('educational-institutions.index') }}">Учебные
заведения</a></li>
<li class="list-group-item"><a href="{{ route('faculties.index') }}">Факультеты</a></li>
<li class="list-group-item"><a href="{{ route('departments.index') }}">Кафедры</a></li>
</ul>
</aside>
<div class="col-10">@yield('content')</div>
<main class="col-10">@yield('content')</main>
</div>
</div>