From f8073d86860b28d86cc9dba47ca8b3aa79973457 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Fri, 7 May 2021 09:01:21 +0200 Subject: [PATCH] v1.5.21c Made the last changes to multiple events on the app --- .../Controllers/MultipleEventsController.php | 11 +- .../views/app/multiple-events/index.blade.php | 58 +++---- .../views/app/multiple-events/show.blade.php | 157 ++++++++++++++++++ .../resources/views/app/news/index.blade.php | 2 +- 4 files changed, 194 insertions(+), 34 deletions(-) create mode 100644 skolehjem/resources/views/app/multiple-events/show.blade.php diff --git a/skolehjem/app/Http/Controllers/MultipleEventsController.php b/skolehjem/app/Http/Controllers/MultipleEventsController.php index b4e40ec..49ae29c 100644 --- a/skolehjem/app/Http/Controllers/MultipleEventsController.php +++ b/skolehjem/app/Http/Controllers/MultipleEventsController.php @@ -33,9 +33,9 @@ class MultipleEventsController extends Controller * * @return \Illuminate\Http\Response */ - public function index(Request $request) + public function index() { - $multiEvents = MultipleEventsParent::query()->join("multiple_events", "multiple_events.multiple_events_parent_id", "=", "multiple_events_parent.id")->where('multiple_events_parent.id', '=', $request->multiEvent)->orderBY('multiple_events_parent.id' , 'desc')->get(); + $multiEvents = MultipleEventsParent::query()->get(); return Response::detect("multiple-events.index", [ "multiEvents" => $multiEvents]); } @@ -114,9 +114,12 @@ class MultipleEventsController extends Controller * @param \App\MultipleEvents $multipleeventsController * @return \Illuminate\Http\Response */ - public function show(MultipleeventsController $multipleeventsController) + public function show($id) { - // + $multiEvents = MultipleEvents::where('multiple_events.multiple_events_parent_id', '=', $id)->get(); + $multiEventParent = MultipleEventsParent::find($id); + + return Response::detect("multiple-events.show", [ "week" => $multiEventParent->week, "multiEvents" => $multiEvents]); } /** diff --git a/skolehjem/resources/views/app/multiple-events/index.blade.php b/skolehjem/resources/views/app/multiple-events/index.blade.php index e95e0bd..4348bc8 100644 --- a/skolehjem/resources/views/app/multiple-events/index.blade.php +++ b/skolehjem/resources/views/app/multiple-events/index.blade.php @@ -1,19 +1,28 @@ @extends("app.layout.base") @section("title") - Ugentlige aktiviteter + Aktiviteter @endsection @section("content") - -
-

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

@if(count(\App\Notification::query()->where("user_id", "=", auth()->user()->id)->get()) > 0) @@ -71,19 +74,16 @@ @if(!$multiEvents->isEmpty()) @foreach($multiEvents as $multiEvent)
-
-

{{ ucfirst(\Carbon\Carbon::parse($multiEvent->date)->formatLocalized('%A')) }}

-

{{$multiEvent->name}}

-

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

-

{{$multiEvent->description}}

+ @if($multiEvent->resource_id !== null) +
+ +
+ @endif +

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

+

Den ugentlige aktivitets plan for uge {{ $multiEvent->week }}

- @if (count(\App\UserEvent::query()->where('multiple_event_id', '=', $multiEvent->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 - $multiEvent->id ])}}">{{__('msg.sedeltagere')}} + id)}}">{{__('msg.læsmere')}}
@@ -91,9 +91,9 @@ @else

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

@endif - + {{__('msg.setilmeldteaktiviteter')}} +
-
@endsection @section("scripts") +@endsection + diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php index 7af1806..e54ccbc 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 = [ '

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