From 051aceb041be1a22d1a21499efea59b09d276250 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Fri, 14 Aug 2020 11:22:18 +0200 Subject: [PATCH] v0.9.15b - Updated the menuplan pdf design --- .../app/Http/Controllers/EventController.php | 4 ++++ .../Http/Controllers/MenuPlanController.php | 20 +++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 73902b3..73712df 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -228,6 +228,10 @@ class EventController extends Controller $userEvent->delete(); } + $news = News::query()->where("type_id", "=", "3")->where("arrangement_id", "=", $event->id)->first(); + if($news !== null) + $news->delete(); + $event->delete(); return redirect()->route("events.index"); diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index e41614b..7b4562b 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -183,9 +183,25 @@ class MenuPlanController extends Controller //$images = App\Resource::query()->where("id", '=', $menuPlan->resource_id)->first(); //$imagesSize = getimagesize($images->filename); $pdf = \Illuminate\Support\Facades\App::make('dompdf.wrapper'); - $data = '
'. '

Uge '. $menuPlan->week. '

' .$menuPlan->menu. /*$imagesSize .''. */'
'; + $data = ''. + ' + + '. + ''. + ''. + '
'. + '

Erhverskollegiet - Odense

'. + '

Menuplan

'. + '

Uge '. $menuPlan->week. '

'. + '
'. + '
'. + $menuPlan->menu. + '
'. + ''. + ''; - $pdf->loadHTML($data); + $pdf->loadHTML($data, 'UTF-8'); + $pdf->setPaper('A4', 'portrait'); return $pdf->stream("menuplan_uge_".$menuPlan->week.".pdf");