From 537e5dc1391e445204b157d3fb26594deadbf361 Mon Sep 17 00:00:00 2001
From: Mathieu Lagace <thekilleurcraft@gmail.com>
Date: Thu, 7 Nov 2019 17:06:01 -0500
Subject: [PATCH] Hotfix

---
 app/User.php                              |  7 +++--
 resources/views/admin/dashboard.blade.php | 33 ++++++++++++-----------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app/User.php b/app/User.php
index ce444799..29ba6511 100644
--- a/app/User.php
+++ b/app/User.php
@@ -80,9 +80,12 @@ class User extends Authenticatable
         $filterCourse = collect();
         foreach (\Auth::user()->courses as $course)
         {
-            if(date('U',strtotime($course->event->date_begin)) >= date('U'))
+            if($course->event)
             {
-                $filterCourse->push($course);
+                if(date('U',strtotime($course->event->date_begin)) >= date('U'))
+                {
+                    $filterCourse->push($course);
+                }
             }
         }
         return $filterCourse;
diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php
index 7a200289..fdfe4608 100644
--- a/resources/views/admin/dashboard.blade.php
+++ b/resources/views/admin/dashboard.blade.php
@@ -10,7 +10,7 @@
                     </div>
                     <div class="card-body">
                         <div class="row">
-                        @if(\Auth::user()->courses->isEmpty())
+                        @if(\Auth::user()->futureCourses()->isEmpty())
                             <div class="col-sm-12 text-center">
                                 <h4 class="m-4">Aucun cours à venir</h4>
                             </div>
@@ -44,24 +44,25 @@
                                 <div class="col-sm-12 text-center">
                                     <h4 class="m-4">Aucune activité à venir</h4>
                                 </div>
-                            @endif
-                            @foreach ($futureEvent as $event)
-                                <div class="col-md-12">
-                                    <div class="alert" style="background-color: {{\App\ComplementaryActivity::find($event->type)->calendar_color}}">
-                                        <div class="row text-white">
-                                            <div class="col-md-2 text-capitalize m-auto d-none d-md-flex">
-                                                <h3 class="m-0 p-0" style="margin-top: -0.5rem !important;">{!! \App\ComplementaryActivity::find($event->type)->calendar_icon !!}</h3>
-                                            </div>
-                                            <div class="col-md">
-                                                {{$event->name}}
-                                            </div>
-                                            <div class="col-md-4">
-                                                {{$event->date_begin}}
+                            @else
+                                @foreach ($futureEvent as $event)
+                                    <div class="col-md-12">
+                                        <div class="alert" style="background-color: {{\App\ComplementaryActivity::find($event->type)->calendar_color}}">
+                                            <div class="row text-white">
+                                                <div class="col-md-2 text-capitalize m-auto d-none d-md-flex">
+                                                    <h3 class="m-0 p-0" style="margin-top: -0.5rem !important;">{!! \App\ComplementaryActivity::find($event->type)->calendar_icon !!}</h3>
+                                                </div>
+                                                <div class="col-md">
+                                                    {{$event->name}}
+                                                </div>
+                                                <div class="col-md-4">
+                                                    {{$event->date_begin}}
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                            @endforeach
+                                @endforeach
+                            @endif
                         </div>
                         <br>
                         <a href="/admin/schedule" type="button" class="btn btn-primary btn-lg btn-block">Afficher plus</a>