Merge remote-tracking branch 'origin/master'

# Conflicts:
#	skolehjem/app/Http/Controllers/UserEventController.php

skolehjem/app/Http/Controllers/EventController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Event;
+use App\News;
 use App\UserEvent;
 use App\User;
 use Illuminate\Http\Request;
@@ -74,8 +75,21 @@ class EventController extends Controller
             return redirect()->route("events.index", ['events' => $event])->with('EventNameExists', '<p><b>Der findes allerede et event med det navn!</b></p>');
         } else {
             $event->save();
-            $event = Event::query()->paginate($request->input("limit", 20));
-            return redirect()->route("events.index", ['events' => $event]);
+            $events = Event::query()->paginate($request->input("limit", 20));
+
+            if($request->newsoption == true){
+                $news = new News();
+
+                $news->name = "Ny aktivitet";
+                $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>'.
+                        '<a style="width: 50%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.signups", ["event_id" => $event->id ]) .'">Se deltagere</a>'.
+                    '</div>';
+                $news->save();
+            }
+
+            return redirect()->route('events.index', ['events' => $events]);
         }
 
     }
@@ -141,8 +155,21 @@ class EventController extends Controller
             $event->update($data);
             $event->save();
 
-            $event = Event::query()->paginate($request->input("limit", 20));
-            return redirect()->route("events.index", ['events' => $event]);
+            $events = Event::query()->paginate($request->input("limit", 20));
+
+            if($request->newsoption == true){
+                $news = new News();
+
+                $news->name = "Aktivitet opdateret";
+                $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>'.
+                    '<a style="width: 50%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.signups", ["event_id" => $event->id ]) .'">Se deltagere</a>'.
+                    '</div>';
+                $news->save();
+            }
+
+            return redirect()->route("events.index", ['events' => $events]);
         }
 
     }

skolehjem/app/Http/Controllers/GuideController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Guide;
+use App\News;
 use Illuminate\Http\Response;
 use Illuminate\Http\Request;
 
@@ -67,8 +68,18 @@ class GuideController extends Controller
         if(!$saved){
             return redirect()->route("guides.store");
         }else{
-            $guide = Guide::query()->paginate($request->input("limit", 20));
-            return redirect()->route("guides.index", ['guides' => $guide]);
+            $guides = Guide::query()->paginate($request->input("limit", 20));
+
+            if($request->newsoption == true){
+                $news = new News();
+
+                $news->name = "Ny Vejledning";
+                $news->content = $guide->guide_articles;
+
+                $news->save();
+            }
+
+            return redirect()->route("guides.index", ['guides' => $guides]);
         }
     }
 
@@ -117,6 +128,16 @@ class GuideController extends Controller
             return redirect()->route("guides.update", [ "guide" => $guide ]);
         }else{
             $guide = Guide::query()->paginate($request->input("limit", 20));
+
+            if($request->newsoption == true){
+                $news = new News();
+
+                $news->name = "Vejledning opdateret";
+                $news->content = $guidee->guide_articles;
+
+                $news->save();
+            }
+
             return redirect()->route("guides.index", ['guides' => $guide]);
         }
     }

skolehjem/app/Http/Controllers/UserEventController.php

@@ -18,7 +18,7 @@ class UserEventController extends Controller
      *
      * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function index()
+    public function index(Request $request)
     {
         $userevents = UserEvent::join('events', 'events.id', '=', 'user_events.event_id')->orderBY('date' , 'asc')->where('user_id', auth()->user()->id)->get();