Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

skolehjem/app/Http/Controllers/EventController.php

@@ -86,12 +86,9 @@ class EventController extends Controller
 
                 $news->name = "Ny aktivitet";
                 $news->subname = $event->name;
-                $news->content = "<p>" . $this->closetags(substr($event->description, 0, 300)). "</p>" .
-                    '<div class="row align-items-center">'. //route("userevents.createajax", ["event_id" => $event->id ])
-                    '<a style="width: 33%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="javascript:void(0);" onclick="ajaxCall('. $event->id .')">Tilmeld</a>'.
-                    '<a style="width: 33%; margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("events.show", ["event" => $event->id ]) .'">Læs mere</a>'.
-                    '<a style="width: 33%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.accountsignups", ["event" => $event->id ]) .'">Se deltagere</a>'.
-                    '</div>';
+                $news->arrangement_id = $event->id;
+                $news->type_id = '3';
+                $news->content = $event->description;
                 $news->resource_id = $event->resource_id;
                 $news->save();
             }
@@ -184,11 +181,13 @@ class EventController extends Controller
 
                 $news->name = "Aktivitet opdateret";
                 $news->subname = $event->name;
+                $news->arrangement_id = $event->id;
+                $news->type_id = '3';
                 $news->content = "<p>" . $this->closetags(substr($event->description, 0, 300)). "</p>" .
-                    '<div class="row align-items-center">'. //route("userevents.createajax", ["event_id" => $event->id ])
-                    '<a style="width: 33%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="javascript:void(0);" onclick="ajaxCall('. $event->id .')">Tilmeld</a>'.
-                    '<a style="width: 33%; margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("events.show", ["event" => $event->id ]) .'">Læs mere</a>'.
-                    '<a style="width: 33%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.accountsignups", ["event" => $event->id ]) .'">Se deltagere</a>'.
+                    '<div class="row" style="justify-content: space-between;">'. //route("userevents.createajax", ["event_id" => $event->id ])
+                    '<a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="javascript:void(0);" onclick="ajaxCall('. $event->id .')">Tilmeld</a>'.
+                    '<a style="margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("events.show", ["event" => $event->id ]) .'">Læs mere</a>'.
+                    '<a style="margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.accountsignups", ["event" => $event->id ]) .'">Se deltagere</a>'.
                     '</div>';
                 $news->save();
             }

skolehjem/app/Http/Controllers/GuideController.php

@@ -80,8 +80,10 @@ class GuideController extends Controller
 
                 $news->name = "Ny Vejledning";
                 $news->subname = $guide->name;
+                $news->arrangement_id = $guide->id;
+                $news->type_id = '4';
 
-                $news->content = $this->closetags(substr($guide->guide_articles, 0, 300)). '<br><a style="font-weight: 700;" href="' . route("guides.show", ["guide" => $guide]). '" class="sde-blue ">Læs mere</a>';
+                $news->content = $guide->guide_articles;
                 $news->resource_id = $guide->resource_id;
 
                 $news->save();
@@ -142,6 +144,8 @@ class GuideController extends Controller
 
                 $news->name = "Vejledning opdateret";
                 $news->subname = $guidee->name;
+                $news->arrangement_id = $guide->id;
+                $news->type_id = '4';
 
                 $news->content = $this->closetags(substr($guidee->guide_articles, 0, 300)). '<br><a style="font-weight: 700;" href="' . route("guides.show", ["guide" => $guide]). '" class="sde-blue ">Læs mere</a>';
 

skolehjem/app/Http/Controllers/MenuPlanController.php

@@ -79,6 +79,8 @@ class MenuPlanController extends Controller
 
                 $news->name = "Ny menuplan";
                 $news->subname = "Uge " . $menuPlan->week;
+                $news->arrangement_id = $menuPlan->id;
+                $news->type_id = '2';
                 $news->content = $menuPlan->menu;
 
                 if($request->file("resource")) {
@@ -144,6 +146,8 @@ class MenuPlanController extends Controller
 
                 $news->name = "Opdateret menuplan";
                 $news->subname = "Uge " . $menuplan->week;
+                $news->arrangement_id = $menuplan->id;
+                $news->type_id = '2';
                 $news->content = $menuplan->menu;
 
                 $news->save();

skolehjem/app/Http/Controllers/NewsController.php

@@ -56,6 +56,7 @@ class NewsController extends Controller
 
         $news = new News($data);
         $news->name = "";
+        $news->type_id = '1';
         $news->save();
 
         return redirect()->route("news.index");
@@ -93,7 +94,7 @@ class NewsController extends Controller
     public function update(Request $request, News $news)
     {
         $data = $request->validate([
-            "name" => "required",
+            "subname" => "required",
             "content" => "required"
         ]);
 

skolehjem/app/Http/Controllers/NewsTypeController.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class NewsTypeController extends Controller
+{
+    public function index() {
+
+    }
+
+    public function store() {
+
+    }
+
+    public function update() {
+
+    }
+
+    public function show() {
+
+    }
+}

skolehjem/app/Http/Controllers/UserEventController.php

@@ -140,4 +140,25 @@ class UserEventController extends Controller
 
         return '<p class="text-center"><b>Du er hermed tilmeldt denne aktivitet!</b></p>';
     }
+
+    public function createajaxcancel(Request $request)
+    {
+        // Check the UserEvent table if there is a row that has the user_id AND the event_id
+        $UserEvent = UserEvent::where('user_id', auth()->user()->id)
+            ->where('event_id', $request->event_id);
+
+
+        // If you are in the Event, then remove yourself.
+        if (count($UserEvent->get()) > 0) {
+            // If not, then it keeps going and saves and shows a success message
+            $UserEvent->delete();
+
+            if (request()->cookie('languagesSetting') == "dk")
+                return '<p class="text-center"><b>Du er hermed afmeldt aktiviteten!</b></p>';
+            if (request()->cookie('languagesSetting') == "en")
+                return '<p class="text-center"><b>You are no longer participating in this event!</b></p>';
+
+            return '<p class="text-center"><b>Du er hermed afmeldt aktiviteten!</b></p>';
+        }
+    }
 }

skolehjem/app/News.php

@@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model;
 class News extends Model
 {
     protected $fillable = [
-        'name', 'subname', 'content', 'resource_id'
+        'name', 'subname', 'content', 'resource_id', 'arrangement_id', 'type'
     ];
 }

skolehjem/app/NewsType.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class NewsType extends Model
+{
+    protected $fillable = [
+        'type'
+    ];
+}