v1.5.20a - Fixed event destroy

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);

skolehjem/resources/views/admin/events/signups.blade.php

@@ -19,17 +19,14 @@
         </thead>
         <tbody>
             @foreach($events as $event)
-                @if ($event->name_first != null && $event->name_last != null && $event->phone != null && $event->event_id != null && $event->user_id != null)
-                    <tr>
+                @if($event->user_id != null)
+                    <tr id="row_{{ $event->id }}">
                         <td>{{ $event->name_first }}</td>
                         <td>{{ $event->name_last }}</td>
                         <td>{{ $event->phone }}</td>
-                        <td><form method="post" action="{{ route("events.destroy", [ "event" => $event->event_id ]) }}" class="w-100 nostyle">
-                                @csrf
-                                @method("delete")
-
-                                <button name="signup" value="{{ $event->user_id }}" class="w-100 nostyle" onclick="delete_userevent();" type="submit"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
-                            </form>
+                        <td>
+                            @csrf
+                            <a class="w-100 nostyle" onclick="delete_userevent({{ $event->id }})"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a>
                         </td>
                     </tr>
                 @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;
         }
     </script>
 @endsection