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 @@
Uge | +||||
---|---|---|---|---|
{{ $event->week}} | +id) }}"> |
$event->id ]) }}" target="_blank"> |
@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 @@
||
{{ $event->name_first }} | {{ $event->name_last }} | {{ $event->phone }} | -