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

v1.5.19b bad back and frontend work

This commit is contained in:
Neerholt 2021-05-04 08:15:21 +02:00
parent 125ea424e3
commit 574534fe2a
2 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,9 @@ class UserEventController extends Controller
*/ */
public function index(Request $request) 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 ]); 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 // 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) $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 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) { if (count($getTableInfo) > 0) {

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

@ -35,38 +35,41 @@
<main> <main>
<h1 class="text-center sde-blue mb-2rem">{{__('msg.tilmeldteaktiviteter')}}</h1> <h1 class="text-center sde-blue mb-2rem">{{__('msg.tilmeldteaktiviteter')}}</h1>
{!! session()->get('eventunsubscribed') !!} {!! session()->get('eventunsubscribed') !!}
@if(!$userevents->isEmpty()) @if(!$userevents['events']->isEmpty() || !$userevents['multiple']->isEmpty())
@foreach($userevents as $userevent) @foreach($userevents as $key => $allevents)
<form method="post" action="{{ route("userevents.destroy", $userevent) }}"> @foreach($allevents as $userevent)
@csrf {{ $key }}
@method("delete") <form method="post" action="{{ route("userevents.destroy", $userevent) }}">
<div class="card"> @csrf
@if($userevent->resource_id !== null) @method("delete")
<div class="header bs-cover bp-center" style="background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $userevent->resource_id)->first()->filename) }}');"> <div class="card">
<h3 class="event-text-shadow">{{ $userevent->name }}</h3> @if($userevent->resource_id !== null)
<p class="event-text-shadow text-center mt-0">{{__('msg.af')}}: {{ $userevent->accountable }}</p> <div class="header bs-cover bp-center" style="background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $userevent->resource_id)->first()->filename) }}');">
<p class="event-text-shadow text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}</p> <h3 class="event-text-shadow">{{ $userevent->name }}</h3>
</div> <p class="event-text-shadow text-center mt-0">{{__('msg.af')}}: {{ $userevent->accountable }}</p>
@else <p class="event-text-shadow text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}</p>
<div class="header"> </div>
<h3>{{ $userevent->name }}</h3> @else
<p class="text-center mt-0">{{__('msg.af')}}: {{ $userevent->accountable }}</p> <div class="header">
<p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}</p> <h3>{{ $userevent->name }}</h3>
</div> <p class="text-center mt-0">{{__('msg.af')}}: {{ $userevent->accountable }}</p>
@endif <p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}</p>
<div class="container"> </div>
<div class="row justify-content-space"> @endif
@if (count(\App\UserEvent::query()->where('event_id', '=', $userevent->id)->where('user_id', '=', Auth::user()->id)->get()) > 0) <div class="container">
<a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $userevent->id }}, this)" id="t">{{__('msg.afmeld')}}</a> <div class="row justify-content-space">
@else {{-- ^ If you're already participating in the event, then show a ´cancel´ button - v Else show a ´participate´ button --}} @if (count(\App\UserEvent::query()->where('event_id', '=', $userevent->id)->where('user_id', '=', Auth::user()->id)->get()) > 0)
<a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $userevent->id }}, this)" >{{__('msg.tilmeld')}}</a> <a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" @if($key == "events") onclick="ajaxCall({{ $userevent->id }}, this)" @elseif($key == "multiple") @endif id="t">{{__('msg.afmeld')}}</a>
@endif @else {{-- ^ If you're already participating in the event, then show a ´cancel´ button - v Else show a ´participate´ button --}}
<a class="sde-blue text-center m-none p-none bold" href="{{route("events.show", ["event" => $userevent->id ])}}">{{__('msg.læsmere')}}</a> <a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $userevent->id }}, this)" >{{__('msg.tilmeld')}}</a>
<a class="sde-blue text-center m-none p-none bold" href="{{route("events.accountsignups", ["event" => $userevent->id ])}}">{{__('msg.sedeltagere')}}</a> @endif
<a class="sde-blue text-center m-none p-none bold" href="{{route("events.show", ["event" => $userevent->id ])}}">{{__('msg.læsmere')}}</a>
<a class="sde-blue text-center m-none p-none bold" href="{{route("events.accountsignups", ["event" => $userevent->id ])}}">{{__('msg.sedeltagere')}}</a>
</div>
</div> </div>
</div> </div>
</div> </form>
</form> @endforeach
@endforeach @endforeach
@else @else
<p class="text-center">{{__('msg.duharikketilmeldtdignogenaktiviteter')}}!</p> <p class="text-center">{{__('msg.duharikketilmeldtdignogenaktiviteter')}}!</p>