diff --git a/skolehjem/app/Http/Controllers/MultipleEventsController.php b/skolehjem/app/Http/Controllers/MultipleEventsController.php
index 931e4f6..bc06a18 100644
--- a/skolehjem/app/Http/Controllers/MultipleEventsController.php
+++ b/skolehjem/app/Http/Controllers/MultipleEventsController.php
@@ -36,7 +36,7 @@ class MultipleEventsController extends Controller
*/
public function index()
{
- $multiEvents = MultipleEventsParent::join("multiple_events", "multiple_events.multiple_events_parent_id", '=', 'multiple_events_parent.id')->groupBy('multiple_events_parent_id')->orderBy('multiple_events.date', 'desc')->selectRaw('multiple_events_parent.*, max(date) as date')->get();
+ $multiEvents = MultipleEventsParent::join("multiple_events", "multiple_events.multiple_events_parent_id", '=', 'multiple_events_parent.id')->groupBy('multiple_events.multiple_events_parent_id', 'multiple_events_parent.id', 'multiple_events_parent.week', 'multiple_events_parent.resource_id', 'multiple_events_parent.created_at', 'multiple_events_parent.updated_at')->selectRaw('multiple_events_parent.*, max(date) as date')->get();
return Response::detect("multiple-events.index", [ "multiEvents" => $multiEvents]);
}
@@ -124,6 +124,23 @@ class MultipleEventsController extends Controller
return Response::detect("multiple-events.show", [ "week" => $multiEventParent->week, "multiEvents" => $multiEvents]);
}
+ /**
+ * Display signups for event.
+ *
+ * @param int $id
+ * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public function accountsignups(Request $request)
+ {
+ // Find every event you have clicked on. And find all users to that event, and the event name itself.
+ $events = UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->where('multiple_event_id', $request->multiEvent)->select('user_events.*', 'users.name_first', 'users.name_last', 'users.phone')->get();
+
+ if (count($events) == 0)
+ $events = Event::where('id', $request->event)->get();
+
+ return Response::detect("multiple-events.signups", [ "multiEvent" => $events ]);
+ }
+
/**
* Show the form for editing the specified resource.-
*
@@ -197,18 +214,6 @@ class MultipleEventsController extends Controller
return Response::detect("events.index", [ "events" => $events]);
}
-
- public function accountsignups(Request $request)
- {
- // Find every event you have clicked on. And find all users to that event, and the event name itself.
- $multiEvents = UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->join('multiple_events', 'multiple_events.id', '=', 'user_events.multiple_event_id')->where('multiple_event_id', $request->multiEvent)->get();
-
- if (count($multiEvents) == 0)
- $multiEvents = Event::where('id', $request->event)->get();
-
- return Response::detect("multiple-events.signups", [ "multiEvent" => $multiEvents ]);
- }
-
/**
* Remove the specified resource from storage.
*
diff --git a/skolehjem/database/migrations/2021_01_22_002613_remove_event.php b/skolehjem/database/migrations/2021_01_22_002613_remove_event.php
deleted file mode 100644
index 710965e..0000000
--- a/skolehjem/database/migrations/2021_01_22_002613_remove_event.php
+++ /dev/null
@@ -1,31 +0,0 @@
-= 24 AND date(events.date) < CURDATE()");
- }
- */
-
- /**
- * Reverse the migrations.
- *
- * @return void
- */
- public function down()
- {
- //
- }
-}
diff --git a/skolehjem/database/migrations/2021_01_22_002613_remove_news.php b/skolehjem/database/migrations/2021_01_22_002613_remove_news.php
deleted file mode 100644
index 656401f..0000000
--- a/skolehjem/database/migrations/2021_01_22_002613_remove_news.php
+++ /dev/null
@@ -1,31 +0,0 @@
-id }}, this)" @elseif($key == "multiple") onclick="ajaxMultiCall({{ $userevent->id }}, this)" @endif id="f">{{__('msg.tilmeld')}}
@endif
$userevent->id ])}}">{{__('msg.læsmere')}}
- $userevent->id ])}}">{{__('msg.sedeltagere')}}
+ $userevent->id ])}}" @elseif($key == "multiple") href="{{route("multiple-events.accountsignups", ["multiEvent" => $userevent->id])}}" @endif>{{__('msg.sedeltagere')}}