Feat: Модули курса (контент)

 CourseModuleController (store, update, destroy)
 Маршруты для модулей
 UI добавления/редактирования модулей
 Типы: section, lesson, video, file, link, test
 Тесты как тип модуля (выбор из существующих)
 Загрузка файлов
 Иерархия (родитель/потомки)

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
mirivlad 2026-04-02 17:27:49 +08:00
parent 73453e32f1
commit 41224069c1
5 changed files with 436 additions and 58 deletions

View File

@ -0,0 +1,100 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Models\CourseModule;
use App\Models\Course;
use App\Models\Test;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\Gate;
class CourseModuleController extends Controller
{
public function __construct()
{
$this->middleware('auth');
}
public function store(Request $request, Course $course)
{
Gate::authorize('update', $course);
$validated = $request->validate([
'parent_id' => 'nullable|exists:course_modules,id',
'title' => 'required|string|max:255',
'type' => 'required|in:section,lesson,video,file,link,test',
'content' => 'nullable|string',
'video_url' => 'nullable|url',
'file_path' => 'nullable|string',
'external_url' => 'nullable|url',
'test_id' => 'nullable|exists:tests,id',
'sort_order' => 'nullable|integer',
'duration_minutes' => 'nullable|integer',
'is_required' => 'boolean',
'is_active' => 'boolean',
]);
$validated['course_id'] = $course->id;
$validated['is_required'] = $request->boolean('is_required');
$validated['is_active'] = $request->boolean('is_active');
// Загрузка файла
if ($request->hasFile('file')) {
$validated['file_path'] = $request->file('file')->store('course-files', 'public');
}
CourseModule::create($validated);
return back()->with('success', 'Модуль добавлен');
}
public function update(Request $request, Course $course, CourseModule $module)
{
Gate::authorize('update', $course);
$validated = $request->validate([
'title' => 'required|string|max:255',
'type' => 'required|in:section,lesson,video,file,link,test',
'content' => 'nullable|string',
'video_url' => 'nullable|url',
'external_url' => 'nullable|url',
'test_id' => 'nullable|exists:tests,id',
'sort_order' => 'nullable|integer',
'duration_minutes' => 'nullable|integer',
'is_required' => 'boolean',
'is_active' => 'boolean',
]);
$validated['is_required'] = $request->boolean('is_required');
$validated['is_active'] = $request->boolean('is_active');
// Загрузка нового файла
if ($request->hasFile('file')) {
// Удаляем старый файл
if ($module->file_path) {
Storage::disk('public')->delete($module->file_path);
}
$validated['file_path'] = $request->file('file')->store('course-files', 'public');
}
$module->update($validated);
return back()->with('success', 'Модуль обновлён');
}
public function destroy(Course $course, CourseModule $module)
{
Gate::authorize('update', $course);
// Удаляем файл если есть
if ($module->file_path) {
Storage::disk('public')->delete($module->file_path);
}
$module->delete();
return back()->with('success', 'Модуль удалён');
}
}

View File

