From fea20bcda9a0368534f37c9a2eaa0a8a008bd791 Mon Sep 17 00:00:00 2001
From: Mathieu Lagace <thekilleurcraft@gmail.com>
Date: Sat, 19 Oct 2019 16:20:57 -0400
Subject: [PATCH 1/2] 3.2.4

---
 app/Http/Controllers/EventController.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php
index ac4a2a98..bdfdfd0a 100644
--- a/app/Http/Controllers/EventController.php
+++ b/app/Http/Controllers/EventController.php
@@ -138,8 +138,15 @@ class EventController extends Controller
             $event->is_mandatory  = 0;
         }
         $event->desc = request('desc');
-        $event->msg = \request('msg');
-
+        if(\request('msg'))
+        {
+            $event->msg = request('msg');
+        }
+        else
+        {
+            $event->msg = "";
+        }
+        $event->date_msg = request('date_msg');
         $event->save();
 
         if ($event->type == 1) {

From 073ad62ccf0ad65b6998ccecb65678d908b26168 Mon Sep 17 00:00:00 2001
From: Mathieu Lagace <thekilleurcraft@gmail.com>
Date: Sat, 19 Oct 2019 16:30:03 -0400
Subject: [PATCH 2/2] 3.2.4

---
 app/Http/Controllers/EventController.php       | 18 ++++++++++++++++--
 .../views/admin/schedule/event/edit.blade.php  |  4 ++--
 .../views/admin/schedule/modal/add.blade.php   |  4 ++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php
index bdfdfd0a..43bf85b7 100644
--- a/app/Http/Controllers/EventController.php
+++ b/app/Http/Controllers/EventController.php
@@ -58,7 +58,14 @@ class EventController extends Controller
         {
             $event->msg = "";
         }
-        $event->date_msg = request('date_msg');
+        if(\request('date_msg'))
+        {
+            $event->date_msg = request('date_msg');
+        }
+        else
+        {
+            $event->date_msg = "";
+        }
         $event->save();
 
         if ($event->type == 1) {
@@ -146,7 +153,14 @@ class EventController extends Controller
         {
             $event->msg = "";
         }
-        $event->date_msg = request('date_msg');
+        if(\request('date_msg'))
+        {
+            $event->date_msg = request('date_msg');
+        }
+        else
+        {
+            $event->date_msg = "";
+        }
         $event->save();
 
         if ($event->type == 1) {
diff --git a/resources/views/admin/schedule/event/edit.blade.php b/resources/views/admin/schedule/event/edit.blade.php
index 54771fab..57d3c37e 100644
--- a/resources/views/admin/schedule/event/edit.blade.php
+++ b/resources/views/admin/schedule/event/edit.blade.php
@@ -91,12 +91,12 @@
                                         <div class="col-md-6">
                                             <div class="form-group">
                                                 <label class="label-control">Date et heure de publication des messages de la semaine</label>
-                                                <input name="date_msg" type="text" id="datetimepickermsg" class="form-control datetimepicker" required/>
+                                                <input name="date_msg" type="text" id="datetimepickermsg" class="form-control datetimepicker"/>
                                             </div>
                                         </div>
                                         <div class="col-md-12">
                                             <div class="form-group">
-                                                <textarea class="form-control richeditor" name="msg" id="msg" rows="6" required>{{$activity->msg}}</textarea>
+                                                <textarea class="form-control richeditor" name="msg" id="msg" rows="6">{{$activity->msg}}</textarea>
                                             </div>
                                         </div>
                                     </div>
diff --git a/resources/views/admin/schedule/modal/add.blade.php b/resources/views/admin/schedule/modal/add.blade.php
index 211aa4b4..084beaad 100644
--- a/resources/views/admin/schedule/modal/add.blade.php
+++ b/resources/views/admin/schedule/modal/add.blade.php
@@ -67,13 +67,13 @@
                 <div class="col-md-6">
                     <div class="form-group">
                         <label class="label-control">Date et heure de publication des messages de la semaine</label>
-                        <input name="date_msg" type="text" id="datetimepickermsg" class="form-control datetimepicker" required/>
+                        <input name="date_msg" type="text" id="datetimepickermsg" class="form-control datetimepicker"/>
                     </div>
                 </div>
                 <div class="col-md-12">
                     <div class="form-group">
                         <label for="desc">Message de le semaine</label>
-                        <textarea class="form-control richeditor" name="msg" id="msg" rows="6" required>{{\App\Config::getData('default_weekly_msg')}}</textarea>
+                        <textarea class="form-control richeditor" name="msg" id="msg" rows="6">{{\App\Config::getData('default_weekly_msg')}}</textarea>
                     </div>
                 </div>
             </div>