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')
+            ->icon('/images/icons/appIcon.svg')
-            ->body('Der er en ny nyhed i ekapp\'en')
+            ->body('Der er kommet en ny nyhed i ekapp\'en')
-	        ->badge('/images/icons/appIcon.png')
+	        ->badge('/images/icons/appIcon.svg')
-            ->action('Se nyheder', route('root.index'));
+            ->vibrate([100, 200, 100, 200, 300])
+            ->action('Klik her for at se nyheder', route('root.index'));
     }
 
     /**

skolehjem/database/migrations/2021_04_19_142356_create_multiple_events_parent.php

@@ -15,7 +15,7 @@ class CreateMultipleEventsParent extends Migration
     {
         Schema::create('multiple_events_parent', function (Blueprint $table) {
             $table->id();
-            $table->string('week');
+            $table->integer('week');
             $table->foreignId('resource_id')->nullable()->constrained('resources', 'id');
             $table->timestamps();
         });

skolehjem/resources/views/app/events/index.blade.php

@@ -73,27 +73,31 @@
         <!--If there is a images to the event do this: Start-->
         @if(!$events->isEmpty())
             @foreach($events as $event)
-                <div class="card">
+                @if(\Carbon\Carbon::now() < date("Y-m-d H:i", strtotime($event->date)))
-                    @if($event->resource_id !== null)
+                    <div class="card">
-                        <div class="header">
+                        @if($event->resource_id !== null)
-                            <img class="w-100" src="{{ asset(\App\Resource::query()->where("id", "=", $event->resource_id)->first()->filename) }}">
+                            <div class="header">
-                        </div>
+                                <img class="w-100" src="{{ asset(\App\Resource::query()->where("id", "=", $event->resource_id)->first()->filename) }}">
-                    @endif
+                            </div>
-                    <div class="container" class="mt-1">
+                        @endif
-                        <p class="m-none">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
+                        <div class="container" class="mt-1">
-                        <h4 class="m-none">{{ $event->name }}</h4>
+                            <p class="m-none">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
-                        <p class="mt-0">{{__('msg.af')}}: {{ $event->accountable }}</p>
+                            <h4 class="m-none">{{ $event->name }}</h4>
-                        <div class="row justify-content-space mt-1">
+                            <p class="mt-0">{{__('msg.af')}}: {{ $event->accountable }}</p>
-                            @if (count(\App\UserEvent::query()->where('event_id', '=', $event->id)->where('user_id', '=', Auth::user()->id)->get()) > 0)
+                            <div class="row justify-content-space mt-1">
-                                <a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.afmeld')}}</a>
+                                @if (count(\App\UserEvent::query()->where('event_id', '=', $event->id)->where('user_id', '=', Auth::user()->id)->get()) > 0)
-                            @else {{-- ^ If you're already participating in the event, then show a ´cancel´ button - v Else show a ´participate´ button --}}
+                                    <a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.afmeld')}}</a>
-                            <a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.tilmeld')}}</a>
+                                @else {{-- ^ If you're already participating in the event, then show a ´cancel´ button - v Else show a ´participate´ button --}}
-                            @endif
+                                <a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.tilmeld')}}</a>
-                            <a class="sde-blue text-center m-none p-none bold" href="{{route("events.show", ["event" => $event->id ])}}">{{__('msg.læsmere')}}</a>
+                                @endif
-                            <a class="sde-blue text-center m-none p-none bold" href="{{route("events.accountsignups", ["event" => $event->id ])}}">{{__('msg.sedeltagere')}}</a>
+                                <a class="sde-blue text-center m-none p-none bold" href="{{route("events.show", ["event" => $event->id ])}}">{{__('msg.læsmere')}}</a>
+                                <a class="sde-blue text-center m-none p-none bold" href="{{route("events.accountsignups", ["event" => $event->id ])}}">{{__('msg.sedeltagere')}}</a>
+                            </div>
                         </div>
                     </div>
-                </div>
+                @else
+                    <p class="text-center mb-auto">{{__('msg.dereringenaktiviteter')}}!</p>
+                @endif
             @endforeach
         @else
             <p class="text-center mb-auto">{{__('msg.dereringenaktiviteter')}}!</p>

skolehjem/resources/views/app/layout/base.blade.php

@@ -23,6 +23,7 @@
     <link rel="apple-touch-icon" type="images/svg" sizes="152x152" href="/images/icons/img152x152.svg">
     <link rel="apple-touch-icon" type="images/svg" sizes="167x167" href="/images/icons/img152x152.svg">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="shortcut icon" type="images/svg" sizes="72x72" href="/images/icons/browserFavIcon.svg">
     <link rel="shortcut icon" type="images/svg" sizes="72x72" href="/images/icons/img72x72.svg">
     <link rel="shortcut icon" type="images/svg" sizes="96x96" href="/images/icons/img96x96.svg">
     <link rel="shortcut icon" type="images/svg" sizes="128x128" href="/images/icons/img128x128.svg">

skolehjem/resources/views/app/multiple-events/index.blade.php

@@ -71,22 +71,26 @@
     <!--Alert box, display when a event is delete: end -->
 
         <!--If there is a images to the event do this: Start-->
-        @if(!$multiEvents->isEmpty())
+        @if(!empty($multiEvents))
             @foreach($multiEvents as $multiEvent)
-                <div class="card">
+               @if(\Carbon\Carbon::now() < date("Y-m-d H:i", strtotime($multiEvent->date)))
-                    @if($multiEvent->resource_id !== null)
+                    <div class="card">
-                        <div class="header">
+                        @if($multiEvent->resource_id !== null)
-                            <img class="w-100" src="{{ asset(\App\Resource::query()->where("id", "=", $multiEvent->resource_id)->first()->filename) }}">
+                            <div class="header">
-                        </div>
+                                <img class="w-100" src="{{ asset(\App\Resource::query()->where("id", "=", $multiEvent->resource_id)->first()->filename) }}">
-                    @endif
+                            </div>
-                    <div class="container" class="mt-1">
+                        @endif
-                        <p class="m-none">Oprettet: {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($multiEvent->created_at))->format('d/m/Y \k\l\. H:i') }}</p>
+                        <div class="container" class="mt-1">
-                        <h4 class="m-none">Ugentlige aktivitets plan for uge {{ $multiEvent->week }}</h4>
+                            <p class="m-none">Oprettet: {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($multiEvent->created_at))->format('d/m/Y \k\l\. H:i') }}</p>
-                        <div class="row justify-content-space mt-1">
+                            <h4 class="m-none">Ugentlige aktivitets plan for uge {{ $multiEvent->week }}</h4>
-                            <a class="sde-blue text-center m-none p-none bold" href="{{route("multiple-events.show", $multiEvent->id)}}">{{__('msg.læsmere')}}</a>
+                            <div class="row justify-content-space mt-1">
+                                <a class="sde-blue text-center m-none p-none bold" href="{{route("multiple-events.show", $multiEvent->id)}}">{{__('msg.læsmere')}}</a>
+                            </div>
                         </div>
                     </div>
-                </div>
+                @else
+                    <p class="text-center mb-auto">{{__('msg.dereringenaktiviteter')}}!</p>
+                @endif
             @endforeach
         @else
             <p class="text-center mb-auto">{{__('msg.dereringenaktiviteter')}}!</p>