Update Laravel to 7.0

app/Http/Controllers/EventController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Event;
+use App\GoogleDriveFile;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
@@ -38,7 +39,25 @@ class EventController extends Controller
     {
         $event = new Event();
 
-
+        if (\App\GoogleDriveFile::checkConfig())
+        {
+            if (\request()->hasFile('files'))
+            {
+                $dir = \App\GoogleDriveFile::findByPath('.Systeme/.Fichier/.MessageDeLaSemaine');
+                $files = [];
+                foreach (\request()->file('files') as $f)
+                {
+                    $name = urlencode(pathinfo($f->getClientOriginalName())['filename'].'_'.uniqid().'.'.$f->getClientOriginalExtension());
+                    \Storage::cloud()->putFileAs($dir->id,$f,$name);
+                    array_push($files,$name);
+                }
+                $event->weekly_msg_file = $files;
+            }
+            else
+            {
+                $event->weekly_msg_file = [''];
+            }
+        }
 
         $event->name = request('name');
         $event->date_begin = request('begin_time');
@@ -58,7 +77,7 @@ class EventController extends Controller
         if(\request("use_weekly_msg"))
         {
             $event->use_weekly_msg = 1;
-            $event->msg = request('msg');
+            $event->msg = request('admin_desc');
         }
         else
         {
@@ -132,15 +151,23 @@ class EventController extends Controller
                     {
                         $course->name = request('name_n'.$l.'_p'.$p);
                         $course->ocom = request('ocom_n'.$l.'_p'.$p);
-                        $course->comment = "";
+                        $course->desc = "";
                     }
                     else
                     {
                         $course->name = "";
                         $course->ocom = "";
-                        $course->comment = request('desc_n'.$l.'_p'.$p);
+                        if (request('desc_n'.$l.'_p'.$p) == null)
+                        {
+                            $course->desc = "";
+                        }
+                        else
+                        {
+                            $course->desc = request('desc_n'.$l.'_p'.$p);
+                        }
                     }
-
+                    $course->comment_officer = "";
+                    $course->comment = "";
                     $course->save();
 
                     $ocom = \App\OCOM::where('ocom','=',request('ocom_n'.$l.'_p'.$p))->first();
@@ -251,7 +278,7 @@ class EventController extends Controller
                     $course->location = request('loc_n'.$l.'_p'.$p);
                     $course->periode = $p;
                     $course->level = $l;
-
+                    $course->comment_officer = "";
                     $course->comment = "";
                     $course->event_id = $event->id;
 

app/Http/Controllers/EventTypeController.php

@@ -24,7 +24,7 @@ class EventTypeController extends Controller
      */
     public function create()
     {
-        //
+        return view('admin.event_type.create');
     }
 
     /**
@@ -35,7 +35,83 @@ class EventTypeController extends Controller
      */
     public function store(Request $request)
     {
-        //
+        $eventType = new EventType();
+        $eventType->name = $request->name;
+        $eventType->location = $request->location;
+        $eventType->begin_time = $request->begin_time;
+        $eventType->end_time = $request->end_time;
+        $eventType->calendar_icon = $request->calendar_icon;
+        $eventType->calendar_color = $request->calendar_color;
+        $eventType->admin_desc = $request->admin_desc;
+
+        if ($request->use_weekly_msg == 'on')
+        {
+            $eventType->use_weekly_msg = 1;
+            $eventType->weekly_msg_publication_time = $request->weekly_msg_publication_time;
+        }
+        else
+        {
+            $eventType->use_weekly_msg = 0;
+            $eventType->weekly_msg_publication_time = '';
+        }
+        if ($request->use_schedule == 'on')
+        {
+            $eventType->use_schedule = 1;
+        }
+        else
+        {
+            $eventType->use_schedule = 0;
+        }
+        if ($request->is_mandatory == 'on')
+        {
+            $eventType->is_mandatory = 1;
+        }
+        else
+        {
+            $eventType->is_mandatory = 0;
+        }
+
+        $nbOfLevel = 1;
+        while (\request('level_name_'.$nbOfLevel))
+        {
+            $nbOfLevel++;
+        }
+        $nbOfLevel = $nbOfLevel-1;
+
+        $nbOfPeriode = 1;
+        while (\request('periode_name_'.$nbOfPeriode))
+        {
+            $nbOfPeriode++;
+        }
+        $nbOfPeriode = $nbOfPeriode -1;
+
+        $model = [];
+        for ($x = 1; $x <= $nbOfPeriode; $x++) {
+            $model['periodes'][$x-1] = [
+                'name' => \Request('periode_name_'.$x),
+                'begin_time' => \Request('periode_begin_time_'.$x),
+                'end_time' => \Request('periode_end_time_'.$x)
+            ];
+        }
+        for ($i = 1; $i <= $nbOfLevel; $i++) {
+            $model['niveaux'][$i-1] = [
+                'name' => \Request('level_name_'.$i)
+            ];
+
+            for ($x = 1; $x <= $nbOfPeriode; $x++) {
+                $model['default_value'][$x-1][$i-1] = [
+                    'ocom' => \Request('ocom_n'.$i.'_p'.$x),
+                    'name' => \Request('name_n'.$i.'_p'.$x),
+                    'location' => \Request('location_n'.$i.'_p'.$x),
+                    'instructor' => \Request('instruc_n'.$i.'_p'.$x),
+                    'desc' => \Request('desc_n'.$i.'_p'.$x),
+                    'use_course' => \Request('use_course_n'.$i.'_p'.$x),
+                ];
+            }
+        }
+        $eventType->schedule_model = $model;
+        $eventType->save();
+        return redirect('/admin/config/instruction')->with('success','Type d\'évenement ajouté avec succès');
     }
 
     /**
@@ -84,13 +160,11 @@ class EventTypeController extends Controller
         {
             $eventType->use_weekly_msg = 1;
             $eventType->weekly_msg_publication_time = $request->weekly_msg_publication_time;
-            $eventType->weekly_msg = $request->weekly_msg;
         }
         else
         {
             $eventType->use_weekly_msg = 0;
             $eventType->weekly_msg_publication_time = '';
-            $eventType->weekly_msg = '';
         }
         if ($request->use_schedule == 'on')
         {
@@ -158,9 +232,10 @@ class EventTypeController extends Controller
      * @param  \App\EventType  $eventType
      * @return \Illuminate\Http\Response
      */
-    public function destroy(EventType $eventType)
+    public function destroy($id)
     {
-        //
+        $e = EventType::findOrFail($id);
+        $e->delete();
     }
 
     public function toJson($id)

app/Http/Controllers/GoogleDriveController.php

@@ -358,6 +358,11 @@ class GoogleDriveController extends Controller
                 'job' => [],
                 'user' => []
             ],
+            '.Systeme/.Fichier/.MessageDeLaSemaine' => [
+                'rank' => [1 => 'rwp',0 => 'r'],
+                'job' => [],
+                'user' => []
+            ],
             '.Systeme/.Fichier/.PlanDeCours' => [
                 'rank' => [1 => 'rwp'],
                 'job' => [],

app/Http/Controllers/StatsController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use phpDocumentor\Reflection\Types\Collection;
 
 class StatsController extends Controller
 {
@@ -28,10 +29,9 @@ class StatsController extends Controller
             }
         }
 
-        $coursesUTTD = $coursesTY;
+        $coursesUTTD = clone $coursesTY;
         $nbCoursePlanDoneUTDP = 0;
         $nbCoursePlanDoneAndCheckUTDP = 0;
-
         foreach ($coursesUTTD as $key => $course)
         {
             if (date('c',strtotime($course->event->date_begin)) >= date('c'))
@@ -55,9 +55,8 @@ class StatsController extends Controller
             }
         }
         $instructorUTTD = $instructorUTTD->unique();
-
         $eventTY = \App\Event::allThisYear();
-        $eventUTTD = $eventTY;
+        $eventUTTD = clone $eventTY;
         foreach ($eventUTTD as $key => $event)
         {
             if (date('c',strtotime($event->date_begin)) >= date('c'))
@@ -65,6 +64,7 @@ class StatsController extends Controller
                 $eventUTTD->forget($key);
             }
         }
+
         return view('admin.stats.instruction',[
             'nbCourseThisYear' => count($coursesTY),
             'nbInstructorUpToThisDay' => count($instructorUTTD),