diff --git a/app/Http/Controllers/Student/ScheduleController.php b/app/Http/Controllers/Student/ScheduleController.php new file mode 100755 index 0000000..1aa4f93 --- /dev/null +++ b/app/Http/Controllers/Student/ScheduleController.php @@ -0,0 +1,151 @@ +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; + } +} diff --git a/resources/views/partials/_sidebar.blade.php b/resources/views/partials/_sidebar.blade.php index 64d4f17..7495bfc 100644 --- a/resources/views/partials/_sidebar.blade.php +++ b/resources/views/partials/_sidebar.blade.php @@ -94,10 +94,15 @@
  • - + Тесты
    • +
  • + + Расписание + +
  • Прогресс diff --git a/resources/views/student/schedule/calendar.blade.php b/resources/views/student/schedule/calendar.blade.php new file mode 100644 index 0000000..2888c26 --- /dev/null +++ b/resources/views/student/schedule/calendar.blade.php @@ -0,0 +1,54 @@ +@extends('layouts.app') +@section('title', 'Календарь') +@section('content') +
    +
    + +
    +
    +

    Календарь

    +     + Список + +
    + +
    +
    +
    +
    +
    +
    +
    +
    + + + + + +@push('scripts') + +@endpush +@endsection diff --git a/resources/views/student/schedule/index.blade.php b/resources/views/student/schedule/index.blade.php new file mode 100644 index 0000000..f229138 --- /dev/null +++ b/resources/views/student/schedule/index.blade.php @@ -0,0 +1,164 @@ +@extends('layouts.app') +@section('title', 'Расписание') +@section('content') +
    +
    + +
    +
    +

    Расписание

    + +
    + + +
    +
    +
    +
    +
    {{ $stats['courses_count'] }}
    +
    Курсов
    +
    +
    +
    +
    +
    +
    +
    {{ $stats['tests_count'] }}
    +
    Тестов
    +
    +
    +
    +
    +
    +
    +
    {{ $stats['upcoming_tests'] }}
    +
    Предстоящих тестов
    +
    +
    +
    +
    + + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + + +
    +
    Временная шкала
    +
    + @if(count($schedule) > 0) +
    + @foreach($schedule as $date => $events) +
    +
    +
    + + {{ \Carbon\Carbon::parse($date)->format('d.m.Y') }} + ({{ \Carbon\Carbon::parse($date)->diffForHumans() }}) +
    +
    +
    + @foreach($events as $event) +
    +
    +
    + +
    + + {{ $event['title'] }} + +
    {{ $event['description'] }}
    +
    + {{ $event['type'] === 'course' ? 'Курс' : 'Тест' }} +
    +
    +
    + @endforeach +
    +
    + @endforeach +
    + @else +
    + +

    Событий пока нет

    +
    + @endif +
    +
    + + + @if($tests->count() > 0) +
    +
    Доступные тесты
    +
    +
    + + + + + + + + + + + @foreach($tests as $test) + + + + + + + @endforeach + +
    НазваниеКурсВопросовДействия
    {{ $test->title }}{{ $test->course->title }}{{ $test->questions->count() }} + + Начать + +
    +
    +
    +
    + @endif +
    +
    +
    + + +@endsection diff --git a/routes/web.php b/routes/web.php index bb166a4..ff753bc 100644 --- a/routes/web.php +++ b/routes/web.php @@ -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'); }); });