Feat: Учебная часть для студентов
✅ Login Modal в навигации ✅ Навигация: Админка (для админов), Мои курсы, Тесты ✅ StudentCourseController - список и просмотр курсов ✅ StudentTestController - список и просмотр тестов ✅ Маршруты /student/courses, /student/tests ✅ Views для курсов и тестов Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
mirivlad
parent
b56d8b2b3d
commit
dcb89380aa
|
|
@ -0,0 +1,84 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Student;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Course;
|
||||
use App\Models\CourseAssignment;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class CourseController extends Controller
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('auth');
|
||||
}
|
||||
|
||||
public function index()
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
// Получаем назначения для пользователя
|
||||
$query = CourseAssignment::with(['course', 'group', 'organization'])
|
||||
->where('is_active', true)
|
||||
->where(function($q) use ($user) {
|
||||
// Индивидуальные назначения
|
||||
$q->where('type', 'individual')
|
||||
->where('user_id', $user->id);
|
||||
|
||||
// Или назначения группе пользователя
|
||||
if ($user->groups->count() > 0) {
|
||||
$q->orWhere(function($sub) use ($user) {
|
||||
$sub->where('type', 'group')
|
||||
->whereIn('group_id', $user->groups->pluck('id'));
|
||||
});
|
||||
}
|
||||
|
||||
// Или назначения организации пользователя
|
||||
if ($user->organization_id) {
|
||||
$q->orWhere(function($sub) use ($user) {
|
||||
$sub->where('type', 'organization')
|
||||
->where('organization_id', $user->organization_id);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
$assignments = $query->get();
|
||||
|
||||
// Группируем по курсам
|
||||
$courses = $assignments->unique('course_id')->map(function($assignment) {
|
||||
return $assignment->course;
|
||||
});
|
||||
|
||||
return view('student.courses.index', compact('courses', 'assignments'));
|
||||
}
|
||||
|
||||
public function show(Course $course)
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
// Проверяем доступ к курсу
|
||||
$hasAccess = CourseAssignment::where('course_id', $course->id)
|
||||
->where('is_active', true)
|
||||
->where(function($q) use ($user) {
|
||||
$q->where('type', 'individual')->where('user_id', $user->id)
|
||||
->orWhere(function($sub) use ($user) {
|
||||
$sub->where('type', 'group')
|
||||
->whereIn('group_id', $user->groups->pluck('id'));
|
||||
})
|
||||
->orWhere(function($sub) use ($user) {
|
||||
$sub->where('type', 'organization')
|
||||
->where('organization_id', $user->organization_id);
|
||||
});
|
||||
})->exists();
|
||||
|
||||
if (!$hasAccess) {
|
||||
abort(403, 'У вас нет доступа к этому курсу');
|
||||
}
|
||||
|
||||
$course->load(['tests', 'category']);
|
||||
|
||||
return view('student.courses.show', compact('course'));
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,71 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Student;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Test;
|
||||
use App\Models\CourseAssignment;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class TestController extends Controller
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('auth');
|
||||
}
|
||||
|
||||
public function index()
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
// Получаем тесты из доступных курсов
|
||||
$courseIds = CourseAssignment::where('is_active', true)
|
||||
->where(function($q) use ($user) {
|
||||
$q->where('type', 'individual')->where('user_id', $user->id)
|
||||
->orWhere(function($sub) use ($user) {
|
||||
$sub->where('type', 'group')
|
||||
->whereIn('group_id', $user->groups->pluck('id'));
|
||||
})
|
||||
->orWhere(function($sub) use ($user) {
|
||||
$sub->where('type', 'organization')
|
||||
->where('organization_id', $user->organization_id);
|
||||
});
|
||||
})->pluck('course_id');
|
||||
|
||||
$tests = Test::with(['course'])
|
||||
->whereIn('course_id', $courseIds)
|
||||
->where('is_active', true)
|
||||
->get();
|
||||
|
||||
return view('student.tests.index', compact('tests'));
|
||||
}
|
||||
|
||||
public function show(Test $test)
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
// Проверяем доступ к тесту через курс
|
||||
$hasAccess = CourseAssignment::where('course_id', $test->course_id)
|
||||
->where('is_active', true)
|
||||
->where(function($q) use ($user) {
|
||||
$q->where('type', 'individual')->where('user_id', $user->id)
|
||||
->orWhere(function($sub) use ($user) {
|
||||
$sub->where('type', 'group')
|
||||
->whereIn('group_id', $user->groups->pluck('id'));
|
||||
})
|
||||
->orWhere(function($sub) use ($user) {
|
||||
$sub->where('type', 'organization')
|
||||
->where('organization_id', $user->organization_id);
|
||||
});
|
||||
})->exists();
|
||||
|
||||
if (!$hasAccess) {
|
||||
abort(403, 'У вас нет доступа к этому тесту');
|
||||
}
|
||||
|
||||
$test->load(['questions.answers', 'course']);
|
||||
|
||||
return view('student.tests.show', compact('test'));
|
||||
}
|
||||
}
|
||||
|
|
@ -75,6 +75,23 @@
|
|||
<i class="bi bi-speedometer2"></i> Панель управления
|
||||
</a>
|
||||
</li>
|
||||
@if(Auth::user()->hasRole(['Administrator', 'Manager', 'Curator']))
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ route('admin.organizations.index') }}">
|
||||
<i class="bi bi-gear"></i> Админка
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ route('student.courses.index') }}">
|
||||
<i class="bi bi-book"></i> Мои курсы
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ route('student.tests.index') }}">
|
||||
<i class="bi bi-file-earmark-text"></i> Тесты
|
||||
</a>
|
||||
</li>
|
||||
@endauth
|
||||
</ul>
|
||||
<ul class="navbar-nav">
|
||||
|
|
@ -98,10 +115,9 @@
|
|||
</li>
|
||||
@else
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ route('login') }}">Войти</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ route('register') }}">Регистрация</a>
|
||||
<button class="btn btn-outline-light" data-bs-toggle="modal" data-bs-target="#loginModal">
|
||||
<i class="bi bi-box-arrow-in-right"></i> Войти
|
||||
</button>
|
||||
</li>
|
||||
@endauth
|
||||
</ul>
|
||||
|
|
@ -109,6 +125,44 @@
|
|||
</div>
|
||||
</nav>
|
||||
|
||||
@if(!Auth::check())
|
||||
<!-- Login Modal -->
|
||||
<div class="modal fade" id="loginModal" tabindex="-1">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<form action="{{ route('login') }}" method="POST">
|
||||
@csrf
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title"><i class="bi bi-box-arrow-in-right"></i> Вход в систему</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">Email</label>
|
||||
<input type="email" name="email" class="form-control" required>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Пароль</label>
|
||||
<input type="password" name="password" class="form-control" required>
|
||||
</div>
|
||||
<div class="mb-3 form-check">
|
||||
<input type="checkbox" name="remember" class="form-check-input" id="remember">
|
||||
<label class="form-check-label" for="remember">Запомнить меня</label>
|
||||
</div>
|
||||
@if(session('error'))
|
||||
<div class="alert alert-danger">{{ session('error') }}</div>
|
||||
@endif
|
||||
</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>
|
||||
@endif
|
||||
|
||||
@yield('content')
|
||||
|
||||
<!-- Bootstrap 5 JS -->
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
@extends('layouts.app')
|
||||
@section('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"><i class="bi bi-book"></i> Мои курсы</h1>
|
||||
</div>
|
||||
|
||||
@if(session('success'))<div class="alert alert-success">{{ session('success') }}</div>@endif
|
||||
|
||||
@if($courses->count() > 0)
|
||||
<div class="row">
|
||||
@foreach($courses as $course)
|
||||
<div class="col-md-6 col-lg-4 mb-4">
|
||||
<div class="card shadow-sm h-100">
|
||||
@if($course->image)
|
||||
<img src="/storage/{{ $course->image }}" class="card-img-top" alt="{{ $course->title }}" style="height: 200px; object-fit: cover;">
|
||||
@endif
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">{{ $course->title }}</h5>
|
||||
@if($course->category)
|
||||
<span class="badge bg-info mb-2">{{ $course->category->name }}</span>
|
||||
@endif
|
||||
<p class="card-text text-muted">{{ Str::limit($course->description, 100) }}</p>
|
||||
</div>
|
||||
<div class="card-footer bg-white">
|
||||
<a href="{{ route('student.courses.show', $course) }}" class="btn btn-primary btn-sm w-100">
|
||||
<i class="bi bi-box-arrow-in-right"></i> Открыть курс
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
@else
|
||||
<div class="alert alert-info">
|
||||
<i class="bi bi-info-circle"></i> У вас пока нет доступных курсов
|
||||
</div>
|
||||
@endif
|
||||
</main>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
@extends('layouts.app')
|
||||
@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">{{ $course->title }}</h1>
|
||||
<a href="{{ route('student.courses.index') }}" class="btn btn-secondary btn-sm">Назад</a>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-8 mb-4">
|
||||
<div class="card shadow-sm mb-4">
|
||||
<div class="card-body">
|
||||
@if($course->image)
|
||||
<img src="/storage/{{ $course->image }}" class="img-fluid rounded mb-3" alt="{{ $course->title }}">
|
||||
@endif
|
||||
<h4>Описание</h4>
|
||||
<p>{{ $course->description ?? '—' }}</p>
|
||||
|
||||
@if($course->objectives)
|
||||
<h4>Цели обучения</h4>
|
||||
<p>{{ $course->objectives }}</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 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">
|
||||
@if($course->category)
|
||||
<div><strong>Категория:</strong> {{ $course->category->name }}</div>
|
||||
@endif
|
||||
<div><strong>Тестов:</strong> {{ $course->tests->count() }}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if($course->tests->count() > 0)
|
||||
<div class="card shadow-sm mt-3">
|
||||
<div class="card-header bg-success text-white"><h5 class="mb-0">Тесты</h5></div>
|
||||
<div class="list-group list-group-flush">
|
||||
@foreach($course->tests as $test)
|
||||
<a href="{{ route('student.tests.show', $test) }}" class="list-group-item list-group-item-action">
|
||||
<div class="d-flex w-100 justify-content-between">
|
||||
<h6 class="mb-1">{{ $test->title }}</h6>
|
||||
<small class="text-muted">{{ $test->questions->count() }} вопр.</small>
|
||||
</div>
|
||||
</a>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
@extends('layouts.app')
|
||||
@section('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"><i class="bi bi-file-earmark-text"></i> Тесты</h1>
|
||||
</div>
|
||||
|
||||
@if(session('success'))<div class="alert alert-success">{{ session('success') }}</div>@endif
|
||||
|
||||
@if($tests->count() > 0)
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-body">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Название</th>
|
||||
<th>Курс</th>
|
||||
<th>Вопросов</th>
|
||||
<th>Действия</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($tests as $test)
|
||||
<tr>
|
||||
<td><strong>{{ $test->title }}</strong></td>
|
||||
<td>{{ $test->course->title }}</td>
|
||||
<td><span class="badge bg-info">{{ $test->questions->count() }}</span></td>
|
||||
<td>
|
||||
<a href="{{ route('student.tests.show', $test) }}" class="btn btn-primary btn-sm">
|
||||
<i class="bi bi-play"></i> Начать
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@else
|
||||
<div class="alert alert-info">
|
||||
<i class="bi bi-info-circle"></i> У вас пока нет доступных тестов
|
||||
</div>
|
||||
@endif
|
||||
</main>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
@extends('layouts.app')
|
||||
@section('title', $test->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">{{ $test->title }}</h1>
|
||||
<a href="{{ route('student.tests.index') }}" class="btn btn-secondary btn-sm">Назад</a>
|
||||
</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">
|
||||
<div><strong>Курс:</strong> {{ $test->course->title }}</div>
|
||||
<div><strong>Вопросов:</strong> {{ $test->questions->count() }}</div>
|
||||
@if($test->passing_score)
|
||||
<div><strong>Проходной балл:</strong> {{ $test->passing_score }}%</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 mb-4">
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-body text-center">
|
||||
<button class="btn btn-success btn-lg w-100" onclick="startTest()">
|
||||
<i class="bi bi-play-circle"></i> Начать тестирование
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-header"><h5 class="mb-0">Вопросы</h5></div>
|
||||
<div class="card-body">
|
||||
<div class="accordion" id="questionsAccordion">
|
||||
@foreach($test->questions as $index => $question)
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header" id="heading{{ $question->id }}">
|
||||
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{ $question->id }}">
|
||||
Вопрос {{ $index + 1 }}: {{ Str::limit($question->question_text, 100) }}
|
||||
</button>
|
||||
</h2>
|
||||
<div id="collapse{{ $question->id }}" class="accordion-collapse collapse" data-bs-parent="#questionsAccordion">
|
||||
<div class="accordion-body">
|
||||
<p><strong>{{ $question->question_text }}</strong></p>
|
||||
|
||||
@if($question->type === 'multiple_choice')
|
||||
<div class="mb-3">
|
||||
@foreach($question->answers as $answer)
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="{{ $answer->is_correct ? 'checkbox' : 'checkbox' }}" name="question_{{ $question->id }}" value="{{ $answer->id }}" id="answer_{{ $answer->id }}">
|
||||
<label class="form-check-label" for="answer_{{ $answer->id }}">
|
||||
{{ $answer->answer_text }}
|
||||
@if($answer->image)
|
||||
<br><img src="/storage/{{ $answer->image }}" alt="Ответ" style="max-width:200px;max-height:150px;margin-top:10px;">
|
||||
@endif
|
||||
</label>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@push('scripts')
|
||||
<script>
|
||||
function startTest() {
|
||||
alert('Функционал прохождения тестов будет реализован в следующем этапе');
|
||||
}
|
||||
</script>
|
||||
@endpush
|
||||
@endsection
|
||||
|
|
@ -16,6 +16,8 @@ use App\Http\Controllers\Api\OrganizationSearchController;
|
|||
use App\Http\Controllers\Api\GroupSearchController;
|
||||
use App\Http\Controllers\Api\UserSearchController;
|
||||
use App\Http\Controllers\Api\CourseSearchController;
|
||||
use App\Http\Controllers\Student\CourseController as StudentCourseController;
|
||||
use App\Http\Controllers\Student\TestController as StudentTestController;
|
||||
use App\Http\Controllers\DashboardController;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
|
|
@ -78,4 +80,12 @@ Route::middleware('auth')->group(function () {
|
|||
Route::get('/api/users/search', UserSearchController::class)->name('api.users.search');
|
||||
Route::get('/api/courses/search', CourseSearchController::class)->name('api.courses.search');
|
||||
});
|
||||
|
||||
// Учебная часть (требуется аутентификация)
|
||||
Route::middleware('auth')->prefix('student')->name('student.')->group(function() {
|
||||
Route::get('/courses', [StudentCourseController::class, 'index'])->name('courses.index');
|
||||
Route::get('/courses/{course}', [StudentCourseController::class, 'show'])->name('courses.show');
|
||||
Route::get('/tests', [StudentTestController::class, 'index'])->name('tests.index');
|
||||
Route::get('/tests/{test}', [StudentTestController::class, 'show'])->name('tests.show');
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue