From d2441250fb83f5e606968fdd61fd971f1b0a836c Mon Sep 17 00:00:00 2001 From: Neerholt Date: Tue, 18 Aug 2020 15:27:58 +0200 Subject: [PATCH] v0.10.5c - Made menuplan pdf better --- .idea/encodings.xml | 1 + .../Http/Controllers/MenuPlanController.php | 32 ++----- skolehjem/config/app.php | 1 + skolehjem/public/images/icons/coconut.svg | 1 + skolehjem/public/images/icons/dinner.svg | 1 + skolehjem/public/images/icons/food.svg | 87 +++++++++++++++++++ skolehjem/public/images/icons/watermelon.svg | 1 + .../resources/views/pdf/menuplan.blade.php | 39 +++++++++ 8 files changed, 138 insertions(+), 25 deletions(-) create mode 100644 skolehjem/public/images/icons/coconut.svg create mode 100644 skolehjem/public/images/icons/dinner.svg create mode 100644 skolehjem/public/images/icons/food.svg create mode 100644 skolehjem/public/images/icons/watermelon.svg create mode 100644 skolehjem/resources/views/pdf/menuplan.blade.php diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 34e5453..f826775 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -3,6 +3,7 @@ + diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index e312c59..c351b5e 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -7,6 +7,7 @@ use App\ExternalLink; use App\MenuPlan; use App\News; use App\User; +use Barryvdh\DomPDF\Facade as PDF; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Http\Response; @@ -207,35 +208,16 @@ class MenuPlanController extends Controller */ public function genPDF($Id){ $menuPlan = MenuPlan::query()->where("id", "=", $Id)->first(); - $pdf = \Illuminate\Support\Facades\App::make('dompdf.wrapper'); - $data = ''. - ' - - '. - ''. - ''. - '
'. - '

Erhverskollegiet - Odense

'. - '

Menuplan

'. - '

Uge '. $menuPlan->week. '

'. - '
'. - '
'. - '

Mandag:

'. - '

'.$menuPlan->monday.'


'. - '

Tirsdag:

'. - '

'.$menuPlan->tuesday.'


'. + $var = 149; - '

Onsdag:

'. - '

'.$menuPlan->wednesday.'


'. + $menuPlan->monday = substr($menuPlan->monday, 0, $var); + $menuPlan->tuesday = substr($menuPlan->tuesday, 0, $var); + $menuPlan->wednesday = substr($menuPlan->wednesday, 0, $var); + $menuPlan->thursday = substr($menuPlan->thursday, 0, $var); - '

Torsdag:

'. - '

'.$menuPlan->thursday.'

'; - '
'. - ''. - ''; + $pdf = PDF::loadView('pdf.menuplan', ["menuPlan" => $menuPlan]); - $pdf->loadHTML($data, 'UTF-8'); $pdf->setPaper('A4', 'portrait'); return $pdf->stream("menuplan_uge_".$menuPlan->week.".pdf"); diff --git a/skolehjem/config/app.php b/skolehjem/config/app.php index e1168d1..a942d37 100644 --- a/skolehjem/config/app.php +++ b/skolehjem/config/app.php @@ -233,6 +233,7 @@ return [ 'URL' => Illuminate\Support\Facades\URL::class, 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, + 'PDF' => Barryvdh\DomPDF\Facade::class, 'Agent' => Jenssegers\Agent\Facades\Agent::class, ], diff --git a/skolehjem/public/images/icons/coconut.svg b/skolehjem/public/images/icons/coconut.svg new file mode 100644 index 0000000..6eed571 --- /dev/null +++ b/skolehjem/public/images/icons/coconut.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/skolehjem/public/images/icons/dinner.svg b/skolehjem/public/images/icons/dinner.svg new file mode 100644 index 0000000..c4d2b89 --- /dev/null +++ b/skolehjem/public/images/icons/dinner.svg @@ -0,0 +1 @@ + diff --git a/skolehjem/public/images/icons/food.svg b/skolehjem/public/images/icons/food.svg new file mode 100644 index 0000000..9651bc2 --- /dev/null +++ b/skolehjem/public/images/icons/food.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/skolehjem/public/images/icons/watermelon.svg b/skolehjem/public/images/icons/watermelon.svg new file mode 100644 index 0000000..d98c276 --- /dev/null +++ b/skolehjem/public/images/icons/watermelon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/skolehjem/resources/views/pdf/menuplan.blade.php b/skolehjem/resources/views/pdf/menuplan.blade.php new file mode 100644 index 0000000..87f785a --- /dev/null +++ b/skolehjem/resources/views/pdf/menuplan.blade.php @@ -0,0 +1,39 @@ + + + + Title + + + +
+

Erhverskollegiet - Odense

+

Menuplan, Uge {{$menuPlan->week}}

+
+
+

Mandag:

+

{{$menuPlan->monday}}

+


+ +

Tirsdag:

+

{{$menuPlan->tuesday}}

+


+ +

Onsdag:

+

{{$menuPlan->wednesday}}

+


+ +

Torsdag:

+

{{$menuPlan->thursday}}

+
+ watermelon + coconut + plate + plate + +