From 67433f2b72b9ab85c687e1b3282d9ff11a6e60ef Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Fri, 18 Oct 2024 18:14:55 +0200
Subject: [PATCH] =?UTF-8?q?Ajout=20debug=20(et=20correction=20de=20quelque?=
 =?UTF-8?q?s=20d=C3=A9tails)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/agenda_culturel/settings/base.py          | 24 ++++++++++++++++++-
 .../templates/agenda_culturel/day-inc.html    |  4 ++--
 .../agenda_culturel/event-location-inc.html   |  4 ++--
 .../templates/agenda_culturel/filter-inc.html |  7 ++----
 .../forms/category-checkbox.html              |  2 +-
 .../agenda_culturel/forms/tag-checkbox.html   |  2 +-
 .../templates/agenda_culturel/page-month.html |  2 +-
 .../templates/agenda_culturel/page-week.html  |  4 ++--
 8 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/agenda_culturel/settings/base.py b/src/agenda_culturel/settings/base.py
index 1c51897..7a6ebe0 100644
--- a/src/agenda_culturel/settings/base.py
+++ b/src/agenda_culturel/settings/base.py
@@ -253,4 +253,26 @@ ROBOTS_USE_SITEMAP = False
 if DEBUG:
     import socket
     hostname, _, ips = socket.gethostbyname_ex(socket.gethostname())
-    INTERNAL_IPS = [ip[: ip.rfind(".")] + ".1" for ip in ips] + ["127.0.0.1", "10.0.2.2"]
\ No newline at end of file
+    INTERNAL_IPS = [ip[: ip.rfind(".")] + ".1" for ip in ips] + ["127.0.0.1", "10.0.2.2"]
+
+# logging
+
+level_debug = "DEBUG" if DEBUG else "ERROR"
+LOGGING = {
+    "version": 1,
+    "disable_existing_loggers": False,
+    "handlers": {
+        "file": {
+            "level": level_debug,
+            "class": "logging.FileHandler",
+            "filename": "backend.log",
+        },
+    },
+    "loggers": {
+        "django": {
+            "handlers": ["file"],
+            "level": level_debug,
+            "propagate": True,
+        },
+    },
+}
diff --git a/src/agenda_culturel/templates/agenda_culturel/day-inc.html b/src/agenda_culturel/templates/agenda_culturel/day-inc.html
index 873ea0b..4fccf83 100644
--- a/src/agenda_culturel/templates/agenda_culturel/day-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/day-inc.html
@@ -20,10 +20,10 @@
     </script>
     {% endif %}
     <header{% if day.is_today %} id="today"{% endif %}>
-    <{% if headers %}{{ headers }}{% else %}h2{% endif %}><a href="{{ day.date | url_day }}?{{ filter.get_url }}">{{ day.date | date:"l j" }}</a></{% if headers %}{{ headers }}{% else %}h2{% endif %}>
+    <{% if headers != "" %}{{ headers }}{% else %}h2{% endif %}><a href="{{ day.date | url_day }}?{{ filter.get_url }}">{{ day.date | date:"l j" }}</a></{% if headers != "" %}{{ headers }}{% else %}h2{% endif %}>
     </header>
     {% if day.events %}
-    {% if resume %}
+    {% if resume == 1 %}
         <ul>
             {% for category, events in day.events_by_category_ordered %}
             <li>{{ events.0.category | circle_cat }} 
diff --git a/src/agenda_culturel/templates/agenda_culturel/event-location-inc.html b/src/agenda_culturel/templates/agenda_culturel/event-location-inc.html
index c307b19..7f51fab 100644
--- a/src/agenda_culturel/templates/agenda_culturel/event-location-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/event-location-inc.html
@@ -1,9 +1,9 @@
 
 {% if event.exact_location %}
     {% if nolink %}
-        {{ event.exact_location.name }}{% if not nocity %}, {{ event.exact_location.city }}{% endif %}
+        {{ event.exact_location.name }}, {{ event.exact_location.city }}
     {% else %}
