diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..efd2186 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index f487688..e7a4022 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Event; +use App\UserEvent; use App\User; use Illuminate\Http\Request; use Illuminate\Http\Response; @@ -87,6 +88,23 @@ class EventController extends Controller return Response::detect("events.show", [ "event" => $id ]); } + /** + * Display signups for event. + * + * @param int $id + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function signups(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')->join('events', 'events.id', '=', 'user_events.event_id')->where('event_id', $request->event)->get(); + + if (count($events) == 0) + $events = Event::where('id', $request->event)->get(); + + return Response::detect("events.signups", [ "events" => $events ]); + } + /** * Show the form for editing the specified resource.- * @@ -130,11 +148,20 @@ class EventController extends Controller * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View * @throws \Exception */ - public function destroy($id) + public function destroy(Request $request, $id) { - $event = Event::find($id); - $event->delete(); - return redirect()->route("events.index"); + if ($request->signup != null) { // If input signup is not empty, which has been set when you look at the individuel signup, then delete the user who have signed up for the event + $UserEvent = UserEvent::where('user_id', $request->signup)->where('event_id', $id); + $UserEvent->delete(); + return redirect()->route("events.signups", [ "event" => $id ]); + } else { // Else if you are deleting an event. Then delete all the sign ups AND the event + $UserEvent = UserEvent::where('event_id', $id); + $UserEvent->delete(); + + $event = Event::find($id); + $event->delete(); + return redirect()->route("events.index"); + } } diff --git a/skolehjem/public/images/icons/eye-dark.svg b/skolehjem/public/images/icons/eye-dark.svg new file mode 100644 index 0000000..578309c --- /dev/null +++ b/skolehjem/public/images/icons/eye-dark.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index 22b9f4a..02a44f3 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -24,6 +24,7 @@ Event Navn Event Beskrivelse Event Dato + Update Update Delete @@ -32,6 +33,7 @@ {{ $event->name }} {{ $event->description }} {{ $event->date }} + $event ]) }}">Update $event ]) }}">Update
$event ]) }}" class="w-100 nostyle"> @csrf diff --git a/skolehjem/resources/views/admin/events/signups.blade.php b/skolehjem/resources/views/admin/events/signups.blade.php new file mode 100644 index 0000000..85d9f3a --- /dev/null +++ b/skolehjem/resources/views/admin/events/signups.blade.php @@ -0,0 +1,65 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Events - Tilmeldte +@endsection + +@section("path") + Vis Events / Vis Tilmeldte - {{ $events[0]->name }} / +@endsection + +@section("content") +
+ + + @csrf + + + +
+ + + + + + + + @foreach($events as $event) + @if ($event->name_first != null && $event->name_last != null && $event->phone != null && $event->event_id != null && $event->user_id != null) + + + + + + + @endif + @endforeach +
Tilmeldtes FornavnTilmeldtes EfternavnTilmeldtes Tlf NrDelete
{{ $event->name_first }}{{ $event->name_last }}{{ $event->phone }}
$event->event_id ]) }}" class="w-100 nostyle"> + @csrf + @method("delete") + + +
+
+ + + + +@endsection diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 0a33e89..e07bc62 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -29,6 +29,7 @@ Route::get("/account", "UserController@account")->name("users.account"); Route::get("/account/edit", "UserController@accountedit")->name("users.accountedit"); Route::get("/account/editpass", "UserController@accounteditpass")->name("users.accounteditpass"); Route::post("/account/update", "UserController@update")->name("users.accountupdate"); +Route::get("/events/signups", "EventController@signups")->name("events.signups"); Route::get("phones", "PhoneController@index")->name("phones.index"); Route::get("/contactsapi", "ContactController@search")->name("contacts.search"); Route::get("/eventsapi", "EventController@search")->name("events.search");