Merge remote-tracking branch 'origin/main'

add direction Description
2024-06-18 16:23:05 +03:00 · 2024-06-18 16:22:54 +03:00
13 changed files with 399 additions and 0 deletions
--- a/app/Helpers/PositionHelper.php
+++ b/app/Helpers/PositionHelper.php
@ -3,6 +3,7 @@
 namespace App\Helpers;

 use App\Models\Direction;
+use App\Models\DirectionDescription;
 use App\Models\DirectionProfile;
 use App\Models\Document;
 use App\Models\EntranceExamination;
@ -73,4 +74,10 @@ class PositionHelper
        $maxPosition = Document::max('position');
        return $maxPosition >= 254 ? 255 : $maxPosition + 1;
    }
+
+    public static function directionDescription()
+    {
+        $maxPosition = DirectionDescription::max('position');
+        return $maxPosition >= 254 ? 255 : $maxPosition + 1;
+    }
 }
--- a/app/Http/Controllers/admin/Catalog/DirectionDescriptionController.php
+++ b/app/Http/Controllers/admin/Catalog/DirectionDescriptionController.php
@ -0,0 +1,72 @@
+<?php
+
+namespace App\Http\Controllers\admin\Catalog;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\admin\StoreDirectionDescriptionRequest;
+use App\Http\Requests\admin\UpdateDirectionDescriptionRequest;
+use App\Models\Direction;
+use App\Models\DirectionDescription;
+use Illuminate\Support\Facades\Storage;
+
+class DirectionDescriptionController extends Controller
+{
+    public function index()
+    {
+        $directionDescriptions = DirectionDescription::all();
+        return view('admin.catalog.direction_description.index', compact('directionDescriptions'));
+    }
+
+    public function create()
+    {
+        $directionCodes = Direction::pluck('full_name', 'code');
+        return view('admin.catalog.direction_description.create', compact('directionCodes'));
+    }
+
+    public function store(StoreDirectionDescriptionRequest $request)
+    {
+        $validated = $request->validated();
+        $fileName = $request->file('file')->getClientOriginalName();
+        $name = Storage::put('public', $request->file('file'));
+
+        $directionDescription = new DirectionDescription();
+        $directionDescription->url = Storage::url($name);
+        $directionDescription->direction_code = Direction::select('code', 'id')
+            ->where('code', $validated['direction_code'])
+            ->first()
+            ->id;
+        $directionDescription->file_name = $fileName;
+        $directionDescription->position = $validated['position'];
+        $directionDescription->save();
+        return redirect()->route('direction_descriptions.index');
+    }
+
+    public function edit(DirectionDescription $directionDescription)
+    {
+        $directionCodes = Direction::pluck('full_name', 'code');
+        return view('admin.catalog.direction_description.edit', compact('directionDescription', 'directionCodes'));
+    }
+
+    public function update(UpdateDirectionDescriptionRequest $request, DirectionDescription $directionDescription)
+    {
+        $validated = $request->validated();
+        $fileName = $request->file('file')->getClientOriginalName();
+        $name = Storage::put('public', $request->file('file'));
+
+        $directionDescription->url = Storage::url($name);
+        $directionDescription->direction_code = Direction::select('code', 'id')
+            ->where('code', $validated['direction_code'])
+            ->first()
+            ->id;
+        $directionDescription->file_name = $fileName;
+        $directionDescription->position = $validated['position'];
+        $directionDescription->save();
+        return redirect()->route('direction_descriptions.index');
+    }
+
+    public function destroy(DirectionDescription $directionDescription)
+    {
+        $directionDescription->delete();
+        return redirect()->route('direction_descriptions.index');
+    }
+}
--- a/app/Http/Requests/admin/StoreDirectionDescriptionRequest.php
+++ b/app/Http/Requests/admin/StoreDirectionDescriptionRequest.php
@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Requests\admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class StoreDirectionDescriptionRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'direction_code' => 'required|string|max:255|exists:directions,code',
+            'file' => 'required|file',
+            'file_name' => 'nullable|string|max:255',
+            'position' => 'required|int|numeric|max:255',
+        ];
+    }
+}
--- a/app/Http/Requests/admin/UpdateDirectionDescriptionRequest.php
+++ b/app/Http/Requests/admin/UpdateDirectionDescriptionRequest.php
@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Requests\admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateDirectionDescriptionRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'direction_code' => 'required|string|max:255|exists:directions,code',
+            'file' => 'required|file',
+            'file_name' => 'nullable|string|max:255',
+            'position' => 'required|int|numeric|max:255',
+        ];
+    }
+}
--- a/app/Models/DirectionDescription.php
+++ b/app/Models/DirectionDescription.php
@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class DirectionDescription extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'direction_code',
+        'file_name',
+        'position',
+        'url'
+    ];
+}
--- a/database/factories/DirectionDescriptionFactory.php
+++ b/database/factories/DirectionDescriptionFactory.php
@ -0,0 +1,25 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\DirectionDescription>
+ */
+class DirectionDescriptionFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'file_name' => fake()->name(),
+            'position' => 1,
+            'url' => fake()->url(),
+        ];
+    }
+}
--- a/database/migrations/2024_06_13_081633_create_direction_descriptions_table.php
+++ b/database/migrations/2024_06_13_081633_create_direction_descriptions_table.php
@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('direction_descriptions', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('direction_code')->constrained('directions');
+            $table->string('file_name', 255)->nullable();
+            $table->string('position', 255);
+            $table->string('url', 255);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('direction_descriptions');
+    }
+};
--- a/database/seeders/DirectionDescriptionSeeder.php
+++ b/database/seeders/DirectionDescriptionSeeder.php
@ -0,0 +1,17 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use Illuminate\Database\Seeder;
+
+class DirectionDescriptionSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        //
+    }
+}
--- a/resources/views/admin/catalog/direction_description/create.blade.php
+++ b/resources/views/admin/catalog/direction_description/create.blade.php
@ -0,0 +1,72 @@
+@php use App\Helpers\PositionHelper; @endphp
+@extends('layouts.admin_layout')
+@section('content')
+    @auth()
+        <div class="row">
+            <div class="col">
+                <h1 class="">Прикрепить файл</h1>
+                {{  Form::open(['url' => route('direction_descriptions.store'), 'method' => 'POST', 'files'=>'true', 'class' => 'needs-validation', 'novalidate']) }}
+
+                <div class="mt-3">
+                    {{ Form::label('direction_code', 'Направление', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.department_id')]) }}
+                    <span class="text-danger">*</span>
+                </div>
+                <div class="mt-1">
+                    {{ Form::select('direction_code', $directionCodes, null, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.department_id'), 'required']) }}
+                    <div class="invalid-feedback">
+                        Поле "Направление" обязательно!
+                    </div>
+                </div>
+                <div class="text-danger">
+                    @if ($errors->any())
+                        {{ $errors->first('direction_code') }}
+                    @endif
+                </div>
+
+                <div class="mt-3">
+                    {{ Form::label('file', 'Путь к Файлу', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.department_id')]) }}
+                    <span class="text-danger">*</span>
+                </div>
+                <div class="mt-1">
+                    {{ Form::file('file', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.department_id'), 'required']) }}
+                    <div class="invalid-feedback">
+                        Поле "Путь к документу" обязательно!
+                    </div>
+                </div>
+                <div class="text-danger">
+                    @if ($errors->any())
+                        {{ $errors->first('file') }}
+                    @endif
+                </div>
+                <div class="mt-3">
+                    {{ Form::label('file_name', 'Имя файла') }}
+                </div>
+                <div class="mt-1">
+                    {{ Form::text('file_name', '', ['class' => 'form-control']) }}
+                </div>
+                <div>
+                    @if ($errors->any())
+                        {{ $errors->first('name') }}
+                    @endif
+                </div>
+
+                <div class="mt-3">
+                    {{ Form::label('position', 'Позиция') }}
+                </div>
+                <div class="mt-1">
+                    {{ Form::text('position', PositionHelper::directionDescription(), ['class' => 'form-control']) }}
+                </div>
+                <div>
+                    @if ($errors->any())
+                        {{ $errors->first('position') }}
+                    @endif
+                </div>
+
+                <div class="mt-4">
+                    {{ Form::submit('Загрузить файл', ['class' => 'btn btn-primary'])}}
+                </div>
+                {{Form::close()}}
+            </div>
+        </div>
+    @endauth
+@endsection
--- a/resources/views/admin/catalog/direction_description/edit.blade.php
+++ b/resources/views/admin/catalog/direction_description/edit.blade.php
@ -0,0 +1,71 @@
+@extends('layouts.admin_layout')
+@section('content')
+    @auth()
+        <div class="row">
+            <div class="col">
+                <h1 class="">Заменить файл</h1>
+                {{  Form::open(['url' => route('direction_descriptions.update', $directionDescription), 'method' => 'PATCH', 'files'=>'true', 'class' => 'needs-validation', 'novalidate']) }}
+
+                <div class="mt-3">
+                    {{ Form::label('direction_code', 'Направление', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.department_id')]) }}
+                    <span class="text-danger">*</span>
+                </div>
+                <div class="mt-1">
+                    {{ Form::select('direction_code', $directionCodes, null, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.department_id'), 'required']) }}
+                    <div class="invalid-feedback">
+                        Поле "Направление" обязательно!
+                    </div>
+                </div>
+                <div class="text-danger">
+                    @if ($errors->any())
+                        {{ $errors->first('direction_code') }}
+                    @endif
+                </div>
+
+                <div class="mt-3">
+                    {{ Form::label('file', 'Путь к Файлу', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.department_id')]) }}
+                    <span class="text-danger">*</span>
+                </div>
+                <div class="mt-1">
+                    {{ Form::file('file', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.department_id'), 'required']) }}
+                    <div class="invalid-feedback">
+                        Поле "Путь к документу" обязательно!
+                    </div>
+                </div>
+                <div class="text-danger">
+                    @if ($errors->any())
+                        {{ $errors->first('file') }}
+                    @endif
+                </div>
+                <div class="mt-3">
+                    {{ Form::label('file_name', 'Имя файла') }}
+                </div>
+                <div class="mt-1">
+                    {{ Form::text('file_name', $directionDescription->file_name, ['class' => 'form-control']) }}
+                </div>
+                <div>
+                    @if ($errors->any())
+                        {{ $errors->first('name') }}
+                    @endif
+                </div>
+
+                <div class="mt-3">
+                    {{ Form::label('position', 'Позиция') }}
+                </div>
+                <div class="mt-1">
+                    {{ Form::text('position', $directionDescription->position, ['class' => 'form-control']) }}
+                </div>
+                <div>
+                    @if ($errors->any())
+                        {{ $errors->first('position') }}
+                    @endif
+                </div>
+
+                <div class="mt-4">
+                    {{ Form::submit('Загрузить файл', ['class' => 'btn btn-primary'])}}
+                </div>
+                {{Form::close()}}
+            </div>
+        </div>
+    @endauth
+@endsection
--- a/resources/views/admin/catalog/direction_description/index.blade.php
+++ b/resources/views/admin/catalog/direction_description/index.blade.php
@ -0,0 +1,35 @@
+@php use App\Models\Direction; @endphp
+@extends('layouts.admin_layout')
+@section('content')
+    <div class="container">
+        <h2>Документы</h2>
+        <br>
+        <a href="{{ route('direction_descriptions.create') }}" class="btn btn-primary">Добавить документ</a>
+        <br>
+        <br>
+        <table class="table">
+            <thead class="border-b-2 border-solid border-black text-left" style="text-align: left">
+            <tr>
+                <th scope="col">Направление</th>
+                <th scope="col">файл</th>
+                <th scope="col">действия</th>
+            </tr>
+            </thead>
+            <tbody>
+            @foreach($directionDescriptions as $directionDescription)
+                <tr>
+                    <td>{{ Str::limit(Direction::where('id', $directionDescription->direction_code)->first()->full_name, 50) }}</td>
+                    <td>{{ $directionDescription->file_name }}</td>
+                    <td><a href="{{ route("direction_descriptions.edit", $directionDescription) }}" class="btn btn-secondary">редактировать</a>
+                        <a rel="nofollow" data-method="delete" data-confirm="Вы действительно хотите удалить?"
+                           href="{{ route('direction_descriptions.destroy', $directionDescription) }}" class="btn btn-danger">
+                            удалить
+                        </a>
+                    </td>
+            @endforeach
+            </tbody>
+        </table>
+        <br>
+        <br>
+    </div>
+@endsection
--- a/resources/views/layouts/admin_layout.blade.php
+++ b/resources/views/layouts/admin_layout.blade.php
@ -56,7 +56,9 @@
                <li class="list-group-item {{ request()->is('admin/feedback*') && !request()->is('admin/feedback_statuses*') ? 'active' : '' }}"><a class="{{ request()->is('admin/feedback*') && !request()->is('admin/feedback_statuses*') ? 'link-light' : '' }}" href="{{ route('feedback.index') }}">Обратная связь</a></li>
                <li class="list-group-item {{ request()->is('admin/documents*') ? 'active' : '' }}"><a class="{{ request()->is('admin/documents*') ? 'link-light' : '' }}" href="{{ route('documents.index') }}">Документы</a></li>
                <li class="list-group-item {{ request()->is('admin/admissions*') ? 'active' : '' }}"><a class="{{ request()->is('admin/admissions*') ? 'link-light' : '' }}" href="{{ route('admissions.index') }}">Экран Приема</a></li>
+                <li class="list-group-item"></li>
                <li class="list-group-item {{ request()->is('admin/directions*') ? 'active' : '' }}"><a class="{{ request()->is('admin/directions*') ? 'link-light' : '' }}" href="{{ route('directions.index') }}">Направления</a></li>
+                <li class="list-group-item {{ request()->is('admin/direction_descriptions*') ? 'active' : '' }}"><a class="{{ request()->is('admin/direction_descriptions*') ? 'link-light' : '' }}" href="{{ route('direction_descriptions.index') }}">Файлы для Направлений</a></li>
                @can('viewAny', Auth::user())
                    <li class="list-group-item"></li>
                    <li class="list-group-item {{ request()->is('admin/users*') ? 'active' : '' }}"><a class="{{ request()->is('admin/users*') ? 'link-light' : '' }}" href="{{ route('users.index') }}">Список администраторов</a></li>
--- a/routes/admin.php
+++ b/routes/admin.php
@ -10,6 +10,7 @@ use App\Http\Controllers\admin\Catalog\Direction\ExaminationTypeController;
 use App\Http\Controllers\admin\Catalog\Direction\SubjectController;
 use App\Http\Controllers\admin\Catalog\Direction\SubjectTypeController;
 use App\Http\Controllers\admin\Catalog\DirectionController;
+use App\Http\Controllers\admin\Catalog\DirectionDescriptionController;
 use App\Http\Controllers\admin\Catalog\EducationalInstitutionController;
 use App\Http\Controllers\admin\Catalog\FacultyController;
 use App\Http\Controllers\admin\DocumentController;
@ -69,6 +70,8 @@ Route::middleware(['auth', 'verified'])->prefix('admin')->group(function () {

    Route::resource('/direction_profiles', DirectionProfileController::class)
        ->scoped(['direction_profile' => 'slug']);
+    Route::resource('/direction_descriptions', DirectionDescriptionController::class)
+        ->scoped(['direction_descriptions' => 'slug']);

    Route::resource('/feedback', FeedbackController::class)->only(['index', 'edit', 'update']);
    Route::resource('/feedback_statuses', FeedbackStatusController::class);
Author	SHA1	Message	Date
aslan	aaaec23a25	Merge remote-tracking branch 'origin/main' Tests & Lint & Deploy to Railway / deploy (push) Blocked by required conditions Details Tests & Lint & Deploy to Railway / build (2.7.6, 20.x, 8.3) (push) Has been cancelled Details	2024-06-18 16:23:05 +03:00
aslan	b65cce5722	add direction Description	2024-06-18 16:22:54 +03:00