diff --git a/skolehjem/app/Http/Controllers/UserEventController.php b/skolehjem/app/Http/Controllers/UserEventController.php index bdbb171..8633848 100644 --- a/skolehjem/app/Http/Controllers/UserEventController.php +++ b/skolehjem/app/Http/Controllers/UserEventController.php @@ -15,7 +15,7 @@ class UserEventController extends Controller */ public function index() { - $userevents = UserEvent::join('events', 'events.id', '=', 'user_events.event_id')->where('user_id', auth()->user()->id)->get(); + $userevents = UserEvent::join('events', 'events.id', '=', 'user_events.event_id')->orderBY('date' , 'asc')->where('user_id', auth()->user()->id)->get(); return Response::detect("events.yourevents", [ "userevents" => $userevents ]); } @@ -71,7 +71,7 @@ class UserEventController extends Controller $JoinedEvents = UserEvent::query()->join('events', 'events.id', '=', 'user_events.event_id')->where('user_id', "=", auth()->user()->id)->get(); - return redirect()->route("userevents.index", [ "userevents" => $JoinedEvents ])->with('eventunsubscribed', '<p class="text-center">Du har hermed afmeldt aktiviteten!</p>'); + return redirect()->route("userevents.index", [ "userevents" => $JoinedEvents ])->with('eventunsubscribed', '<p class="text-center">Du er hermed afmeldt aktiviteten!</p>'); } public function show() diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index e61ce37..050a38a 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -35,7 +35,7 @@ class WashingReservationController extends Controller */ public function index(Request $request) { - $reservations = WashingReservation::query()->paginate($request->query("limit", 20)); + $reservations = WashingReservation::query()->orderBY('time' , 'asc')->paginate($request->query("limit", 20)); return Response::detect("washing-reservations.index", [ "reservations" => $reservations]); } @@ -78,7 +78,7 @@ class WashingReservationController extends Controller } else { $reservations = WashingReservation::query()->paginate($request->input("limit", 20)); - return Response::detect("washing-reservations.index", ["reservations" => $reservations]); + return redirect()->route('washing-reservations.index', ["reservations" => $reservations]); } } diff --git a/skolehjem/resources/views/app/events/yourevents.blade.php b/skolehjem/resources/views/app/events/yourevents.blade.php index c153e29..32be557 100644 --- a/skolehjem/resources/views/app/events/yourevents.blade.php +++ b/skolehjem/resources/views/app/events/yourevents.blade.php @@ -15,7 +15,7 @@ <h3 class="sde-blue bold text-center mb-0">{{$userevent->name}}</h3> <p class="text-center mt-0">{{$userevent->date}}</p> <p class="text-center">{{$userevent->description}}</p> - <button type="submit" class="btn text-center btn-sde-blue" onclick="return confirm('Are you sure you want to remove this reservation?');">Afmeld</button> + <button type="submit" class="btn text-center btn-sde-blue" onclick="return confirm('Are you sure you want to remove this event?');">Afmeld</button> </form> @endforeach @else