From 79d8dedb91f6c56a124b34396932be65b759c2ea Mon Sep 17 00:00:00 2001
From: mirivlad <mirivlad@lms.local>
Date: Tue, 31 Mar 2026 08:48:52 +0800
Subject: [PATCH] =?UTF-8?q?Feat:=20=D0=93=D1=80=D1=83=D0=BF=D0=BF=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BD=D0=B0=D0=B7=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=BA=D1=83=D1=80=D1=81=D0=BE?=
 =?UTF-8?q?=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Группировка по курсу + датам в index
✅ Сводная статистика (пользователи/группы/организации)
✅ show с раздельными списками по типам
✅ Modals для быстрого добавления
✅ Удаление edit/update - управление через show

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
---
 .../Admin/CourseAssignmentController.php      |  74 ++---
 .../admin/course-assignments/index.blade.php  |  69 ++---
 .../admin/course-assignments/show.blade.php   | 252 +++++++++++++-----
 3 files changed, 244 insertions(+), 151 deletions(-)

diff --git a/app/Http/Controllers/Admin/CourseAssignmentController.php b/app/Http/Controllers/Admin/CourseAssignmentController.php
index e60592f..ca18b71 100755
--- a/app/Http/Controllers/Admin/CourseAssignmentController.php
+++ b/app/Http/Controllers/Admin/CourseAssignmentController.php
@@ -23,17 +23,26 @@ class CourseAssignmentController extends Controller
     {
         Gate::authorize('viewAny', CourseAssignment::class);
         
-        $query = CourseAssignment::with(['course', 'user', 'group', 'organization', 'creator']);
+        $query = CourseAssignment::with(['course', 'user', 'group', 'organization']);
         
         if ($request->filled('course_id')) {
             $query->where('course_id', $request->course_id);
         }
         
-        if ($request->filled('type')) {
-            $query->where('type', $request->type);
-        }
+        // Группируем по курсу и датам
+        $assignments = $query->selectRaw('
+                course_id, start_date, end_date,
+                COUNT(CASE WHEN type = "individual" THEN 1 END) as individual_count,
+                COUNT(CASE WHEN type = "group" THEN 1 END) as group_count,
+                COUNT(CASE WHEN type = "organization" THEN 1 END) as organization_count,
+                GROUP_CONCAT(CASE WHEN type = "individual" THEN id END) as individual_ids,
+                GROUP_CONCAT(CASE WHEN type = "group" THEN id END) as group_ids,
+                GROUP_CONCAT(CASE WHEN type = "organization" THEN id END) as organization_ids
+            ')
+            ->groupBy('course_id', 'start_date', 'end_date')
+            ->orderBy('start_date', 'desc')
+            ->paginate(20);
         
-        $assignments = $query->orderBy('created_at', 'desc')->paginate(20);
         $courses = Course::pluck('title', 'id');
         
         return view('admin.course-assignments.index', compact('assignments', 'courses'));
@@ -146,40 +155,31 @@ class CourseAssignmentController extends Controller
             ->with('success', "Создано назначений: {$created}");
     }
 
-    public function show(CourseAssignment $course_assignment)
+    public function show(Request $request, $course_id)
     {
-        Gate::authorize('view', $course_assignment);
-
-        $course_assignment->load(['course', 'user', 'group', 'organization', 'creator']);
-
-        return view('admin.course-assignments.show', compact('course_assignment'));
-    }
-
-    public function edit(CourseAssignment $course_assignment)
-    {
-        Gate::authorize('update', $course_assignment);
-
-        $courses = Course::pluck('title', 'id');
-
-        return view('admin.course-assignments.edit', compact('course_assignment', 'courses'));
-    }
-
-    public function update(Request $request, CourseAssignment $course_assignment)
-    {
-        Gate::authorize('update', $course_assignment);
-
-        $validated = $request->validate([
-            'course_id' => 'required|exists:courses,id',
-            'start_date' => 'required|date',
-            'end_date' => 'nullable|date|after:start_date',
-            'note' => 'nullable|string',
-            'is_active' => 'boolean',
-        ]);
+        Gate::authorize('viewAny', CourseAssignment::class);
         
-        $course_assignment->update($validated);
-
-        return redirect()->route('admin.course-assignments.show', $course_assignment)
-            ->with('success', 'Назначение успешно обновлено.');
+        $start_date = $request->get('start');
+        $end_date = $request->get('end') !== 'null' ? $request->get('end') : null;
+        
+        $query = CourseAssignment::where('course_id', $course_id)
+            ->where('start_date', $start_date);
+        
+        if ($end_date) {
+            $query->where('end_date', $end_date);
+        } else {
+            $query->whereNull('end_date');
+        }
+        
+        $assignments = $query->with(['course', 'user', 'group', 'organization', 'creator'])->get();
+        $course = $assignments->first()?->course;
+        
+        // Группируем по типам
+        $individual = $assignments->where('type', 'individual');
+        $groups = $assignments->where('type', 'group');
+        $organizations = $assignments->where('type', 'organization');
+        
+        return view('admin.course-assignments.show', compact('course', 'assignments', 'individual', 'groups', 'organizations', 'start_date', 'end_date'));
     }
 
     public function destroy(CourseAssignment $course_assignment)
diff --git a/resources/views/admin/course-assignments/index.blade.php b/resources/views/admin/course-assignments/index.blade.php
index daad719..ce8963b 100644
--- a/resources/views/admin/course-assignments/index.blade.php
+++ b/resources/views/admin/course-assignments/index.blade.php
@@ -14,7 +14,7 @@
             <div class="card shadow-sm mb-4">
                 <div class="card-body">
                     <form action="{{ route('admin.course-assignments.index') }}" method="GET" class="row g-3">
-                        <div class="col-md-6">
+                        <div class="col-md-8">
                             <select name="course_id" class="form-select">
                                 <option value="">Все курсы</option>
                                 @foreach($courses as $id => $title)
@@ -22,14 +22,6 @@
                                 @endforeach
                             </select>
                         </div>
-                        <div class="col-md-4">
-                            <select name="type" class="form-select">
-                                <option value="">Все типы</option>
-                                <option value="individual">Индивидуальное</option>
-                                <option value="group">Группе</option>
-                                <option value="organization">Организации</option>
-                            </select>
-                        </div>
                         <div class="col-md-2">
                             <button type="submit" class="btn btn-primary w-100"><i class="bi bi-search"></i></button>
                         </div>
@@ -44,56 +36,51 @@
                             <thead>
                                 <tr>
                                     <th>Курс</th>
-                                    <th>Тип</th>
-                                    <th>Назначено</th>
                                     <th>Период</th>
-                                    <th>Статус</th>
+                                    <th class="text-center"><i class="bi bi-person" title="Индивидуальные"></i></th>
+                                    <th class="text-center"><i class="bi bi-people" title="Группы"></i></th>
+                                    <th class="text-center"><i class="bi bi-building" title="Организации"></i></th>
                                     <th>Действия</th>
                                 </tr>
                             </thead>
                             <tbody>
-                                @forelse($assignments as $course_assignment)
+                                @forelse($assignments as $group)
                                 <tr>
-                                    <td><strong>{{ $course_assignment->course->title }}</strong></td>
                                     <td>
-                                        @if($course_assignment->type === 'individual')
-                                            <span class="badge bg-success"><i class="bi bi-person"></i> Индивидуально</span>
-                                        @elseif($course_assignment->type === 'group')
-                                            <span class="badge bg-info"><i class="bi bi-people"></i> Группе</span>
-                                        @else
-                                            <span class="badge bg-primary"><i class="bi bi-building"></i> Организации</span>
-                                        @endif
+                                        <strong>{{ $group->course->title }}</strong>
                                     </td>
                                     <td>
-                                        @if($course_assignment->type === 'individual')
-                                            {{ $course_assignment->user?->name ?? '—' }}
-                                        @elseif($course_assignment->type === 'group')
-                                            {{ $course_assignment->group?->name ?? '—' }}
-                                        @else
-                                            {{ $course_assignment->organization?->name ?? '—' }}
+                                        <small>{{ $group->start_date->format('d.m.Y') }}</small>
+                                        @if($group->end_date)
+                                        <br><small>→ {{ $group->end_date->format('d.m.Y') }}</small>
                                         @endif
                                     </td>
-                                    <td>
-                                        <small>{{ $course_assignment->start_date->format('d.m.Y') }}</small>
-                                        @if($course_assignment->end_date)
-                                        <br><small>→ {{ $course_assignment->end_date->format('d.m.Y') }}</small>
+                                    <td class="text-center">
+                                        @if($group->individual_count > 0)
+                                        <span class="badge bg-success">{{ $group->individual_count }}</span>
+                                        @else
+                                        <span class="text-muted">—</span>
                                         @endif
                                     </td>
-                                    <td>
-                                        @if($course_assignment->is_active)
-                                            <span class="badge bg-success">Активно</span>
+                                    <td class="text-center">
+                                        @if($group->group_count > 0)
+                                        <span class="badge bg-info">{{ $group->group_count }}</span>
                                         @else
-                                            <span class="badge bg-secondary">Не активно</span>
+                                        <span class="text-muted">—</span>
+                                        @endif
+                                    </td>
+                                    <td class="text-center">
+                                        @if($group->organization_count > 0)
+                                        <span class="badge bg-primary">{{ $group->organization_count }}</span>
+                                        @else
+                                        <span class="text-muted">—</span>
                                         @endif
                                     </td>
                                     <td>
                                         <div class="btn-group btn-group-sm">
-                                            <a href="{{ route('admin.course-assignments.show', $course_assignment) }}" class="btn btn-outline-primary" title="Просмотр"><i class="bi bi-eye"></i></a>
-                                            <a href="{{ route('admin.course-assignments.edit', $course_assignment) }}" class="btn btn-outline-warning" title="Редактировать"><i class="bi bi-pencil"></i></a>
-                                            <form action="{{ route('admin.course-assignments.destroy', $course_assignment) }}" method="POST" class="d-inline" onsubmit="return confirm('Удалить?')">
-                                                @csrf @method('DELETE')
-                                                <button class="btn btn-outline-danger" title="Удалить"><i class="bi bi-trash"></i></button>
-                                            </form>
+                                            <a href="{{ route('admin.course-assignments.show', ['course' => $group->course_id, 'start' => $group->start_date->format('Y-m-d'), 'end' => $group->end_date?->format('Y-m-d') ?? 'null']) }}" class="btn btn-outline-primary" title="Просмотр">
+                                                <i class="bi bi-eye"></i>
+                                            </a>
                                         </div>
                                     </td>
                                 </tr>
diff --git a/resources/views/admin/course-assignments/show.blade.php b/resources/views/admin/course-assignments/show.blade.php
index 2395c24..4009e23 100644
--- a/resources/views/admin/course-assignments/show.blade.php
+++ b/resources/views/admin/course-assignments/show.blade.php
@@ -1,92 +1,123 @@
 @extends('layouts.app')
-@section('title', 'Назначение курса')
+@section('title', 'Назначение: ' . $course->title)
 @section('content')
 <div class="container-fluid">
     <div class="row">
         <nav class="col-md-3 col-lg-2 d-md-block sidebar"><div class="position-sticky pt-3">@include('partials._sidebar')</div></nav>
         <main class="col-md-9 ms-sm-auto col-lg-10 px-md-4 main-content">
             <div class="d-flex justify-content-between align-items-center pt-3 pb-2 mb-3 border-bottom">
-                <h1 class="h2">Назначение курса</h1>
-                <div>
-                    <a href="{{ route('admin.course-assignments.edit', $course_assignment) }}" class="btn btn-warning btn-sm me-2">Редактировать</a>
-                    <a href="{{ route('admin.course-assignments.index') }}" class="btn btn-secondary btn-sm">Назад</a>
+                <h1 class="h2">{{ $course->title }}</h1>
+                <a href="{{ route('admin.course-assignments.index') }}" class="btn btn-secondary btn-sm">Назад</a>
+            </div>
+            
+            <div class="row mb-4">
+                <div class="col-md-4">
+                    <div class="card shadow-sm">
+                        <div class="card-header bg-primary text-white"><h5 class="mb-0">Период</h5></div>
+                        <div class="card-body">
+                            <div><strong>Начало:</strong> {{ \Carbon\Carbon::parse($start_date)->format('d.m.Y') }}</div>
+                            <div><strong>Окончание:</strong> {{ $end_date ? \Carbon\Carbon::parse($end_date)->format('d.m.Y') : 'Бессрочно' }}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-md-8">
+                    <div class="card shadow-sm">
+                        <div class="card-header bg-success text-white"><h5 class="mb-0">Статистика</h5></div>
+                        <div class="card-body">
+                            <div class="row text-center">
+                                <div class="col-4">
+                                    <div class="display-6 text-success">{{ $individual->count() }}</div>
+                                    <div class="text-muted"><i class="bi bi-person"></i> Пользователей</div>
+                                </div>
+                                <div class="col-4">
+                                    <div class="display-6 text-info">{{ $groups->count() }}</div>
+                                    <div class="text-muted"><i class="bi bi-people"></i> Групп</div>
+                                </div>
+                                <div class="col-4">
+                                    <div class="display-6 text-primary">{{ $organizations->count() }}</div>
+                                    <div class="text-muted"><i class="bi bi-building"></i> Организаций</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
             
             <div class="row">
-                <div class="col-md-8 mb-4">
-                    <div class="card shadow-sm">
-                        <div class="card-header bg-primary text-white"><h5 class="mb-0">Информация</h5></div>
-                        <div class="card-body">
-                            <table class="table table-sm">
-                                <tr>
-                                    <th width="40%">Курс:</th>
-                                    <td><strong>{{ $course_assignment->course->title }}</strong></td>
-                                </tr>
-                                <tr>
-                                    <th>Тип:</th>
-                                    <td>
-                                        @if($course_assignment->type === 'individual')
-                                            <span class="badge bg-success"><i class="bi bi-person"></i> Индивидуально</span>
-                                        @elseif($course_assignment->type === 'group')
-                                            <span class="badge bg-info"><i class="bi bi-people"></i> Группе</span>
-                                        @else
-                                            <span class="badge bg-primary"><i class="bi bi-building"></i> Организации</span>
-                                        @endif
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <th>Назначено:</th>
-                                    <td>
-                                        @if($course_assignment->type === 'individual')
-                                            {{ $course_assignment->user?->name ?? '—' }}
-                                        @elseif($course_assignment->type === 'group')
-                                            {{ $course_assignment->group?->name ?? '—' }}
-                                        @else
-                                            {{ $course_assignment->organization?->name ?? '—' }}
-                                        @endif
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <th>Заметка:</th>
-                                    <td>{{ $course_assignment->note ?? '—' }}</td>
-                                </tr>
-                                <tr>
-                                    <th>Создано:</th>
-                                    <td>{{ $course_assignment->creator?->name ?? '—' }}, {{ $course_assignment->created_at->format('d.m.Y H:i') }}</td>
-                                </tr>
-                            </table>
+                <div class="col-md-4 mb-4">
+                    <div class="card shadow-sm h-100">
+                        <div class="card-header bg-success text-white d-flex justify-content-between align-items-center">
+                            <h5 class="mb-0"><i class="bi bi-person"></i> Пользователи</h5>
+                            <button class="btn btn-sm btn-light" data-bs-toggle="modal" data-bs-target="#addUserModal"><i class="bi bi-plus-lg"></i></button>
+                        </div>
+                        <div class="card-body p-0">
+                            @if($individual->count() > 0)
+                            <ul class="list-group list-group-flush">
+                                @foreach($individual as $a)
+                                <li class="list-group-item d-flex justify-content-between align-items-center">
+                                    <a href="{{ route('admin.users.show', $a->user) }}">{{ $a->user?->name ?? '—' }}</a>
+                                    <form action="{{ route('admin.course-assignments.destroy', $a) }}" method="POST" class="d-inline">
+                                        @csrf @method('DELETE')
+                                        <button class="btn btn-sm btn-outline-danger"><i class="bi bi-x-lg"></i></button>
+                                    </form>
+                                </li>
+                                @endforeach
+                            </ul>
+                            @else
+                            <p class="text-muted text-center py-4">Нет пользователей</p>
+                            @endif
                         </div>
                     </div>
                 </div>
                 
                 <div class="col-md-4 mb-4">
-                    <div class="card shadow-sm">
-                        <div class="card-header bg-success text-white"><h5 class="mb-0">Период доступа</h5></div>
-                        <div class="card-body">
-                            <div class="mb-3">
-                                <label class="text-muted small">Дата начала</label>
-                                <div class="fs-5">{{ $course_assignment->start_date->format('d.m.Y') }}</div>
-                            </div>
-                            <div class="mb-3">
-                                <label class="text-muted small">Дата окончания</label>
-                                <div class="fs-5">
-                                    @if($course_assignment->end_date)
-                                        {{ $course_assignment->end_date->format('d.m.Y') }}
-                                    @else
-                                        <span class="text-muted">Бессрочно</span>
-                                    @endif
-                                </div>
-                            </div>
-                            <hr>
-                            <div>
-                                <label class="text-muted small">Статус</label>
-                                @if($course_assignment->is_active)
-                                    <span class="badge bg-success">Активно</span>
-                                @else
-                                    <span class="badge bg-secondary">Не активно</span>
-                                @endif
-                            </div>
+                    <div class="card shadow-sm h-100">
+                        <div class="card-header bg-info text-white d-flex justify-content-between align-items-center">
+                            <h5 class="mb-0"><i class="bi bi-people"></i> Группы</h5>
+                            <button class="btn btn-sm btn-light" data-bs-toggle="modal" data-bs-target="#addGroupModal"><i class="bi bi-plus-lg"></i></button>
+                        </div>
+                        <div class="card-body p-0">
+                            @if($groups->count() > 0)
+                            <ul class="list-group list-group-flush">
+                                @foreach($groups as $a)
+                                <li class="list-group-item d-flex justify-content-between align-items-center">
+                                    <a href="{{ route('admin.groups.show', $a->group) }}">{{ $a->group?->name ?? '—' }}</a>
+                                    <form action="{{ route('admin.course-assignments.destroy', $a) }}" method="POST" class="d-inline">
+                                        @csrf @method('DELETE')
+                                        <button class="btn btn-sm btn-outline-danger"><i class="bi bi-x-lg"></i></button>
+                                    </form>
+                                </li>
+                                @endforeach
+                            </ul>
+                            @else
+                            <p class="text-muted text-center py-4">Нет групп</p>
+                            @endif
+                        </div>
+                    </div>
+                </div>
+                
+                <div class="col-md-4 mb-4">
+                    <div class="card shadow-sm h-100">
+                        <div class="card-header bg-primary text-white d-flex justify-content-between align-items-center">
+                            <h5 class="mb-0"><i class="bi bi-building"></i> Организации</h5>
+                            <button class="btn btn-sm btn-light" data-bs-toggle="modal" data-bs-target="#addOrganizationModal"><i class="bi bi-plus-lg"></i></button>
+                        </div>
+                        <div class="card-body p-0">
+                            @if($organizations->count() > 0)
+                            <ul class="list-group list-group-flush">
+                                @foreach($organizations as $a)
+                                <li class="list-group-item d-flex justify-content-between align-items-center">
+                                    <a href="{{ route('admin.organizations.show', $a->organization) }}">{{ $a->organization?->name ?? '—' }}</a>
+                                    <form action="{{ route('admin.course-assignments.destroy', $a) }}" method="POST" class="d-inline">
+                                        @csrf @method('DELETE')
+                                        <button class="btn btn-sm btn-outline-danger"><i class="bi bi-x-lg"></i></button>
+                                    </form>
+                                </li>
+                                @endforeach
+                            </ul>
+                            @else
+                            <p class="text-muted text-center py-4">Нет организаций</p>
+                            @endif
                         </div>
                     </div>
                 </div>
@@ -94,4 +125,79 @@
         </main>
     </div>
 </div>
+
+<!-- Modal добавления пользователя -->
+<div class="modal fade" id="addUserModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <form action="{{ route('admin.course-assignments.store') }}" method="POST">
+                @csrf
+                <input type="hidden" name="course_ids" value="{{ $course->id }}">
+                <input type="hidden" name="start_date" value="{{ $start_date }}">
+                <input type="hidden" name="end_date" value="{{ $end_date }}">
+                <div class="modal-header">
+                    <h5 class="modal-title">Добавить пользователя</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+                </div>
+                <div class="modal-body">
+                    <x-tags-input name="user_ids" url="{{ route('api.users.search') }}" placeholder="Начните вводить имя..." badge_color="success" />
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Отмена</button>
+                    <button type="submit" class="btn btn-success">Добавить</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+<!-- Modal добавления группы -->
+<div class="modal fade" id="addGroupModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <form action="{{ route('admin.course-assignments.store') }}" method="POST">
+                @csrf
+                <input type="hidden" name="course_ids" value="{{ $course->id }}">
+                <input type="hidden" name="start_date" value="{{ $start_date }}">
+                <input type="hidden" name="end_date" value="{{ $end_date }}">
+                <div class="modal-header">
+                    <h5 class="modal-title">Добавить группу</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+                </div>
+                <div class="modal-body">
+                    <x-tags-input name="group_ids" url="{{ route('api.groups.search') }}" placeholder="Начните вводить название..." badge_color="info" />
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Отмена</button>
+                    <button type="submit" class="btn btn-info">Добавить</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+<!-- Modal добавления организации -->
+<div class="modal fade" id="addOrganizationModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <form action="{{ route('admin.course-assignments.store') }}" method="POST">
+                @csrf
+                <input type="hidden" name="course_ids" value="{{ $course->id }}">
+                <input type="hidden" name="start_date" value="{{ $start_date }}">
+                <input type="hidden" name="end_date" value="{{ $end_date }}">
+                <div class="modal-header">
+                    <h5 class="modal-title">Добавить организацию</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+                </div>
+                <div class="modal-body">
+                    <x-tags-input name="organization_ids" url="{{ route('api.organizations.search') }}" placeholder="Начните вводить название..." badge_color="primary" />
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Отмена</button>
+                    <button type="submit" class="btn btn-primary">Добавить</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
 @endsection