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 | -- | - | - | + | + | + | + | + |
{{__('msg.af')}}: {{$multiEvent->accountable}}
-{{$multiEvent->description}}
-{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($multiEvent->date))->format('d/m/Y \k\l\. H:i') }}
-{{__('msg.af')}}: {{$multiEvent->accountable}}
+{{$multiEvent->description}}
+{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($multiEvent->date))->format('d/m/Y \k\l\. H:i') }}
+{{__('msg.dereringenugentligeaktiviteter')}}!
- @endif @endif