From 361b033485ab5f1d81e015139805cb09df6f2341 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Thu, 9 Nov 2023 18:00:11 +0100
Subject: [PATCH] =?UTF-8?q?on=20ajoute=20la=20semaine=20au=20d=C3=A9but=20?=
 =?UTF-8?q?de=20la=20ligne=20dans=20la=20vue=20par=20mois?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/agenda_culturel/static/style.scss             | 15 +++++++++++++++
 .../templates/agenda_culturel/day-inc.html        |  2 +-
 .../templates/agenda_culturel/page-month.html     |  9 ++++++---
 src/agenda_culturel/views.py                      |  1 +
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss
index da38545..9d7cae5 100644
--- a/src/agenda_culturel/static/style.scss
+++ b/src/agenda_culturel/static/style.scss
@@ -177,6 +177,21 @@ footer {
     .infos-and-buttons .buttons {
         flex: auto;
     }
+
+    .grid.week-in-month {
+        grid-template-columns: 2.5em repeat(auto-fit, minmax(0%, 1fr));
+        margin-bottom: .5em;
+      }
+    .entete-semaine {
+        text-orientation: upright;
+        writing-mode: sideways-lr;
+        background: rgba(0, 137, 137, 0.2);
+        padding: 1em 0;
+        h2 {
+            margin: 0;
+        }
+    }
+
 }
 
 article.day {
diff --git a/src/agenda_culturel/templates/agenda_culturel/day-inc.html b/src/agenda_culturel/templates/agenda_culturel/day-inc.html
index b4ca7c8..edc4747 100644
--- a/src/agenda_culturel/templates/agenda_culturel/day-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/day-inc.html
@@ -8,7 +8,7 @@
 
 <article class="day{{ day|calendar_classes:fixed_style }}" id="{{ daytag }}">
     <header>
-    <h2><a href="{{ day.date | url_day }}?{{ filter.get_url }}">{{ day.date | date:"l j" }}</a></h2>
+    <{% 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 %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-month.html b/src/agenda_culturel/templates/agenda_culturel/page-month.html
index bc6cc07..9b90098 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-month.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-month.html
@@ -45,10 +45,13 @@
         </div>
     </header>
     <div id="calendar">
-        <div class="grid">
+        <div class="grid week-in-month">
         {% for d in calendar.calendar_days_list %}
-        {% if forloop.counter0|divisibleby:7 and not forloop.first %}</div><div class="grid">{% endif %}
-        {% include "agenda_culturel/day-inc.html" with day=d resume=1 fixed_style=calendar.all_in_past filter=filter %}
+        {% if forloop.counter0|divisibleby:7 %}
+            {% if not forloop.first %}</div><div class="grid week-in-month">{% endif %}
+                <div class="entete-semaine"><h2><a href="{% url 'week_view' calendar.month d.week %}?{{ filter.get_url }}">Semaine {{ d.week }}</a></h2></div>
+                {% endif %}
+        {% include "agenda_culturel/day-inc.html" with day=d resume=1 fixed_style=calendar.all_in_past filter=filter headers="h3" %}
         {% endfor %}
         </div>
     </div>
diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py
index a22bb20..8f10bac 100644
--- a/src/agenda_culturel/views.py
+++ b/src/agenda_culturel/views.py
@@ -41,6 +41,7 @@ class CalendarDay:
     def __init__(self, d, on_requested_interval = True):
         self.date = d
         now = date.today()
+        self.week = d.isocalendar()[1]
 
         self.in_past = d < now
         self.today = d == now