From 32201ecd437d8c39c7699a22d774a5458c1d2fb2 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Wed, 1 May 2024 15:06:02 +0200
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20UC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Ajout d'une liste des événements par lieu
- Correction de quelques défauts d'affichage
---
 .../agenda_culturel/ephemeris-inc.html         |  2 +-
 .../templates/agenda_culturel/navigation.html  | 15 +++++++++++++++
 .../agenda_culturel/place_detail.html          | 18 ++++++++++++++++--
 .../templates/agenda_culturel/place_list.html  | 18 +++---------------
 .../single-event/event-in-flat-list-inc.html   | 10 +++++++---
 .../single-event/event-in-list-inc.html        |  2 +-
 src/agenda_culturel/views.py                   | 14 +++++++++++++-
 7 files changed, 56 insertions(+), 23 deletions(-)
 create mode 100644 src/agenda_culturel/templates/agenda_culturel/navigation.html

diff --git a/src/agenda_culturel/templates/agenda_culturel/ephemeris-inc.html b/src/agenda_culturel/templates/agenda_culturel/ephemeris-inc.html
index 8430cd7..5615870 100644
--- a/src/agenda_culturel/templates/agenda_culturel/ephemeris-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/ephemeris-inc.html
@@ -4,7 +4,7 @@
     {% if event.is_single_day %}
         {{ event.start_day |date:"l" }}<br />
         <a href="{{ event.start_day | url_day }}?{{ filter.get_url }}"><span class="large">{{ event.start_day |date:"j" }}</span><br />
-        {{ event.start_day |date:"F" }}</a>
+        {{ event.start_day |date:"F" }}{% if with_year %} {{ event.start_day |date:"Y" }}{% endif %}</a>
         {% if event.start_time %}
             <footer>
                 <span class="large">{{ event.start_time }}</span>
diff --git a/src/agenda_culturel/templates/agenda_culturel/navigation.html b/src/agenda_culturel/templates/agenda_culturel/navigation.html
new file mode 100644
index 0000000..825df3f
--- /dev/null
+++ b/src/agenda_culturel/templates/agenda_culturel/navigation.html
@@ -0,0 +1,15 @@
+<span>
+    {% if page_obj.has_previous %}
+        <a href="?page=1" role="button">&laquo; premier</a>
+        <a href="?page={{ page_obj.previous_page_number }}" role="button">précédent</a>
+    {% endif %}
+
+    <span>
+        Page {{ page_obj.number }} sur {{ page_obj.paginator.num_pages }}
+    </span>
+
+    {% if page_obj.has_next %}
+        <a href="?page={{ page_obj.next_page_number }}" role="button">suivant</a>
+        <a href="?page={{ page_obj.paginator.num_pages }}" role="button">dernier &raquo;</a>
+    {% endif %}
+</span>
diff --git a/src/agenda_culturel/templates/agenda_culturel/place_detail.html b/src/agenda_culturel/templates/agenda_culturel/place_detail.html
index 7d83162..c3bb3d2 100644
--- a/src/agenda_culturel/templates/agenda_culturel/place_detail.html
+++ b/src/agenda_culturel/templates/agenda_culturel/place_detail.html
@@ -27,8 +27,8 @@
         {% endif %}
         {% if perms.agenda_culturel.change_place %}
         <div class="slide-buttons">
-            <a href="{% url 'edit_place' place.pk %}" role="button">Modifier {% picto_from_name "edit-3" %}</a>
-            <a href="{% url 'delete_place' place.pk %}" role="button">Supprimer {% picto_from_name "trash-2" %}</a>
+            <a href="{% url 'edit_place' object.pk %}" role="button">Modifier {% picto_from_name "edit-3" %}</a>
+            <a href="{% url 'delete_place' object.pk %}" role="button">Supprimer {% picto_from_name "trash-2" %}</a>
         </div>
         {% endif %}
         <h1>{{ object.name }}</h1>
@@ -58,6 +58,20 @@
             </script>
         </div>
     </div>
