vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added - orderBy to own events & own reservations 

Fixed - confirm message when deleting events
This commit is contained in:
Anders 2020-08-03 11:17:36 +02:00
parent 90b58a8586
commit 11e3958f0a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
skolehjem/app/Http/Controllers/UserEventController.php
View File

@ -15,7 +15,7 @@ class UserEventController extends Controller
*/ */
public function index() 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 ]); 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(); $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() public function show()

4
skolehjem/app/Http/Controllers/WashingReservationController.php
View File

@ -35,7 +35,7 @@ class WashingReservationController extends Controller
*/ */
public function index(Request $request) 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]); return Response::detect("washing-reservations.index", [ "reservations" => $reservations]);
} }
@ -78,7 +78,7 @@ class WashingReservationController extends Controller
} else { } else {
$reservations = WashingReservation::query()->paginate($request->input("limit", 20)); $reservations = WashingReservation::query()->paginate($request->input("limit", 20));
return Response::detect("washing-reservations.index", ["reservations" => $reservations]); return redirect()->route('washing-reservations.index', ["reservations" => $reservations]);
} }
} }

2
skolehjem/resources/views/app/events/yourevents.blade.php
View File

@ -15,7 +15,7 @@
<h3 class="sde-blue bold text-center mb-0">{{$userevent->name}}</h3> <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 mt-0">{{$userevent->date}}</p>
<p class="text-center">{{$userevent->description}}</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> </form>
@endforeach @endforeach
@else @else