From 3268a1e6563edba22c44f12014f34512aeb14149 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Wed, 13 Sep 2023 14:53:47 +0200
Subject: [PATCH] Fix event algorithm

---
 app/models/communication/website/agenda/event.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/models/communication/website/agenda/event.rb b/app/models/communication/website/agenda/event.rb
index 64d6f4c23..5e4bae17b 100644
--- a/app/models/communication/website/agenda/event.rb
+++ b/app/models/communication/website/agenda/event.rb
@@ -82,13 +82,12 @@ class Communication::Website::Agenda::Event < ApplicationRecord
   end
 
   def present?
-    to_day.present? ? (from_day >= Date.today && to_day <= Date.today)
+    to_day.present? ? (Date.today >= from_day && Date.today <= to_day)
                     : from_day == Date.today
   end
 
   def archive?
-    to_day.present? ? to_day < Date.today
-                    : from_day < Date.today
+    status == STATUS_ARCHIVE
   end
 
   # Un événement demain aura une distance de 1, comme un événement hier
-- 
GitLab