From 125ea424e3ec6ba3b64508346638c8eb625aefec Mon Sep 17 00:00:00 2001 From: Neerholt Date: Thu, 29 Apr 2021 10:43:35 +0200 Subject: [PATCH] v1.5.19c only bugs 2 --- .../Http/Controllers/MultipleEventsController.php | 12 ++++++++++++ .../resources/views/admin/events/index.blade.php | 4 +++- .../views/admin/multiple-events/signups.blade.php | 10 +++++----- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/skolehjem/app/Http/Controllers/MultipleEventsController.php b/skolehjem/app/Http/Controllers/MultipleEventsController.php index 13c58fa..ae3351d 100644 --- a/skolehjem/app/Http/Controllers/MultipleEventsController.php +++ b/skolehjem/app/Http/Controllers/MultipleEventsController.php @@ -228,5 +228,17 @@ class MultipleEventsController extends Controller } + public function signups(Request $request) + { + dd("K"); + // Find every event you have clicked on. And find all users to that event, and the event name itself. + $multiEvents = MultipleEvents::join('users', 'users.id', '=', 'user_events.user_id')->join('multiple_event', 'multiple_event_id.id', '=', 'user_events.multiple_event_id')->where('multiple_event_id', $request->event)->get(); + + if (count($multiEvents) == 0) + $multiEvents = MultipleEvents::where('id', $request->event)->get(); + + return Response::detect("multiple-events.signups", [ "multiEvent" => $multiEvents ]); + } + } diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index ea327a0..66a5bdb 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -71,6 +71,7 @@ + @if(auth()->user()->can('event.edit')) @@ -84,6 +85,7 @@ @foreach(\App\MultipleEventsParent::query()->orderBY('id' , 'desc')->get() as $event) + @if(auth()->user()->can('event.edit')) @@ -227,7 +229,7 @@ $('#table_id2').DataTable({ columnDefs: [ - { orderable: false, targets: [-1, -2, -3, -4] } + { orderable: false, targets: [-1, -2, -3, -4, -5] } ] }); }); diff --git a/skolehjem/resources/views/admin/multiple-events/signups.blade.php b/skolehjem/resources/views/admin/multiple-events/signups.blade.php index 51ddd4e..abd2fc7 100644 --- a/skolehjem/resources/views/admin/multiple-events/signups.blade.php +++ b/skolehjem/resources/views/admin/multiple-events/signups.blade.php @@ -2,11 +2,11 @@ @extends("admin.layout.header") @section("title") - Events - Tilmeldte + ugentlige aktiviteter - Tilmeldte @endsection @section("path") - Vis Events / Vis Tilmeldte - {{ $events[0]->name }} / + Vis Events / Vis Tilmeldte - {{ $multiEvent[0]->name }} / @endsection @section("content") @@ -18,13 +18,13 @@ - @foreach($events as $event) - @if ($event->name_first != null && $event->name_last != null && $event->phone != null && $event->event_id != null && $event->user_id != null) + @foreach($multiEvent as $event) + @if ($event->name_first != null && $event->name_last != null && $event->phone != null && $event->multiple_event_id != null && $event->user_id != null) -
UgeShow previewPrint
{{ $event->week}}id) }}">Show preview $event->id ]) }}" target="_blank">PrintDelete
{{ $event->name_first }} {{ $event->name_last }} {{ $event->phone }}
$event->event_id ]) }}" class="w-100 nostyle"> +
$event->event_id ]) }}" class="w-100 nostyle"> @csrf @method("delete")