+    {% if object_list %}
+        <h2>Événements</h2>
+
+        {% include "agenda_culturel/navigation.html" with page_obj=page_obj %}
+
+        {% for event in object_list %}
+            <article>
+            {% include "agenda_culturel/single-event/event-in-flat-list-inc.html" with event=event no_location=1 %}
+            </article>
+        {% endfor %}
+
+        {% include "agenda_culturel/navigation.html" with page_obj=page_obj %}
+
+    {% endif %}
     <footer>
         <!--p>Voir tous les événements de ce lieu</p-->
         {% if user.is_authenticated %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/place_list.html b/src/agenda_culturel/templates/agenda_culturel/place_list.html
index 0a7f3ef..bcb4e9c 100644
--- a/src/agenda_culturel/templates/agenda_culturel/place_list.html
+++ b/src/agenda_culturel/templates/agenda_culturel/place_list.html
@@ -18,6 +18,8 @@
         </div>
         <h1>Lieux</h1>
     </header>
+    {% include "agenda_culturel/navigation.html" with page_obj=page_obj %}
+
     {% if object_list %}
       {% for place in object_list %}
       <article>
@@ -50,21 +52,7 @@
         <p>Il n'y a aucun lieu défini.</p>
     {% endif %}
     <footer>
-        <span>
-            {% if page_obj.has_previous %}
-                <a href="?page=1" role="button">&laquo; premier</a>
-                <a href="?page={{ page_obj.previous_page_number }}" role="button">précédent</a>
-            {% endif %}
-    
-            <span>
-                Page {{ page_obj.number }} sur {{ page_obj.paginator.num_pages }}
-            </span>
-    
-            {% if page_obj.has_next %}
-                <a href="?page={{ page_obj.next_page_number }}" role="button">suivant</a>
-                <a href="?page={{ page_obj.paginator.num_pages }}" role="button">dernier &raquo;</a>
-            {% endif %}
-        </span>
+        {% include "agenda_culturel/navigation.html" with page_obj=page_obj %}
      </footer>
 
 </article>
diff --git a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html
index 4706714..c9a4695 100644
--- a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html
@@ -11,9 +11,11 @@
         {% include "agenda_culturel/date-times-inc.html" with event=event %}
     </header>
     <p class="subentry-search"></p>
-        {% picto_from_name "map-pin" %}
-    {% if event.location_hl %}{{ event.location_hl | safe }}{% else %}{% include "agenda_culturel/event-location-inc.html" with event=event %}{% endif %}</p>
-    {% if event.has_recurrences %}
+        {% if not no_location %}
+            {% picto_from_name "map-pin" %}
+            {% if event.location_hl %}{{ event.location_hl | safe }}{% else %}{% include "agenda_culturel/event-location-inc.html" with event=event %}{% endif %}</p>
+        {% endif %}
+        {% if event.has_recurrences %}
         <p class="subentry-search">
         {% picto_from_name "repeat" %}
         <!-- TODO: see https://forge.chapril.org/jmtrivial/agenda_culturel/issues/65 -->
@@ -26,6 +28,7 @@
         {% endif %}
         </p>
     {% endif %}
+    {% if event.tags %}
     <p class="subentry-search">
         {% picto_from_name "tag" %}
         {% for tag in event.tags %}
@@ -33,6 +36,7 @@
         {% if not forloop.last %}, {% endif %}
         {% endfor %}
     </p>
+    {% endif %}
     <div class="description">
         {% if event.description_hl %}{{ event.description_hl | safe }} [...]{% else %}{% if event.description %}{{ event.description |truncatewords:60 }}{% else %}<em>pas de description</em>{% endif %}{% endif %}
 
diff --git a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-inc.html b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-inc.html
index 89b4666..188bfae 100644
--- a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-inc.html
@@ -5,7 +5,7 @@
 {% load tag_extra %}
 
 <article>
-    {% include "agenda_culturel/ephemeris-inc.html" with event=event filter=filter %}
+    {% include "agenda_culturel/ephemeris-inc.html" with event=event filter=filter with_year=with_year %}
 
     {{ event.category | small_cat_recurrent:event.has_recurrences }}
     {% if event.location or event.exact_location %}<hgroup>{% endif %}
diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py
index 12b9308..60a9fb5 100644
--- a/src/agenda_culturel/views.py
+++ b/src/agenda_culturel/views.py
@@ -1126,8 +1126,20 @@ class PlaceListView(ListView):
     ordering = ['name__unaccent']
 
 
-class PlaceDetailView(DetailView):
+class PlaceDetailView(ListView):
     model = Place
+    template_name = "agenda_culturel/place_detail.html"
+    paginate_by = 10
+
+    def get_queryset(self):
+        self.place = get_object_or_404(Place, pk=self.kwargs['pk'])
+        return Event.objects.filter(exact_location=self.place).order_by("-start_day")
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['object'] = self.place
+        return context
+
 
 class UpdatePlaces:
     def form_valid(self, form):