diff --git a/skolehjem/app/Http/Controllers/MultipleEventsController.php b/skolehjem/app/Http/Controllers/MultipleEventsController.php index ae3351d..55e3d75 100644 --- a/skolehjem/app/Http/Controllers/MultipleEventsController.php +++ b/skolehjem/app/Http/Controllers/MultipleEventsController.php @@ -32,9 +32,9 @@ class MultipleEventsController extends Controller * * @return \Illuminate\Http\Response */ - public function index() + public function index(Request $request) { - $multiEvents = MultipleEventsParent::query()->join("multiple_events", "multiple_events.multiple_events_parent_id", "=", "multiple_events_parent.id")->orderBY('multiple_events_parent.id' , 'desc')->get(); + $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(); return Response::detect("multiple-events.index", [ "multiEvents" => $multiEvents]); } @@ -59,15 +59,10 @@ class MultipleEventsController extends Controller public function store(Request $request) { $requestBody = $request->validate([ - "week" => "max:255", "name" => "array", "description" => "array", "accountable" => "array", "date" => "array", - "name.*" => "max:255", - "description.*" => "max:255", - "accountable.*" => "max:255", - "date.*" => "max:255" ]); $multipleParent = new MultipleEventsParent(); @@ -100,11 +95,11 @@ class MultipleEventsController extends Controller if($request->newsoption == true){ $news = new News(); $news->name = "Nye ugentlig aktivitets"; - $news->subname = $event->week; + $news->subname = $request->week; $news->arrangement_id = $multipleParent->id; $news->type_id = '5'; $news->content = "Den ugentlige aktivitets plan er landet"; - $news->resource_id = $event->resource_id; + $news->resource_id = $request->resource_id; NewsController::storeAndGet($news); } diff --git a/skolehjem/resources/views/admin/multiple-events/create.blade.php b/skolehjem/resources/views/admin/multiple-events/create.blade.php index 6e56cac..5a62158 100644 --- a/skolehjem/resources/views/admin/multiple-events/create.blade.php +++ b/skolehjem/resources/views/admin/multiple-events/create.blade.php @@ -40,41 +40,19 @@ - +
- - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + +
Ugedag Aktivitets navn Aktivitets beskrivelse Tovholder Tidsrum (Start)
Mandag
Tirsdag
Onsdag
Torsdag
@@ -148,5 +126,17 @@ } }); }) + + + + + $(document).ready(function (){ + $("#add2").click(function(){ + $( ".asd" ).append( "" ); + console.log("1"); + }); + }); + + @endsection diff --git a/skolehjem/resources/views/app/multiple-events/index.blade.php b/skolehjem/resources/views/app/multiple-events/index.blade.php index 404e78f..cc5216d 100644 --- a/skolehjem/resources/views/app/multiple-events/index.blade.php +++ b/skolehjem/resources/views/app/multiple-events/index.blade.php @@ -73,31 +73,25 @@ @if(!$multiEvents->isEmpty()) - @if($multiEvents->contains('week', $Week)) {{-- If any of the menues in the menu table has the number of the week in the 'week' column, do this --}} @foreach($multiEvents as $multiEvent) - @if($multiEvent->week == $Week) -
-
-

{{ date('l', strtotime($multiEvent->date)) }}

-

{{$multiEvent->name}}

-

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

-

{{$multiEvent->description}}

-

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

-
- @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')}} -
+
+
+

{{ date('l', strtotime($multiEvent->date)) }}

+

{{$multiEvent->name}}

+

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

+

{{$multiEvent->description}}

+

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

+
+ @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')}}
- @endif +
@endforeach - @else -

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

- @endif @endif