From a180534be2ff86c85a30f87f997bbef6a92f7c8c Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Mon, 9 Sep 2024 22:19:51 +0200
Subject: [PATCH] =?UTF-8?q?Correction=20bug=20=C3=A9dit=20lieux=20Fix=20#1?=
 =?UTF-8?q?33?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agenda_culturel/place_detail.html         |  2 +-
 src/agenda_culturel/urls.py                   |  2 +-
 src/agenda_culturel/views.py                  | 19 +++++++++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/agenda_culturel/templates/agenda_culturel/place_detail.html b/src/agenda_culturel/templates/agenda_culturel/place_detail.html
index e319247..3dae04f 100644
--- a/src/agenda_culturel/templates/agenda_culturel/place_detail.html
+++ b/src/agenda_culturel/templates/agenda_culturel/place_detail.html
@@ -70,7 +70,7 @@
         {% if past %}
         <a href="{% url 'view_place' object.pk %}" role="button">Voir les événements à venir</a>
         {% else %}
-        <a href="{% url 'view_place_past' object.pk 'past' %}" role="button">Voir les événements passés</a>
+        <a href="{% url 'view_place_past' object.pk %}" role="button">Voir les événements passés</a>
         {% endif %}
     </div>
     {% if object_list %}
diff --git a/src/agenda_culturel/urls.py b/src/agenda_culturel/urls.py
index 36ab98f..04b36eb 100644
--- a/src/agenda_culturel/urls.py
+++ b/src/agenda_culturel/urls.py
@@ -142,7 +142,7 @@ urlpatterns = [
     ),
     path("404/", page_not_found, name="page_not_found"),
     path("500/", internal_server_error, name="internal_server_error"),
-    path("place/<int:pk>/<past>", PlaceDetailView.as_view(), name="view_place_past"),
+    path("place/<int:pk>/past", PlaceDetailViewPast.as_view(), name="view_place_past"),
     path("place/<int:pk>", PlaceDetailView.as_view(), name="view_place"),
     path("place/<int:pk>/edit", PlaceUpdateView.as_view(), name="edit_place"),
     path("place/<int:pk>/delete", PlaceDeleteView.as_view(), name="delete_place"),
diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py
index 44a7be4..c15b299 100644
--- a/src/agenda_culturel/views.py
+++ b/src/agenda_culturel/views.py
@@ -1750,17 +1750,24 @@ class PlaceDetailView(ListView):
 
     def get_queryset(self):
         self.place = get_object_or_404(Place, pk=self.kwargs["pk"])
-        logger.warning(self.kwargs)
-        self.past = "past" in self.kwargs
-        if self.past:
-            return Event.objects.filter(exact_location=self.place).filter(start_day__lte=datetime.now()).order_by("-start_day")
-        else:
-            return Event.objects.filter(exact_location=self.place).filter(start_day__gte=datetime.now()).order_by("start_day")
+        return Event.objects.filter(exact_location=self.place).filter(start_day__gte=datetime.now()).order_by("start_day")
             
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["object"] = self.place
+        return context
+
+class PlaceDetailViewPast(PlaceDetailView):
+
+    def get_queryset(self):
+        self.place = get_object_or_404(Place, pk=self.kwargs["pk"])
+        self.past = True
+        return Event.objects.filter(exact_location=self.place).filter(start_day__lte=datetime.now()).order_by("-start_day")
+
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
         context["past"] = self.past
         return context