diff --git a/skolehjem/app/Http/Controllers/UserEventController.php b/skolehjem/app/Http/Controllers/UserEventController.php index f1be020..90674ac 100644 --- a/skolehjem/app/Http/Controllers/UserEventController.php +++ b/skolehjem/app/Http/Controllers/UserEventController.php @@ -23,7 +23,9 @@ class UserEventController extends Controller */ public function index(Request $request) { - $userevents = UserEvent::join('events', 'events.id', '=', 'user_events.event_id')->orderBY('date' , 'asc')->where('user_id', auth()->user()->id)->get(); + $userevents = []; + $userevents['events'] = UserEvent::join('events', 'events.id', '=', 'user_events.event_id')->get(); + $userevents['multiple'] = UserEvent::join('multiple_events', 'multiple_events.id', '=', 'user_events.multiple_event_id')->get(); return Response::detect("events.yourevents", [ "userevents" => $userevents ]); } @@ -154,7 +156,7 @@ class UserEventController extends Controller // Check the UserEvent table if there is a row that has the user_id AND the event_id $getTableInfo = UserEvent::where('user_id', auth()->user()->id) - ->where('multiple_event_id', $request->multiple_events_id)->get(); + ->where('multiple_event_id', $request->multiple_event_id)->get(); // If the row has both, then go back and show an error - Cause you're not allowed to be on the same event twice. if (count($getTableInfo) > 0) { diff --git a/skolehjem/resources/views/app/events/yourevents.blade.php b/skolehjem/resources/views/app/events/yourevents.blade.php index 8d89073..271b08c 100644 --- a/skolehjem/resources/views/app/events/yourevents.blade.php +++ b/skolehjem/resources/views/app/events/yourevents.blade.php @@ -35,38 +35,41 @@

{{__('msg.tilmeldteaktiviteter')}}

{!! session()->get('eventunsubscribed') !!} - @if(!$userevents->isEmpty()) - @foreach($userevents as $userevent) -
- @csrf - @method("delete") -
- @if($userevent->resource_id !== null) -
-

{{ $userevent->name }}

-

{{__('msg.af')}}: {{ $userevent->accountable }}

-

{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}

-
- @else -
-

{{ $userevent->name }}

-

{{__('msg.af')}}: {{ $userevent->accountable }}

-

{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}

-
- @endif -
-
- @if (count(\App\UserEvent::query()->where('event_id', '=', $userevent->id)->where('user_id', '=', Auth::user()->id)->get()) > 0) - {{__('msg.afmeld')}} - @else {{-- ^ If you're already participating in the event, then show a ´cancel´ button - v Else show a ´participate´ button --}} - {{__('msg.tilmeld')}} - @endif - $userevent->id ])}}">{{__('msg.læsmere')}} - $userevent->id ])}}">{{__('msg.sedeltagere')}} + @if(!$userevents['events']->isEmpty() || !$userevents['multiple']->isEmpty()) + @foreach($userevents as $key => $allevents) + @foreach($allevents as $userevent) + {{ $key }} + + @csrf + @method("delete") +
+ @if($userevent->resource_id !== null) +
+

{{ $userevent->name }}

+

{{__('msg.af')}}: {{ $userevent->accountable }}

+

{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}

+
+ @else +
+

{{ $userevent->name }}

+

{{__('msg.af')}}: {{ $userevent->accountable }}

+

{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}

+
+ @endif +
+
+ @if (count(\App\UserEvent::query()->where('event_id', '=', $userevent->id)->where('user_id', '=', Auth::user()->id)->get()) > 0) + {{__('msg.afmeld')}} + @else {{-- ^ If you're already participating in the event, then show a ´cancel´ button - v Else show a ´participate´ button --}} + {{__('msg.tilmeld')}} + @endif + $userevent->id ])}}">{{__('msg.læsmere')}} + $userevent->id ])}}">{{__('msg.sedeltagere')}} +
-
- + + @endforeach @endforeach @else

{{__('msg.duharikketilmeldtdignogenaktiviteter')}}!