From 36624872c268742eee07538fcde0c989d3b7a3e5 Mon Sep 17 00:00:00 2001 From: Louis Jeckel Date: Fri, 4 Sep 2020 12:12:17 +0200 Subject: [PATCH] agenda dates --- app/Models/WeeklyAgenda.php | 21 ++++++++++++------- resources/views/en-plus/agenda/show.blade.php | 2 +- resources/views/en-plus/index.blade.php | 2 +- routes/web.php | 2 +- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/Models/WeeklyAgenda.php b/app/Models/WeeklyAgenda.php index f268840..607f995 100644 --- 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 0bc09c4..27a76f4 100644 --- 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 -

Semaine du {{$agenda->start_date->format('d/m/Y')}} au {{$agenda->end_date->format('d/m/Y')}}

+

Semaine du {{$agenda->startDateCarbon()->format('d/m/Y')}} au {{$agenda->endDateCarbon()->format('d/m/Y')}}

diff --git a/resources/views/en-plus/index.blade.php b/resources/views/en-plus/index.blade.php index f900a46..30887ec 100644 --- a/resources/views/en-plus/index.blade.php +++ b/resources/views/en-plus/index.blade.php @@ -28,7 +28,7 @@ @endif - Les Conférences de presse, les Colloques, les Rendez-Vous et les Dates essentielles des acteurs du Médicament et de leurs Partenaires + Les Conférences de presse, les Colloques, les Rendez-Vous et les Dates essentielles des acteurs du Médicament et de leurs Partenaires
diff --git a/routes/web.php b/routes/web.php index a305028..00cd5cd 100644 --- 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'); -- 2.39.5