diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index c0352a4..f313402 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -120,7 +120,7 @@ class EventController extends Controller 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(); + $events = UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->join('events', 'events.id', '=', 'user_events.event_id')->where('event_id', $request->event)->select('user_events.*', 'users.name_first', 'users.name_last', 'users.phone')->get(); if (count($events) == 0) $events = Event::where('id', $request->event)->get(); @@ -213,11 +213,11 @@ class EventController extends Controller public function destroy(Request $request, $id) { 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::query()->where('user_id', "=", $request->signup)->where('event_id', "=", $id); + $UserEvent = UserEvent::find($id); $UserEvent->delete(); - return redirect()->route("events.signups", [ "event" => $id ]); + return 1; } else { // Else if you are deleting an event. Then delete all the sign ups AND the event $userEvents = UserEvent::query()->where('event_id', "=", $id)->get(); $event = Event::query()->find($id); diff --git a/skolehjem/resources/views/admin/events/signups.blade.php b/skolehjem/resources/views/admin/events/signups.blade.php index 873cbf5..62a97e1 100644 --- a/skolehjem/resources/views/admin/events/signups.blade.php +++ b/skolehjem/resources/views/admin/events/signups.blade.php @@ -19,17 +19,14 @@ @foreach($events as $event) - @if ($event->name_first != null && $event->name_last != null && $event->phone != null && $event->event_id != null && $event->user_id != null) - + @if($event->user_id != null) + {{ $event->name_first }} {{ $event->name_last }} {{ $event->phone }} -
$event->event_id ]) }}" class="w-100 nostyle"> - @csrf - @method("delete") - - -
+ + @csrf + Delete @endif @@ -47,7 +44,7 @@ }); }); - function delete_userevent() { + function delete_userevent(id) { var token = $("input[name='_token']").val(); Swal.fire({ @@ -57,24 +54,22 @@ showCancelButton: true, confirmButtonColor: '#3085d6', cancelButtonColor: '#d33', - confirmButtonText: 'Slet Menuplanen', + confirmButtonText: 'Fjern brugeren fra aktiviteten', cancelButtonText: 'Annuller' }).then((result) => { if (result.isConfirmed) { $.ajax({ type: "POST", - url: "menu-plans/"+id, - data:{'_token':token, _method: 'DELETE'}, + url: "/events/"+id, + data:{'_token':token, _method: 'DELETE', 'signup': true}, success: function () { $('#table_id').DataTable().row($('#row_'+id)[0]).remove().draw(); Swal.fire( - 'Menuplanen er slettet!', + 'Brugeren er fjernet fra aktiviteten!', '', 'success' ) - - return false; }, error:function (data) { console.log(data); @@ -82,7 +77,6 @@ }); } }) - return false; } @endsection