diff --git a/resources/views/admin/course-requests/index.blade.php b/resources/views/admin/course-requests/index.blade.php index dfc74ff..ade9b27 100644 --- a/resources/views/admin/course-requests/index.blade.php +++ b/resources/views/admin/course-requests/index.blade.php @@ -44,9 +44,10 @@ - + + @@ -55,7 +56,7 @@ @forelse($requests as $request) - + +
Организация Статус КурсовПолучатели Создана Кем Действия
{{ $request->organization?->name ?? 'Без организации' }}#{{ $request->id }} @if($request->isPending()) Ожидает @@ -66,6 +67,24 @@ @endif {{ $request->items->count() }} + @php + $recipients = []; + if ($request->items->where('user_id')->count() > 0) { + $recipients[] = ' ' . $request->items->where('user_id')->count() . ''; + } + if ($request->items->where('group_id')->count() > 0) { + $recipients[] = ' ' . $request->items->where('group_id')->count() . ''; + } + if ($request->items->where('organization_id')->count() > 0) { + $recipients[] = ' ' . $request->items->where('organization_id')->count() . ''; + } + if (empty($recipients)) { + $recipients[] = ''; + } + @endphp + {!! implode(' ', $recipients) !!} + {{ $request->created_at->format('d.m.Y H:i') }} {{ $request->requestedBy?->name ?? 'Удалён' }} diff --git a/resources/views/admin/course-requests/show.blade.php b/resources/views/admin/course-requests/show.blade.php index e7bd3d6..4984f50 100644 --- a/resources/views/admin/course-requests/show.blade.php +++ b/resources/views/admin/course-requests/show.blade.php @@ -28,7 +28,7 @@
Информация
-
Организация: {{ $courseRequest->organization->name }}
+
Организация: {{ $courseRequest->organization?->name ?? 'Без организации' }}
Статус: @if($courseRequest->isPending()) Ожидает @@ -103,13 +103,13 @@
@if($item->user_id) - {{ $item->user?->name ?? '—' }} + {{ $item->user?->name ?? 'Пользователь #' . $item->user_id }} @elseif($item->group_id) - {{ $item->group?->name ?? '—' }} + {{ $item->group?->name ?? 'Группа #' . $item->group_id }} @elseif($item->organization_id) - {{ $item->organization?->name ?? '—' }} + {{ $item->organization?->name ?? 'Организация #' . $item->organization_id }} @else - {{ $courseRequest->organization->name }} + @endif