agenda dates

diff --git a/app/Models/WeeklyAgenda.php b/app/Models/WeeklyAgenda.php
index f26884072327a31bfb0a2122b0307030cf2c753a..607f99502e991a86985177ad2d4df6b00f6ccd81 100644 (file)
--- a/app/Models/WeeklyAgenda.php
+++ b/app/Models/WeeklyAgenda.php
@@ -22,8 +22,6 @@ class WeeklyAgenda extends Model
         'title',
     ];
 
-    protected $dates = ['start_date'];
-
     protected $appends = ['title'];
 
     public $mediasParams = [
@@ -42,24 +40,31 @@ class WeeklyAgenda extends Model
      */
     public function getTitleAttribute()
     {
-        return $this->start_date->format('d/m/Y');
+        return $this->startDateCarbon()->format('d/m/Y');
+    }
+    public function getUrlAttribute()
+    {
+        return route('agenda.show', ['agenda' => $this->id]);
     }
 
+
     /**
      * @return Carbon
      */
-    public function getEndDateAttribute(): Carbon
+    public function startDateCarbon(): Carbon
     {
-        return $this->start_date->addWeek();
+        return Carbon::parse($this->start_date);
     }
 
-    public function getUrlAttribute()
+    /**
+     * @return Carbon
+     */
+    public function endDateCarbon(): Carbon
     {
-        return route('agenda.show', ['agenda' => $this->id]);
+        return $this->startDateCarbon()->addWeek();
     }
 
 
-
     public function nextWeekUrl()
     {
         return ($a = self::find($this->id + 1)) === null ?

diff --git a/resources/views/en-plus/agenda/show.blade.php b/resources/views/en-plus/agenda/show.blade.php
index 0bc09c4ecbb44e5b801ccb5889e2a8b9f5e04af1..27a76f49e12dff2261306a53c8414f9f3b0c48c8 100644 (file)
--- a/resources/views/en-plus/agenda/show.blade.php
+++ b/resources/views/en-plus/agenda/show.blade.php
@@ -6,7 +6,7 @@
 
         @component('components.back', ['back' => route('humeur-agenda.index')])
         @endcomponent
-        <h1>Semaine du {{$agenda->start_date->format('d/m/Y')}} au {{$agenda->end_date->format('d/m/Y')}}</h1>
+        <h1>Semaine du {{$agenda->startDateCarbon()->format('d/m/Y')}} au {{$agenda->endDateCarbon()->format('d/m/Y')}}</h1>
 
         <div class="row">
 

diff --git a/resources/views/en-plus/index.blade.php b/resources/views/en-plus/index.blade.php
index f900a46b48b7453c366d0c08a71258c4a925d29f..30887ec65dc1acfc3fa0582f1a28b28f9db4c3ab 100644 (file)
--- a/resources/views/en-plus/index.blade.php
+++ b/resources/views/en-plus/index.blade.php
@@ -28,7 +28,7 @@
                 </a>
                 @endif
 
-                <a href="{{route('agenda.show', ['agenda' => $agenda->id])}}" class="click-here text-left mt-3">Les Conférences de presse, les Colloques, les Rendez-Vous et les Dates essentielles des acteurs du Médicament et de leurs Partenaires</a>
+                <a href="{{route('agenda.show', ['agenda' => $agenda->start_date])}}" class="click-here text-left mt-3">Les Conférences de presse, les Colloques, les Rendez-Vous et les Dates essentielles des acteurs du Médicament et de leurs Partenaires</a>
             </div>
         </div>
     </div>

diff --git a/routes/web.php b/routes/web.php
index a30502880a512d818726d3d6c4baf242d02ad167..00cd5cddd75a1f177185e749dc5eef8f08645002 100644 (file)
--- a/routes/web.php
+++ b/routes/web.php
@@ -85,7 +85,7 @@ Route::domain(env('CLIENT_DOMAIN_NAME'))->group(function() {
     Route::get('agenda-et-humeurs', 'EnPlusController@index')->name('humeur-agenda.index');
     Route::get('humeurs', 'HumeurController@index')->name('humeur.index');
     Route::get('humeurs/{slug}', 'HumeurController@show')->name('humeur.show');
-    Route::get('agendas/{agenda}', 'AgendaController@show')->name('agenda.show');
+    Route::get('agendas/{agenda:start_date}', 'AgendaController@show')->name('agenda.show');
 
     Route::get('/l/{link:slug}', 'TrackedLinkController@redirect')->name('track');