From 027a99b00277f327e4d55e5348acdec818009db8 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Wed, 28 Apr 2021 15:14:31 +0200 Subject: [PATCH] v1.5.18 Multiple events works, only admin pages is missing some pdf, view user and jpg functions --- .../Controllers/MultipleEventsController.php | 18 ++++- .../Http/Controllers/UserEventController.php | 63 +++++++++++++++- .../views/app/multiple-events/index.blade.php | 48 ++++++++----- .../app/multiple-events/signups.blade.php | 72 +++++++++++++++++++ .../resources/views/app/news/index.blade.php | 2 +- skolehjem/routes/web.php | 4 ++ 6 files changed, 183 insertions(+), 24 deletions(-) create mode 100644 skolehjem/resources/views/app/multiple-events/signups.blade.php diff --git a/skolehjem/app/Http/Controllers/MultipleEventsController.php b/skolehjem/app/Http/Controllers/MultipleEventsController.php index 7e7df4a..3a38fa6 100644 --- a/skolehjem/app/Http/Controllers/MultipleEventsController.php +++ b/skolehjem/app/Http/Controllers/MultipleEventsController.php @@ -98,17 +98,17 @@ class MultipleEventsController extends Controller $multiEvents = MultipleEventsParent::query()->get(); if($request->newsoption == true){ $news = new News(); - $news->name = "Nye ugenlig aktivitet"; + $news->name = "Nye ugentlig aktivitets"; $news->subname = $event->week; $news->arrangement_id = $multipleParent->id; $news->type_id = '5'; - $news->content = "Den ugenlige aktivitets plan er landet"; + $news->content = "Den ugentlige aktivitets plan er landet"; $news->resource_id = $event->resource_id; NewsController::storeAndGet($news); } - return redirect()->route('multiple-events.index', ['multiEvents' => $multiEvents]); + return redirect()->route('events.index', ['multiEvents' => $multiEvents]); } @@ -146,6 +146,18 @@ class MultipleEventsController extends Controller // } + + public function accountsignups(Request $request) + { + // Find every event you have clicked on. And find all users to that event, and the event name itself. + $multiEvents = UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->join('multiple_events', 'multiple_events.id', '=', 'user_events.multiple_event_id')->where('multiple_event_id', $request->multiEvent)->get(); + + if (count($multiEvents) == 0) + $multiEvents = Event::where('id', $request->event)->get(); + + return Response::detect("multiple-events.signups", [ "multiEvent" => $multiEvents ]); + } + /** * Remove the specified resource from storage. * diff --git a/skolehjem/app/Http/Controllers/UserEventController.php b/skolehjem/app/Http/Controllers/UserEventController.php index e8e4fd6..f1be020 100644 --- a/skolehjem/app/Http/Controllers/UserEventController.php +++ b/skolehjem/app/Http/Controllers/UserEventController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\UserEvent; +use Illuminate\Database\Eloquent\Model; use Illuminate\Http\Request; use Illuminate\Http\Response; @@ -129,7 +130,45 @@ class UserEventController extends Controller } // If not, then it keeps going and saves and shows a success message - $UserEvent = new UserEvent($data); + $UserEvent = new UserEvent(); + $UserEvent->event_id = $request->event_id; + $UserEvent->user_id = auth()->user()->id; + $UserEvent->save(); + + if (request()->cookie('languagesSetting') == "dk") + return '

Du er hermed tilmeldt denne aktivitet!

'; + if (request()->cookie('languagesSetting') == "en") + return '

You are now participating in this event!

'; + + return '

Du er hermed tilmeldt denne aktivitet!

'; + } + + + //Signs a user up to a multiple event via ajax + public function createmultiajax(Request $request) + { + // Get written data from events.index + $data = $request->validate([ + "multiple_event_id" => "required|max:255" + ]); + + // 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(); + + // 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 (request()->cookie('languagesSetting') == "dk") + return '

Du har allerede tilmeldt dig denne Aktivitet!

'; + if (request()->cookie('languagesSetting') == "en") + return '

You are already participating in this event!

'; + + return '

Du har allerede tilmeldt dig denne Aktivitet!

'; + } + + // If not, then it keeps going and saves and shows a success message + $UserEvent = new UserEvent(); + $UserEvent->multiple_event_id = $request->multiple_event_id; $UserEvent->user_id = auth()->user()->id; $UserEvent->save(); @@ -149,6 +188,28 @@ class UserEventController extends Controller ->where('event_id', $request->event_id); + // If you are in the Event, then remove yourself. + if (count($UserEvent->get()) > 0) { + // If not, then it keeps going and saves and shows a success message + $UserEvent->delete(); + + if (request()->cookie('languagesSetting') == "dk") + return '

Du er hermed afmeldt aktiviteten!

'; + if (request()->cookie('languagesSetting') == "en") + return '

You are no longer participating in this event!

'; + + return '

Du er hermed afmeldt aktiviteten!

'; + } + } + + //Removes a users participation in an event via ajax + public function createmultiajaxcancel(Request $request) + { + // Check the UserEvent table if there is a row that has the user_id AND the event_id + $UserEvent = UserEvent::where('user_id', auth()->user()->id) + ->where('multiple_event_id', $request->multiple_event_id); + + // If you are in the Event, then remove yourself. if (count($UserEvent->get()) > 0) { // If not, then it keeps going and saves and shows a success message diff --git a/skolehjem/resources/views/app/multiple-events/index.blade.php b/skolehjem/resources/views/app/multiple-events/index.blade.php index 24110ae..404e78f 100644 --- a/skolehjem/resources/views/app/multiple-events/index.blade.php +++ b/skolehjem/resources/views/app/multiple-events/index.blade.php @@ -1,27 +1,23 @@ @extends("app.layout.base") @section("title") - Ugenlige aktiviteter + Ugentlige aktiviteter @endsection @section("content") +
+ + @if(count($multiEvent) == 0) +

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

+ @else + + + + @endif + @foreach($multiEvent as $UE) + @if ($UE->name_first != null && $UE->name_last != null && $UE->phone != null && $UE->multiple_event_id != null && $UE->user_id != null) + + + + @endif + @endforeach +
{{ __('msg.tilmeldtesnavn') }}
{{ $UE->name_first }} {{ $UE->name_last }}
+ +
+@endsection diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php index 406e99a..0f2f245 100644 --- a/skolehjem/resources/views/app/news/index.blade.php +++ b/skolehjem/resources/views/app/news/index.blade.php @@ -232,7 +232,7 @@ @php $tags = [ '

', '', '', '', '', '', '', '