-        <a href="{% url 'view_place' event.exact_location.pk %}">{{ event.exact_location.name }}{% if not nocity %}, {{ event.exact_location.city }}{% endif %}</a>
+        <a href="{% url 'view_place' event.exact_location.pk %}">{{ event.exact_location.name }}, {{ event.exact_location.city }}</a>
     {% endif %}
 {% else %}
     {% if perms.agenda_culturel.change_event and perms.agenda_culturel.change_place %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/filter-inc.html b/src/agenda_culturel/templates/agenda_culturel/filter-inc.html
index a436e12..573c32f 100644
--- a/src/agenda_culturel/templates/agenda_culturel/filter-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/filter-inc.html
@@ -2,7 +2,7 @@
 {% load tag_extra %}
 {% load utils_extra %}
 
-{% if not noarticle %}
+{% if noarticle == 0 %}
 <article id="filters">
 {% endif %}
     <div>
@@ -23,9 +23,6 @@
             {% for s in filter.get_status_names %}
                 {{ s }}
             {% endfor %}
-            {% for c in filter.get_cities %}
-                {{ c }}
-            {% endfor %}
             {{ filter.get_recurrence_filtering }}
             {{ filter.get_position_radius }}
         {% else %}
@@ -70,6 +67,6 @@
     <div class="clear"></div>
     </div>
 
-{% if not noarticle %}
+{% if noarticle == 0 %}
 </article>
 {% endif %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/forms/category-checkbox.html b/src/agenda_culturel/templates/agenda_culturel/forms/category-checkbox.html
index 08c33fb..888ac5f 100644
--- a/src/agenda_culturel/templates/agenda_culturel/forms/category-checkbox.html
+++ b/src/agenda_culturel/templates/agenda_culturel/forms/category-checkbox.html
@@ -6,7 +6,7 @@
     </label>
 </div>
 {% with container_id=widget.attrs.id %}
-<div class="options-filter" id="{{ widget.attrs.id }}"{% if widget.attrs.class %} class="{{ widget.attrs.class }}"{% endif %} data-button="{{ widget.attrs.id }}-button">{% for group, options, index in widget.optgroups %}{% if group %}
+<div class="options-filter" id="{{ widget.attrs.id }}" data-button="{{ widget.attrs.id }}-button">{% for group, options, index in widget.optgroups %}{% if group %}
   <div><label>{{ group }}</label>{% endif %}{% for widget in options %}<div role="button" class="small-cat contrast">
     {{ widget.value.instance | circle_cat }}{% include widget.template_name %}</div>{% endfor %}{% if group %}
   </div>{% endif %}{% endfor %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/forms/tag-checkbox.html b/src/agenda_culturel/templates/agenda_culturel/forms/tag-checkbox.html
index c5d631a..0f1154a 100644
--- a/src/agenda_culturel/templates/agenda_culturel/forms/tag-checkbox.html
+++ b/src/agenda_culturel/templates/agenda_culturel/forms/tag-checkbox.html
@@ -6,7 +6,7 @@
 </label>
 </div>
 {% with container_id=widget.attrs.id %}
-<div class="options-filter" id="{{ widget.attrs.id }}"{% if widget.attrs.class %} class="{{ widget.attrs.class }}"{% endif %} data-button="{{ widget.attrs.id }}-button">{% for group, options, index in widget.optgroups %}{% if group %}
+<div class="options-filter" id="{{ widget.attrs.id }}" data-button="{{ widget.attrs.id }}-button">{% for group, options, index in widget.optgroups %}{% if group %}
     <div><label>{{ group }}</label>{% endif %}{% for widget in options %}<div role="button" class="small-cat">
       {% include widget.template_name %}</div>{% endfor %}{% if group %}
     </div>{% endif %}{% endfor %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-month.html b/src/agenda_culturel/templates/agenda_culturel/page-month.html
index 5ed4835..5d1affb 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-month.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-month.html
@@ -27,7 +27,7 @@
  {% with cache_timeout=user.is_authenticated|yesno:"30,600" %}
  {% cache cache_timeout month user.is_authenticated calendar.firstdate filter.to_str LANGUAGE_CODE %}
 
- {% include "agenda_culturel/filter-inc.html" with filter=filter %}
+ {% include "agenda_culturel/filter-inc.html" with filter=filter noarticle=0 %}
 
 
  <article>
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-week.html b/src/agenda_culturel/templates/agenda_culturel/page-week.html
index 48b2708..721b0f6 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-week.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-week.html
@@ -24,7 +24,7 @@
  {% with cache_timeout=user.is_authenticated|yesno:"30,600" %}
  {% cache cache_timeout week user.is_authenticated calendar.firstdate filter.to_str LANGUAGE_CODE %}
 
-{% include "agenda_culturel/filter-inc.html" with filter=filter %}
+{% include "agenda_culturel/filter-inc.html" with filter=filter noarticle=0 %}
 
 <article>
     <header>
@@ -64,7 +64,7 @@
 
         <div class="grid">
         {% for d in calendar.calendar_days_list %}
-        {% include "agenda_culturel/day-inc.html" with day=d fixed_style=calendar.all_in_past filter=filter %}
+        {% include "agenda_culturel/day-inc.html" with day=d resume=0 fixed_style=calendar.all_in_past filter=filter headers="" %}
         {% endfor %}
         </div>
         <div class="slider-button slider-button-inside button-right hidden">{% picto_from_name "arrow-right" %}</div>