diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php
index 3e764b6..d528a57 100644
--- a/skolehjem/app/Http/Controllers/MenuPlanController.php
+++ b/skolehjem/app/Http/Controllers/MenuPlanController.php
@@ -59,11 +59,11 @@ class MenuPlanController extends Controller
public function store(Request $request)
{
$requestMenuPlanCreate = $request->validate([
- "week" => "required|max:255",
- "monday" => "required|max:255",
- "tuesday" => "required|max:255",
- "wednesday" => "required|max:255",
- "thursday" => "required|max:255",
+ "week" => "required",
+ "monday" => "required",
+ "tuesday" => "required",
+ "wednesday" => "required",
+ "thursday" => "required",
]);
$menuPlan = new MenuPlan($requestMenuPlanCreate);
@@ -216,7 +216,7 @@ class MenuPlanController extends Controller
public function genPDF($Id){
$menuPlan = MenuPlan::query()->where("id", "=", $Id)->first();
- $var = 149;
+ $var = 250;
$menuPlan->monday = substr($menuPlan->monday, 0, $var);
$menuPlan->tuesday = substr($menuPlan->tuesday, 0, $var);
diff --git a/skolehjem/app/Http/Controllers/MultipleEventsController.php b/skolehjem/app/Http/Controllers/MultipleEventsController.php
index 8874906..48fab0b 100644
--- a/skolehjem/app/Http/Controllers/MultipleEventsController.php
+++ b/skolehjem/app/Http/Controllers/MultipleEventsController.php
@@ -203,19 +203,20 @@ class MultipleEventsController extends Controller
public function genPDF($Id){
- $multiEvent = MultipleEventsParent::query()->join("multiple_events", "multiple_events.multiple_events_parent_id", "=", "multiple_events_parent.id")->where("multiple_events_parent.id", "=", $Id)->first();
+ $multiEvent = MultipleEventsParent::query()->join("multiple_events", "multiple_events.multiple_events_parent_id", "=", "multiple_events_parent.id")->where("multiple_events_parent.id", "=", $Id)->orderBy('multiple_events.date', 'asc')->get();
$var = 149;
- $multiEvent->name = substr($multiEvent->name, 0, $var);
+
+ /*$multiEvent->name = substr($multiEvent->name, 0, $var);
$multiEvent->accountable = substr($multiEvent->accountable, 0, $var);
$multiEvent->description = substr($multiEvent->description, 0, $var);
$multiEvent->date = substr($multiEvent->date, 0, $var);
-
+*/
$pdf = PDF::loadView('multipdf.multipleevent', ["multiEvent" => $multiEvent]);
- $pdf->setPaper('A4', 'portrait');
+ $pdf->setPaper('A4', 'landscape');
- return $pdf->stream("ugentligt_aktivitet_uge_".$multiEvent->week.".pdf");
+ return $pdf->stream("ugentligt_aktivitet_uge_".$multiEvent[0]->week.".pdf");
}
diff --git a/skolehjem/composer.json b/skolehjem/composer.json
index 02c8da8..6bf8f69 100644
--- a/skolehjem/composer.json
+++ b/skolehjem/composer.json
@@ -10,6 +10,7 @@
"require": {
"php": "^8.0.3",
"barryvdh/laravel-dompdf": "^0.9.0",
+ "dompdf/dompdf": "^1.0",
"fideloper/proxy": "^4.2",
"fruitcake/laravel-cors": "^1.0",
"guzzlehttp/guzzle": "^6.3",
diff --git a/skolehjem/composer.lock b/skolehjem/composer.lock
index f580e15..80d366c 100644
--- a/skolehjem/composer.lock
+++ b/skolehjem/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "5c5e11e3ee756fd468ab123fa2a62904",
+ "content-hash": "63e59712c2f2f598190787e17c966739",
"packages": [
{
"name": "asm89/stack-cors",
diff --git a/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php b/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php
index bb3ed6b..8046628 100644
--- a/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php
+++ b/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php
@@ -18,10 +18,10 @@ class CreateMenuPlans extends Migration
Schema::create('menu_plans', function (Blueprint $table) {
$table->id();
$table->integer('week')->unique();
- $table->string('monday', 255);
- $table->string('tuesday', 255);
- $table->string('wednesday', 255);
- $table->string('thursday', 255);
+ $table->text('monday');
+ $table->text('tuesday');
+ $table->text('wednesday');
+ $table->text('thursday');
$table->timestamps();
//$table->longText('description');
});
diff --git a/skolehjem/resources/views/admin/contacts/create.blade.php b/skolehjem/resources/views/admin/contacts/create.blade.php
index e46e6ba..4fd6a24 100644
--- a/skolehjem/resources/views/admin/contacts/create.blade.php
+++ b/skolehjem/resources/views/admin/contacts/create.blade.php
@@ -21,13 +21,13 @@
@endsection
diff --git a/skolehjem/resources/views/admin/guides/create.blade.php b/skolehjem/resources/views/admin/guides/create.blade.php
index e5590d1..f323a8d 100644
--- a/skolehjem/resources/views/admin/guides/create.blade.php
+++ b/skolehjem/resources/views/admin/guides/create.blade.php
@@ -29,7 +29,7 @@
@csrf
-
+
diff --git a/skolehjem/resources/views/admin/index.blade.php b/skolehjem/resources/views/admin/index.blade.php
index d2eb137..52db823 100644
--- a/skolehjem/resources/views/admin/index.blade.php
+++ b/skolehjem/resources/views/admin/index.blade.php
@@ -181,16 +181,16 @@
{{-- \App\MenuPlan::query()->where("week", "=", date('W'))->first() --}}
|
- {!! (\App\MenuPlan::query()->where("week", "=", date('W'))->first()->monday) !!} |
+ {!! \App\Helpers::closetags(substr(ucfirst(strtolower(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->monday)), 0, 20) ) !!} |
|
- {!! (\App\MenuPlan::query()->where("week", "=", date('W'))->first()->tuesday) !!} |
+ {!! \App\Helpers::closetags(substr(ucfirst(strtolower(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->tuesday)), 0, 20) ) !!} |
|
- {!! (\App\MenuPlan::query()->where("week", "=", date('W'))->first()->wednesday) !!} |
+ {!! \App\Helpers::closetags(substr(ucfirst(strtolower(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->wednesday)), 0, 20) ) !!} |
|
- {!! (\App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday) !!} |
+ {!! \App\Helpers::closetags(substr(ucfirst(strtolower(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday)), 0, 20) ) !!} |
diff --git a/skolehjem/resources/views/admin/locations/create.blade.php b/skolehjem/resources/views/admin/locations/create.blade.php
index 1bf1044..102667a 100644
--- a/skolehjem/resources/views/admin/locations/create.blade.php
+++ b/skolehjem/resources/views/admin/locations/create.blade.php
@@ -15,7 +15,7 @@
@csrf
-
+
@endsection
diff --git a/skolehjem/resources/views/admin/menuplans/create.blade.php b/skolehjem/resources/views/admin/menuplans/create.blade.php
index 3ea4fd5..b435886 100644
--- a/skolehjem/resources/views/admin/menuplans/create.blade.php
+++ b/skolehjem/resources/views/admin/menuplans/create.blade.php
@@ -27,15 +27,15 @@
@csrf
-
+
-
+
-
+
-
+
-
+