@ -16,11 +16,15 @@ class CourseModule extends Model
'parent_id', 'parent_id',
'title', 'title',
'content', 'content',
'type', 'type', // section, lesson, video, file, link, test
'sort_order', 'sort_order',
'duration_minutes', 'duration_minutes',
'is_required', 'is_required',
'is_active', 'is_active',
'video_url',
'file_path',
'external_url',
'test_id', // Связь с тестом
]; ];
protected $casts = [ protected $casts = [
@ -48,6 +52,11 @@ class CourseModule extends Model
return $this->hasMany(Test::class); return $this->hasMany(Test::class);
} }
public function test(): BelongsTo
{
return $this->belongsTo(Test::class);
}
public function userProgress(): HasMany public function userProgress(): HasMany
{ {
return $this->hasMany(UserCourseProgress::class); return $this->hasMany(UserCourseProgress::class);

View File

@ -0,0 +1,28 @@
<?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::table('course_modules', function (Blueprint $table) {
//
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('course_modules', function (Blueprint $table) {
//
});
}
};

View File

@ -8,82 +8,319 @@
<div class="d-flex justify-content-between align-items-center pt-3 pb-2 mb-3 border-bottom"> <div class="d-flex justify-content-between align-items-center pt-3 pb-2 mb-3 border-bottom">
<h1 class="h2">{{ $course->title }}</h1> <h1 class="h2">{{ $course->title }}</h1>
<div> <div>
@can('update', $course)<a href="{{ route('admin.courses.edit', $course) }}" class="btn btn-warning btn-sm me-2">Редактировать</a>@endcan <a href="{{ route('admin.courses.edit', $course) }}" class="btn btn-warning btn-sm me-2">Редактировать</a>
<a href="{{ route('admin.courses.index') }}" class="btn btn-secondary btn-sm">Назад</a> <a href="{{ route('admin.courses.index') }}" class="btn btn-secondary btn-sm">Назад</a>
</div> </div>
</div> </div>
<div class="row">
<div class="col-md-4 mb-4"> @if(session('success'))<div class="alert alert-success">{{ session('success') }}</div>@endif
<div class="row mb-4">
<div class="col-md-6">
<div class="card shadow-sm"> <div class="card shadow-sm">
@if($course->thumbnail)<img src="{{ asset('storage/' . str_replace('_thumb.', '.', $course->thumbnail)) }}" class="card-img-top" alt="{{ $course->title }}"> <div class="card-body">
@else<div class="card-img-top bg-secondary d-flex align-items-center justify-content-center" style="height:200px;"><i class="bi bi-book text-white" style="font-size:4rem;"></i></div>@endif <div><strong>Категория:</strong> {{ $course->category?->name ?? '—' }}</div>
<div><strong>Slug:</strong> {{ $course->slug ?? '—' }}</div>
<div><strong>Статус:</strong> @if($course->is_active)<span class="badge bg-success">Активен</span>@else<span class="badge bg-secondary">Не активен</span>@endif</div>
</div>
</div> </div>
</div> </div>
<div class="col-md-8 mb-4"> <div class="col-md-6">
<div class="card shadow-sm h-100"> <div class="card shadow-sm">
<div class="card-body"> <div class="card-body">
<table class="table table-sm"> <div><strong>Модулей:</strong> {{ $course->modules()->whereNull('parent_id')->count() }}</div>
<tr><th>Категория:</th><td>{{ $course->category?->name ?? '—' }}</td></tr> <div><strong>Тестов:</strong> {{ $course->tests->count() }}</div>
<tr><th>Тип:</th><td><span class="badge bg-info">{{ $course->type }}</span></td></tr>
<tr><th>Длительность:</th><td>{{ $course->duration_minutes ?? '—' }} мин</td></tr>
<tr><th>Проходной балл:</th><td>{{ $course->passing_score }}%</td></tr>
<tr><th>Сертификат:</th><td>@if($course->has_certificate)<span class="badge bg-success">Да</span>@else<span class="badge bg-secondary">Нет</span>@endif</td></tr>
<tr><th>Статус:</th><td>@if($course->is_active)<span class="badge bg-success">Активен</span>@else<span class="badge bg-secondary">Не активен</span>@endif</td></tr>
<tr><th>Создан:</th><td>{{ $course->created_at->format('d.m.Y H:i') }}</td></tr>
<tr><th>Автор:</th><td>{{ $course->creator?->name ?? '—' }}</td></tr>
</table>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="col-md-6 mb-4"> <!-- Модули курса -->
<div class="card shadow-sm"> <div class="card shadow-sm mb-4">
<div class="card-header"><h5 class="mb-0">Описание</h5></div> <div class="card-header d-flex justify-content-between align-items-center">
<div class="card-body">{{ $course->description ?? '—' }}</div> <h5 class="mb-0"><i class="bi bi-layers"></i> Модули курса</h5>
</div> <button class="btn btn-sm btn-primary" data-bs-toggle="modal" data-bs-target="#addModuleModal">
<i class="bi bi-plus-lg"></i> Добавить модуль
</button>
</div> </div>
<div class="col-md-6 mb-4"> <div class="card-body">
<div class="card shadow-sm"> @if($course->modules()->whereNull('parent_id')->count() > 0)
<div class="card-header"><h5 class="mb-0">Цели обучения</h5></div> <div class="accordion" id="modulesAccordion">
<div class="card-body">{{ $course->objectives ?? '—' }}</div> @foreach($course->modules()->whereNull('parent_id')->orderBy('sort_order')->get() as $module)
<div class="accordion-item">
<h2 class="accordion-header" id="heading{{ $module->id }}">
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{ $module->id }}">
<span class="badge bg-{{ $module->type === 'section' ? 'primary' : 'secondary' }} me-2">{{ $module->type }}</span>
{{ $module->title }}
@if(!$module->is_active)<span class="badge bg-warning ms-2">Не активен</span>@endif
</button>
</h2>
<div id="collapse{{ $module->id }}" class="accordion-collapse collapse" data-bs-parent="#modulesAccordion">
<div class="accordion-body">
<div class="d-flex justify-content-between align-items-center mb-3">
<div>
@if($module->duration_minutes)<i class="bi bi-clock"></i> {{ $module->duration_minutes }} мин.@endif
@if($module->is_required)<span class="badge bg-info ms-2">Обязательный</span>@endif
</div>
<div>
<button class="btn btn-sm btn-outline-primary" data-bs-toggle="modal" data-bs-target="#editModuleModal{{ $module->id }}"><i class="bi bi-pencil"></i></button>
<form action="{{ route('admin.courses.modules.destroy', [$course, $module]) }}" method="POST" class="d-inline" onsubmit="return confirm('Удалить модуль?')">
@csrf @method('DELETE')
<button class="btn btn-sm btn-outline-danger"><i class="bi bi-trash"></i></button>
</form>
</div>
</div>
@if($module->content)<p>{{ $module->content }}</p>@endif
@if($module->video_url)<div class="mb-2"><i class="bi bi-camera-video"></i> <a href="{{ $module->video_url }}" target="_blank">Видео</a></div>@endif
@if($module->file_path)<div class="mb-2"><i class="bi bi-file-earmark"></i> <a href="/storage/{{ $module->file_path }}" target="_blank">Файл</a></div>@endif
@if($module->external_url)<div class="mb-2"><i class="bi bi-link-45deg"></i> <a href="{{ $module->external_url }}" target="_blank">Внешняя ссылка</a></div>@endif
@if($module->test_id)<div class="mb-2"><i class="bi bi-file-earmark-text"></i> Тест: {{ $module->test?->title }}</div>@endif
<!-- Дочерние модули -->
@if($module->children()->count() > 0)
<div class="mt-3 ps-3 border-start">
@foreach($module->children()->orderBy('sort_order')->get() as $child)
<div class="d-flex justify-content-between align-items-center py-2">
<div>
<span class="badge bg-{{ $child->type === 'lesson' ? 'success' : 'info' }} me-2">{{ $child->type }}</span>
{{ $child->title }}
</div>
<div>
<button class="btn btn-sm btn-outline-primary" data-bs-toggle="modal" data-bs-target="#editModuleModal{{ $child->id }}"><i class="bi bi-pencil"></i></button>
<form action="{{ route('admin.courses.modules.destroy', [$course, $child]) }}" method="POST" class="d-inline" onsubmit="return confirm('Удалить?')">
@csrf @method('DELETE')
<button class="btn btn-sm btn-outline-danger"><i class="bi bi-trash"></i></button>
</form>
</div>
</div>
@endforeach
</div>
@endif
<!-- Modal редактирования -->
<div class="modal fade" id="editModuleModal{{ $module->id }}" tabindex="-1">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<form action="{{ route('admin.courses.modules.update', [$course, $module]) }}" method="POST" enctype="multipart/form-data">
@csrf @method('PUT')
<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">
<div class="mb-3">
<label class="form-label">Название *</label>
<input type="text" name="title" class="form-control" value="{{ $module->title }}" required>
</div>
<div class="mb-3">
<label class="form-label">Тип *</label>
<select name="type" class="form-select" required>
<option value="section" {{ $module->type === 'section' ? 'selected' : '' }}>Раздел</option>
<option value="lesson" {{ $module->type === 'lesson' ? 'selected' : '' }}>Урок (текст)</option>
<option value="video" {{ $module->type === 'video' ? 'selected' : '' }}>Видео</option>
<option value="file" {{ $module->type === 'file' ? 'selected' : '' }}>Файл</option>
<option value="link" {{ $module->type === 'link' ? 'selected' : '' }}>Внешняя ссылка</option>
<option value="test" {{ $module->type === 'test' ? 'selected' : '' }}>Тест</option>
</select>
</div>
<div class="mb-3">
<label class="form-label">Контент (для урока)</label>
<textarea name="content" class="form-control" rows="3">{{ $module->content }}</textarea>
</div>
<div class="mb-3">
<label class="form-label">URL видео</label>
<input type="text" name="video_url" class="form-control" value="{{ $module->video_url }}">
</div>
<div class="mb-3">
<label class="form-label">Внешняя ссылка</label>
<input type="text" name="external_url" class="form-control" value="{{ $module->external_url }}">
</div>
@if($module->type === 'test')
<div class="mb-3">
<label class="form-label">Тест</label>
<select name="test_id" class="form-select">
<option value="">Не выбран</option>
@foreach($course->tests as $test)
<option value="{{ $test->id }}" {{ $module->test_id == $test->id ? 'selected' : '' }}>{{ $test->title }}</option>
@endforeach
</select>
</div>
@endif
<div class="row">
<div class="col-md-4 mb-3">
<label class="form-label">Порядок</label>
<input type="number" name="sort_order" class="form-control" value="{{ $module->sort_order }}">
</div>
<div class="col-md-4 mb-3">
<label class="form-label">Длительность (мин)</label>
<input type="number" name="duration_minutes" class="form-control" value="{{ $module->duration_minutes }}">
</div>
<div class="col-md-4 mb-3">
<div class="form-check mt-4">
<input type="checkbox" name="is_required" value="1" class="form-check-input" {{ $module->is_required ? 'checked' : '' }}>
<label class="form-check-label">Обязательный</label>
</div>
</div>
</div>
<div class="form-check">
<input type="checkbox" name="is_active" value="1" class="form-check-input" {{ $module->is_active ? 'checked' : '' }}>
<label class="form-check-label">Активен</label>
</div>
</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>
</div>
</div>
</div>
@endforeach
</div> </div>
@else
<p class="text-muted text-center py-4">Модулей пока нет. Добавьте первый модуль!</p>
@endif
</div> </div>
</div> </div>
<div class="row">
<div class="col-md-6 mb-4"> <!-- Тесты -->
<div class="card shadow-sm"> <div class="card shadow-sm mb-4">
<div class="card-header d-flex justify-content-between"><h5 class="mb-0">Модули</h5><a href="#" class="btn btn-sm btn-primary"><i class="bi bi-plus"></i></a></div> <div class="card-header d-flex justify-content-between align-items-center">
<div class="card-body"> <h5 class="mb-0"><i class="bi bi-file-earmark-text"></i> Тесты</h5>
@if($course->modules->count() > 0)<ul class="list-group list-group-flush">@foreach($course->modules as $module)<li class="list-group-item d-flex justify-content-between">{{ $module->title }}<small class="text-muted">{{ $module->type }}</small></li>@endforeach</ul> <a href="{{ route('admin.courses.tests.create', $course) }}" class="btn btn-sm btn-primary"><i class="bi bi-plus"></i> Добавить тест</a>
@else<p class="text-muted mb-0">Нет модулей</p>@endif
</div>
</div>
</div> </div>
<div class="col-md-6 mb-4"> <div class="card-body">
<div class="card shadow-sm"> @if($course->tests->count() > 0)
<div class="card-header d-flex justify-content-between"> <ul class="list-group list-group-flush">
<h5 class="mb-0">Тесты</h5> @foreach($course->tests as $test)
<a href="{{ route('admin.courses.tests.create', $course) }}" class="btn btn-sm btn-primary"><i class="bi bi-plus"></i></a> <li class="list-group-item d-flex justify-content-between align-items-center">
</div> <a href="{{ route('admin.courses.tests.show', [$course, $test]) }}" class="text-decoration-none">{{ $test->title }}</a>
<div class="card-body"> <div>
@if($course->tests->count() > 0) <span class="badge bg-secondary me-2">{{ $test->type }}</span>
<ul class="list-group list-group-flush"> <a href="{{ route('admin.courses.tests.edit', [$course, $test]) }}" class="btn btn-sm btn-outline-primary"><i class="bi bi-pencil"></i></a>
@foreach($course->tests as $test) </div>
<li class="list-group-item d-flex justify-content-between align-items-center"> </li>
<a href="{{ route('admin.courses.tests.show', [$course, $test]) }}" class="text-decoration-none">{{ $test->title }}</a> @endforeach
<span class="badge bg-secondary">{{ $test->type }}</span> </ul>
</li> @else
@endforeach <p class="text-muted mb-0">Тестов пока нет</p>
</ul> @endif
@else
<p class="text-muted mb-0">Нет тестов</p>
@endif
</div>
</div>
</div> </div>
</div> </div>
</main> </main>
</div> </div>
</div> </div>
<!-- Modal добавления модуля -->
<div class="modal fade" id="addModuleModal" tabindex="-1">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<form action="{{ route('admin.courses.modules.store', $course) }}" method="POST" enctype="multipart/form-data">
@csrf
<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">
<div class="mb-3">
<label class="form-label">Родительский модуль</label>
<select name="parent_id" class="form-select">
<option value="">Без родителя (корневой)</option>
@foreach($course->modules()->whereNull('parent_id')->get() as $module)
<option value="{{ $module->id }}">{{ $module->title }}</option>
@endforeach
</select>
<small class="text-muted">Оставьте пустым для корневого модуля</small>
</div>
<div class="mb-3">
<label class="form-label">Название *</label>
<input type="text" name="title" class="form-control" required>
</div>
<div class="mb-3">
<label class="form-label">Тип *</label>
<select name="type" class="form-select" required onchange="toggleContentFields()">
<option value="section">Раздел</option>
<option value="lesson">Урок (текст)</option>
<option value="video">Видео</option>
<option value="file">Файл</option>
<option value="link">Внешняя ссылка</option>
<option value="test">Тест</option>
</select>
</div>
<div id="contentField" class="mb-3" style="display:none;">
<label class="form-label">Контент</label>
<textarea name="content" class="form-control" rows="3"></textarea>
</div>
<div id="videoField" class="mb-3" style="display:none;">
<label class="form-label">URL видео</label>
<input type="text" name="video_url" class="form-control" placeholder="https://youtube.com/...">
</div>
<div id="fileField" class="mb-3" style="display:none;">
<label class="form-label">Файл</label>
<input type="file" name="file" class="form-control">
</div>
<div id="linkField" class="mb-3" style="display:none;">
<label class="form-label">Внешняя ссылка</label>
<input type="text" name="external_url" class="form-control" placeholder="https://...">
</div>
<div id="testField" class="mb-3" style="display:none;">
<label class="form-label">Тест</label>
<select name="test_id" class="form-select">
<option value="">Не выбран</option>
@foreach($course->tests as $test)
<option value="{{ $test->id }}">{{ $test->title }}</option>
@endforeach
</select>
</div>
<div class="row">
<div class="col-md-4 mb-3">
<label class="form-label">Порядок</label>
<input type="number" name="sort_order" class="form-control" value="0">
</div>
<div class="col-md-4 mb-3">
<label class="form-label">Длительность (мин)</label>
<input type="number" name="duration_minutes" class="form-control">
</div>
<div class="col-md-4 mb-3">
<div class="form-check mt-4">
<input type="checkbox" name="is_required" value="1" class="form-check-input">
<label class="form-check-label">Обязательный</label>
</div>
</div>
</div>
<div class="form-check">
<input type="checkbox" name="is_active" value="1" class="form-check-input" checked>
<label class="form-check-label">Активен</label>
</div>
</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>
@push('scripts')
<script>
function toggleContentFields() {
const type = document.querySelector('select[name="type"]').value;
document.getElementById('contentField').style.display = (type === 'lesson') ? 'block' : 'none';
document.getElementById('videoField').style.display = (type === 'video') ? 'block' : 'none';
document.getElementById('fileField').style.display = (type === 'file') ? 'block' : 'none';
document.getElementById('linkField').style.display = (type === 'link') ? 'block' : 'none';
document.getElementById('testField').style.display = (type === 'test') ? 'block' : 'none';
}
// Инициализация при загрузке
document.addEventListener('DOMContentLoaded', function() {
toggleContentFields();
});
</script>
@endpush
@endsection @endsection

View File

@ -8,6 +8,7 @@ use App\Http\Controllers\Admin\GroupController;
use App\Http\Controllers\Admin\UserController; use App\Http\Controllers\Admin\UserController;
use App\Http\Controllers\Admin\CourseCategoryController; use App\Http\Controllers\Admin\CourseCategoryController;
use App\Http\Controllers\Admin\CourseController; use App\Http\Controllers\Admin\CourseController;
use App\Http\Controllers\Admin\CourseModuleController;
use App\Http\Controllers\Admin\TestController; use App\Http\Controllers\Admin\TestController;
use App\Http\Controllers\Admin\QuestionController; use App\Http\Controllers\Admin\QuestionController;
use App\Http\Controllers\Admin\CourseAssignmentController; use App\Http\Controllers\Admin\CourseAssignmentController;
@ -63,6 +64,9 @@ Route::middleware('auth')->group(function () {
Route::resource('course-categories', CourseCategoryController::class); Route::resource('course-categories', CourseCategoryController::class);
Route::resource('courses', CourseController::class); Route::resource('courses', CourseController::class);
Route::resource('courses.tests', TestController::class); Route::resource('courses.tests', TestController::class);
Route::post('/courses/{course}/modules', [CourseModuleController::class, 'store'])->name('courses.modules.store');
Route::put('/courses/{course}/modules/{module}', [CourseModuleController::class, 'update'])->name('courses.modules.update');
Route::delete('/courses/{course}/modules/{module}', [CourseModuleController::class, 'destroy'])->name('courses.modules.destroy');
Route::resource('tests.questions', QuestionController::class); Route::resource('tests.questions', QuestionController::class);
Route::resource('course-assignments', CourseAssignmentController::class)->except(['show', 'edit', 'update']); Route::resource('course-assignments', CourseAssignmentController::class)->except(['show', 'edit', 'update']);
Route::get('/course-assignments/{course}', CourseAssignmentController::class . '@show')->name('course-assignments.show'); Route::get('/course-assignments/{course}', CourseAssignmentController::class . '@show')->name('course-assignments.show');