Feat: Расписание для студентов
✅ ScheduleController (index, calendar) ✅ Временная шкала событий ✅ Календарь (FullCalendar) ✅ Фильтры (сегодня/неделя/месяц) ✅ Статистика (курсы/тесты) ✅ Ссылка в сайдбаре Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
parent
4ee0b55643
commit
b8d9584f7d
|
|
@ -0,0 +1,151 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Student;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\CourseAssignment;
|
||||
use App\Models\Test;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Carbon\Carbon;
|
||||
|
||||
class ScheduleController extends Controller
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('auth');
|
||||
}
|
||||
|
||||
public function index(Request $request)
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
// Получаем назначенные курсы с датами
|
||||
$courseAssignments = CourseAssignment::with(['course', 'group', 'organization'])
|
||||
->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);
|
||||
});
|
||||
});
|
||||
|
||||
// Фильтры
|
||||
if ($request->filled('filter')) {
|
||||
if ($request->filter === 'today') {
|
||||
$courseAssignments->whereDate('start_date', today());
|
||||
} elseif ($request->filter === 'week') {
|
||||
$courseAssignments->whereBetween('start_date', [now()->startOfWeek(), now()->endOfWeek()]);
|
||||
} elseif ($request->filter === 'month') {
|
||||
$courseAssignments->whereMonth('start_date', now()->month);
|
||||
}
|
||||
}
|
||||
|
||||
$assignments = $courseAssignments->orderBy('start_date')->get();
|
||||
|
||||
// Получаем тесты с дедлайнами
|
||||
$courseIds = $assignments->pluck('course_id');
|
||||
$tests = Test::with(['course'])
|
||||
->whereIn('course_id', $courseIds)
|
||||
->where('is_active', true)
|
||||
->orderBy('created_at')
|
||||
->get();
|
||||
|
||||
// Группируем по датам для календаря
|
||||
$schedule = $this->buildSchedule($assignments, $tests);
|
||||
|
||||
// Статистика
|
||||
$stats = [
|
||||
'courses_count' => $assignments->unique('course_id')->count(),
|
||||
'tests_count' => $tests->count(),
|
||||
'upcoming_tests' => $tests->where('created_at', '>=', now())->count(),
|
||||
];
|
||||
|
||||
return view('student.schedule.index', compact('schedule', 'stats', 'tests'));
|
||||
}
|
||||
|
||||
public function calendar()
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
// Получаем все назначения для календаря
|
||||
$assignments = CourseAssignment::with(['course'])
|
||||
->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);
|
||||
});
|
||||
})
|
||||
->get();
|
||||
|
||||
// Формируем события для календаря
|
||||
$events = [];
|
||||
|
||||
foreach ($assignments as $assignment) {
|
||||
$events[] = [
|
||||
'title' => $assignment->course->title,
|
||||
'start' => $assignment->start_date->format('Y-m-d'),
|
||||
'end' => $assignment->end_date?->format('Y-m-d'),
|
||||
'color' => '#0d6efd',
|
||||
'url' => route('student.courses.show', $assignment->course),
|
||||
];
|
||||
}
|
||||
|
||||
return view('student.schedule.calendar', compact('events'));
|
||||
}
|
||||
|
||||
private function buildSchedule($assignments, $tests)
|
||||
{
|
||||
$schedule = [];
|
||||
|
||||
// Добавляем курсы
|
||||
foreach ($assignments as $assignment) {
|
||||
$date = $assignment->start_date->format('Y-m-d');
|
||||
if (!isset($schedule[$date])) {
|
||||
$schedule[$date] = [];
|
||||
}
|
||||
|
||||
$schedule[$date][] = [
|
||||
'type' => 'course',
|
||||
'title' => $assignment->course->title,
|
||||
'description' => 'Начало курса',
|
||||
'color' => 'primary',
|
||||
'icon' => 'bi-book',
|
||||
'url' => route('student.courses.show', $assignment->course),
|
||||
];
|
||||
}
|
||||
|
||||
// Добавляем тесты
|
||||
foreach ($tests as $test) {
|
||||
$date = $test->created_at->format('Y-m-d');
|
||||
if (!isset($schedule[$date])) {
|
||||
$schedule[$date] = [];
|
||||
}
|
||||
|
||||
$schedule[$date][] = [
|
||||
'type' => 'test',
|
||||
'title' => $test->title,
|
||||
'description' => $test->course->title,
|
||||
'color' => 'success',
|
||||
'icon' => 'bi-file-earmark-text',
|
||||
'url' => route('student.tests.show', $test),
|
||||
];
|
||||
}
|
||||
|
||||
// Сортируем по датам
|
||||
ksort($schedule);
|
||||
|
||||
return $schedule;
|
||||
}
|
||||
}
|
||||
|
|
@ -94,10 +94,15 @@
|
|||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {{ Str::startsWith($currentRoute, 'admin.tests') ? 'active' : '' }}" href="{{ route('admin.courses.tests.index', \App\Models\Course::first()) }}">
|
||||
<a class="nav-link {{ Str::startsWith($currentRoute, 'admin.tests') ? 'active' : '' }}" href="{{ route('student.tests.index') }}">
|
||||
<i class="bi bi-file-earmark-text"></i> Тесты
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {{ Str::startsWith($currentRoute, 'student.schedule') ? 'active' : '' }}" href="{{ route('student.schedule.index') }}">
|
||||
<i class="bi bi-calendar3"></i> Расписание
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="#">
|
||||
<i class="bi bi-graph-up"></i> Прогресс
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
@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-calendar-week"></i> Календарь</h1>
|
||||
<a href="{{ route('student.schedule.index') }}" class="btn btn-outline-primary btn-sm">
|
||||
<i class="bi bi-list"></i> Список
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-body">
|
||||
<div id="calendar"></div>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- FullCalendar -->
|
||||
<link href="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.10/index.global.min.css" rel="stylesheet">
|
||||
<script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.10/index.global.min.js"></script>
|
||||
|
||||
@push('scripts')
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
const calendarEl = document.getElementById('calendar');
|
||||
|
||||
const calendar = new FullCalendar.Calendar(calendarEl, {
|
||||
initialView: 'dayGridMonth',
|
||||
locale: 'ru',
|
||||
headerToolbar: {
|
||||
left: 'prev,next today',
|
||||
center: 'title',
|
||||
right: 'dayGridMonth,timeGridWeek,listWeek'
|
||||
},
|
||||
events: @json($events),
|
||||
eventClick: function(info) {
|
||||
if (info.event.url) {
|
||||
window.location.href = info.event.url;
|
||||
}
|
||||
},
|
||||
height: 'auto'
|
||||
});
|
||||
|
||||
calendar.render();
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
@endsection
|
||||
|
|
@ -0,0 +1,164 @@
|
|||
@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-calendar3"></i> Расписание</h1>
|
||||
<div>
|
||||
<a href="{{ route('student.schedule.calendar') }}" class="btn btn-outline-primary btn-sm">
|
||||
<i class="bi bi-calendar-week"></i> Календарь
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Статистика -->
|
||||
<div class="row mb-4">
|
||||
<div class="col-md-4">
|
||||
<div class="card shadow-sm border-primary">
|
||||
<div class="card-body text-center">
|
||||
<div class="display-4 text-primary">{{ $stats['courses_count'] }}</div>
|
||||
<div class="text-muted">Курсов</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="card shadow-sm border-success">
|
||||
<div class="card-body text-center">
|
||||
<div class="display-4 text-success">{{ $stats['tests_count'] }}</div>
|
||||
<div class="text-muted">Тестов</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="card shadow-sm border-info">
|
||||
<div class="card-body text-center">
|
||||
<div class="display-4 text-info">{{ $stats['upcoming_tests'] }}</div>
|
||||
<div class="text-muted">Предстоящих тестов</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Фильтры -->
|
||||
<div class="card shadow-sm mb-4">
|
||||
<div class="card-body">
|
||||
<form action="{{ route('student.schedule.index') }}" method="GET" class="row g-3">
|
||||
<div class="col-md-4">
|
||||
<select name="filter" class="form-select">
|
||||
<option value="">Все события</option>
|
||||
<option value="today" {{ request('filter') == 'today' ? 'selected' : '' }}>Сегодня</option>
|
||||
<option value="week" {{ request('filter') == 'week' ? 'selected' : '' }}>Эта неделя</option>
|
||||
<option value="month" {{ request('filter') == 'month' ? 'selected' : '' }}>Этот месяц</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>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Временная шкала -->
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-header"><h5 class="mb-0"><i class="bi bi-clock-history"></i> Временная шкала</h5></div>
|
||||
<div class="card-body">
|
||||
@if(count($schedule) > 0)
|
||||
<div class="timeline">
|
||||
@foreach($schedule as $date => $events)
|
||||
<div class="mb-4">
|
||||
<div class="d-flex align-items-center mb-3">
|
||||
<div class="badge bg-primary rounded-pill px-3 py-2">
|
||||
<i class="bi bi-calendar-event"></i>
|
||||
{{ \Carbon\Carbon::parse($date)->format('d.m.Y') }}
|
||||
<small class="ms-2">({{ \Carbon\Carbon::parse($date)->diffForHumans() }})</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ms-4">
|
||||
@foreach($events as $event)
|
||||
<div class="card mb-2 border-0 shadow-sm">
|
||||
<div class="card-body py-2">
|
||||
<div class="d-flex align-items-center">
|
||||
<i class="bi {{ $event['icon'] }} fs-4 text-{{ $event['color'] }} me-3"></i>
|
||||
<div class="flex-grow-1">
|
||||
<a href="{{ $event['url'] }}" class="text-decoration-none">
|
||||
<strong>{{ $event['title'] }}</strong>
|
||||
</a>
|
||||
<div class="text-muted small">{{ $event['description'] }}</div>
|
||||
</div>
|
||||
<span class="badge bg-{{ $event['color'] }}">{{ $event['type'] === 'course' ? 'Курс' : 'Тест' }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
@else
|
||||
<div class="text-center text-muted py-5">
|
||||
<i class="bi bi-calendar-x" style="font-size: 4rem;"></i>
|
||||
<p class="mt-3">Событий пока нет</p>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Список тестов -->
|
||||
@if($tests->count() > 0)
|
||||
<div class="card shadow-sm mt-4">
|
||||
<div class="card-header"><h5 class="mb-0"><i class="bi bi-file-earmark-text"></i> Доступные тесты</h5></div>
|
||||
<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>
|
||||
@endif
|
||||
</main>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.timeline {
|
||||
position: relative;
|
||||
padding-left: 30px;
|
||||
}
|
||||
.timeline::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: 10px;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
width: 2px;
|
||||
background: #dee2e6;
|
||||
}
|
||||
</style>
|
||||
@endsection
|
||||
|
|
@ -19,6 +19,7 @@ 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\Student\ScheduleController as StudentScheduleController;
|
||||
use App\Http\Controllers\DashboardController;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
|
|
@ -86,5 +87,7 @@ Route::middleware('auth')->group(function () {
|
|||
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');
|
||||
Route::get('/schedule', [StudentScheduleController::class, 'index'])->name('schedule.index');
|
||||
Route::get('/calendar', [StudentScheduleController::class, 'calendar'])->name('schedule.calendar');
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue