From bd7800f5a0da8f9694ce679da8fc5fb98077bd81 Mon Sep 17 00:00:00 2001
From: frederikpyt <frederikpyt@gmail.com>
Date: Mon, 10 Aug 2020 09:37:19 +0200
Subject: [PATCH] v0.5.15 - Added subname to news
---
skolehjem/app/Http/Controllers/EventController.php | 2 ++
skolehjem/app/Http/Controllers/GuideController.php | 2 ++
skolehjem/app/Http/Controllers/MenuPlanController.php | 6 ++++--
skolehjem/app/News.php | 2 +-
.../migrations/2020_08_06_092000_create_news_table.php | 1 +
skolehjem/resources/views/app/news/index.blade.php | 1 +
6 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php
index 6343551..6874e08 100644
--- a/skolehjem/app/Http/Controllers/EventController.php
+++ b/skolehjem/app/Http/Controllers/EventController.php
@@ -81,6 +81,7 @@ class EventController extends Controller
$news = new News();
$news->name = "Ny aktivitet";
+ $news->subname = $event->name;
$news->content = "<p>" . $event->description . "</p>" .
'<div class="row align-items-center">'.
'<a style="width: 50%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.create", ["event_id" => $event->id ]) .'">Tilmeld</a>'.
@@ -175,6 +176,7 @@ class EventController extends Controller
$news = new News();
$news->name = "Aktivitet opdateret";
+ $news->subname = $event->name;
$news->content = "<p>" . $event->description . "</p>" .
'<div class="row align-items-center">'.
'<a style="width: 50%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.create", ["event_id" => $event->id ]) .'">Tilmeld</a>'.
diff --git a/skolehjem/app/Http/Controllers/GuideController.php b/skolehjem/app/Http/Controllers/GuideController.php
index a9ee3bf..0f19fe1 100644
--- a/skolehjem/app/Http/Controllers/GuideController.php
+++ b/skolehjem/app/Http/Controllers/GuideController.php
@@ -74,6 +74,7 @@ class GuideController extends Controller
$news = new News();
$news->name = "Ny Vejledning";
+ $news->subname = $guide->name;
$news->content = substr($guide->guide_articles, 0, 300). '<br><br><a href="' . route("guides.show", ["guide" => $guide]). '" class="sde-blue ">Læse mere...</a>';
@@ -134,6 +135,7 @@ class GuideController extends Controller
$news = new News();
$news->name = "Vejledning opdateret";
+ $news->subname = $guidee->name;
$news->content = substr($guidee->guide_articles, 0, 300). '<br><br><a href="' . route("guides.show", ["guide" => $guide]). '" class="sde-blue ">Læse mere...</a>';
$news->save();
diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php
index 492c433..49137c5 100644
--- a/skolehjem/app/Http/Controllers/MenuPlanController.php
+++ b/skolehjem/app/Http/Controllers/MenuPlanController.php
@@ -75,7 +75,8 @@ class MenuPlanController extends Controller
if($request->newsoption == true){
$news = new News();
- $news->name = "Ny menuplan Uge " . $menuPlan->week;
+ $news->name = "Ny menuplan";
+ $news->subname = "Uge " . $menuPlan->week;
$news->content = $menuPlan->menu;
$news->save();
@@ -135,7 +136,8 @@ class MenuPlanController extends Controller
if($request->newsoption == true){
$news = new News();
- $news->name = "Opdateret menuplan Uge " . $menuplan->week;
+ $news->name = "Opdateret menuplan";
+ $news->subname = "Uge " . $menuplan->week;
$news->content = $menuplan->menu;
$news->save();
diff --git a/skolehjem/app/News.php b/skolehjem/app/News.php
index 056b2c3..78392ef 100644
--- a/skolehjem/app/News.php
+++ b/skolehjem/app/News.php
@@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model;
class News extends Model
{
protected $fillable = [
- 'name', 'content'
+ 'name', 'subname', 'content'
];
}
diff --git a/skolehjem/database/migrations/2020_08_06_092000_create_news_table.php b/skolehjem/database/migrations/2020_08_06_092000_create_news_table.php
index 7d6abc8..16fa7ef 100644
--- a/skolehjem/database/migrations/2020_08_06_092000_create_news_table.php
+++ b/skolehjem/database/migrations/2020_08_06_092000_create_news_table.php
@@ -16,6 +16,7 @@ class CreateNewsTable extends Migration
Schema::create('news', function (Blueprint $table) {
$table->id();
$table->string("name");
+ $table->string('subname');
$table->text("content");
$table->timestamps();
});
diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php
index 983cf63..f093cc0 100644
--- a/skolehjem/resources/views/app/news/index.blade.php
+++ b/skolehjem/resources/views/app/news/index.blade.php
@@ -61,6 +61,7 @@
@foreach(\App\News::query()->orderBy("created_at", "desc")->get() as $new)
<div style="border: 4px solid rgba(0,0,0, 0.2); border-radius: 4px; padding: 4px; margin-top: 1.5rem">
<h2 class="sde-blue mt-0 mb-0 text-center" style="margin-bottom: 8px; ">{{ $new->name }}</h2>
+ <h4 class="sde-blue mt-0 mb-0 text-center" style="margin-bottom: 8px; ">{{ $new->subname }}</h4>
{!! $new->content !!}
</div>
@endforeach