v1.5.23 added when a multi or just a event is achieve remove it from index pages

skolehjem/app/Http/Controllers/EventController.php

@@ -35,7 +35,6 @@ class EventController extends Controller
     public function index(Request $request)
     {
         $events = Event::query()->orderBY('date' , 'asc')->get();
-
         //returns the function with events index page and a parameter of events.
         //also Response::detect checks screen size to determine if user is on a computer or mobile.
         return Response::detect("events.index", [ "events" => $events]);

skolehjem/app/Http/Controllers/MultipleEventsController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use App\MultipleEvents;
 use App\MultipleEventsParent;
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -35,7 +36,8 @@ class MultipleEventsController extends Controller
      */
     public function index()
     {
-        $multiEvents = MultipleEventsParent::query()->get();
+        $multiEvents = MultipleEventsParent::join("multiple_events", "multiple_events.multiple_events_parent_id", '=', 'multiple_events_parent.id')->groupBy('multiple_events_parent_id')->orderBy('multiple_events.date', 'desc')->selectRaw('multiple_events_parent.*, max(date) as date')->get();
+
         return Response::detect("multiple-events.index", [ "multiEvents" => $multiEvents]);
     }
 
@@ -116,7 +118,7 @@ class MultipleEventsController extends Controller
      */
     public function show($id)
     {
-        $multiEvents = MultipleEvents::where('multiple_events.multiple_events_parent_id', '=', $id)->get();
+        $multiEvents = MultipleEvents::where('multiple_events.multiple_events_parent_id', '=', $id)->orderBy('date')->get();
         $multiEventParent = MultipleEventsParent::find($id);
 
         return Response::detect("multiple-events.show", [ "week" => $multiEventParent->week, "multiEvents" => $multiEvents]);
@@ -266,14 +268,6 @@ 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)->orderBy('multiple_events.date', 'asc')->get();
-        $var = 149;
-
-
-        /*$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', 'landscape');

skolehjem/app/Notifications/PushNews.php

@@ -32,10 +32,11 @@ class PushNews extends Notification
     {
         return (new WebPushMessage)
             ->title('Ny Nyhed')
-            ->icon('/images/icons/appIcon.png')
-            ->body('Der er en ny nyhed i ekapp\'en')
-	        ->badge('/images/icons/appIcon.png')
-            ->action('Se nyheder', route('root.index'));
+            ->icon('/images/icons/appIcon.svg')
+            ->body('Der er kommet en ny nyhed i ekapp\'en')
+	        ->badge('/images/icons/appIcon.svg')
+            ->vibrate([100, 200, 100, 200, 300])
+            ->action('Klik her for at se nyheder', route('root.index'));
     }
 
     /**