From b35708abcb3f81936a8e529b20f3266515300a20 Mon Sep 17 00:00:00 2001
From: Valentin Deniaud <vdeniaud@entrouvert.com>
Date: Thu, 27 Apr 2023 12:18:51 +0200
Subject: [PATCH] manager: restore week number display (#75011)

---
 .../templates/chrono/manager_events_agenda_week_view.html | 2 +-
 .../manager_meetings_agenda_week_timetable_fragment.html  | 8 +++-----
 .../chrono/manager_resource_week_timetable_fragment.html  | 8 +++-----
 tests/manager/test_all.py                                 | 2 ++
 tests/manager/test_resource.py                            | 1 +
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/chrono/manager/templates/chrono/manager_events_agenda_week_view.html b/chrono/manager/templates/chrono/manager_events_agenda_week_view.html
index a86aa4d6..e3dab40f 100644
--- a/chrono/manager/templates/chrono/manager_events_agenda_week_view.html
+++ b/chrono/manager/templates/chrono/manager_events_agenda_week_view.html
@@ -10,7 +10,7 @@
 
 {% block content %}
   <div class="section">
-    <h3>{% trans "Events" %}</h3>
+    <h3>{% blocktrans with weeknum=view.first_day|date:"W" %}Events - Week {{ weeknum }}{% endblocktrans %}</h3>
     {% include 'chrono/manager_event_cancellation_report_notice.html' %}
     <div>
       {% if object_list %}
diff --git a/chrono/manager/templates/chrono/manager_meetings_agenda_week_timetable_fragment.html b/chrono/manager/templates/chrono/manager_meetings_agenda_week_timetable_fragment.html
index 080b8adf..a9564b9e 100644
--- a/chrono/manager/templates/chrono/manager_meetings_agenda_week_timetable_fragment.html
+++ b/chrono/manager/templates/chrono/manager_meetings_agenda_week_timetable_fragment.html
@@ -8,11 +8,9 @@
     {% for day in week_days.days %}
       {% if forloop.first %}
         <th class="weeknum">
-          {% if kind == 'month' %}
-            <a href="{% url 'chrono-manager-agenda-week-view' pk=agenda.pk year=day.date|date:"Y" month=day.date|date:"m" day=day.date|date:"d" %}">
-              {% blocktrans with weeknum=day.date|date:"W" %}Week{{ weeknum }}{% endblocktrans %}
-            </a>
-          {% endif %}
+          <a href="{% url 'chrono-manager-agenda-week-view' pk=agenda.pk year=day.date|date:"Y" month=day.date|date:"m" day=day.date|date:"d" %}">
+            {% blocktrans with weeknum=day.date|date:"W" %}Week{{ weeknum }}{% endblocktrans %}
+          </a>
         </th>
       {% endif %}
       <th class="weekday {% if day.today %}today{% endif %}">{% if kind == 'month' and not day.other_month or kind == 'week' %}<a href="{% url 'chrono-manager-agenda-day-view' pk=agenda.id year=day.date|date:"Y" month=day.date|date:"m" day=day.date|date:"d" %}">{{ day.date|date:"l j" }}{% if kind == 'week' %}<br />{{ day.date|date:"F" }}{% endif %}</a>{% endif %}</th>
diff --git a/chrono/manager/templates/chrono/manager_resource_week_timetable_fragment.html b/chrono/manager/templates/chrono/manager_resource_week_timetable_fragment.html
index e7e8c3c7..f955ca39 100644
--- a/chrono/manager/templates/chrono/manager_resource_week_timetable_fragment.html
+++ b/chrono/manager/templates/chrono/manager_resource_week_timetable_fragment.html
@@ -9,11 +9,9 @@
     {% for day in week_days.days %}
       {% if forloop.first %}
         <th class="weeknum">
-          {% if kind == 'month' %}
-            <a href="{% url 'chrono-manager-resource-week-view' pk=resource.pk year=day.date|date:"Y" month=day.date|date:"m" day=day.date|date:"d" %}">
-              {% blocktrans with weeknum=day.date|date:"W" %}Week{{ weeknum }}{% endblocktrans %}
-            </a>
-          {% endif %}
+          <a href="{% url 'chrono-manager-resource-week-view' pk=resource.pk year=day.date|date:"Y" month=day.date|date:"m" day=day.date|date:"d" %}">
+            {% blocktrans with weeknum=day.date|date:"W" %}Week{{ weeknum }}{% endblocktrans %}
+          </a>
         </th>
       {% endif %}
       <th class="weekday {% if day.today %}today{% endif %}">{% if kind == 'month' and not day.other_month or kind == 'week' %}<a href="{% url 'chrono-manager-resource-day-view' pk=resource.pk year=day.date|date:"Y" month=day.date|date:"m" day=day.date|date:"d" %}">{{ day.date|date:"l j" }}{% if kind == 'week' %}<br />{{ day.date|date:"F" }}{% endif %}</a>{% endif %}</th>
diff --git a/tests/manager/test_all.py b/tests/manager/test_all.py
index 9ffe4873..bb2550ff 100644
--- a/tests/manager/test_all.py
+++ b/tests/manager/test_all.py
@@ -1280,6 +1280,7 @@ def test_agenda_events_week_view(app, admin_user):
     login(app)
     resp = app.get('/manage/agendas/%s/week/%s/%s/%s/' % (agenda.pk, today.year, today.month, today.day))
     assert '28 September − 04 October 2020' in resp.text
+    assert 'Events - Week 40' in resp.text
     assert '>Month<' in resp.text
     assert '>Week<' in resp.text
     assert '>Day<' in resp.text
@@ -2018,6 +2019,7 @@ def test_agenda_week_view(app, admin_user, manager_user, api_user):
     assert 'No opening hours this week.' not in resp.text
     assert '<div class="booking' not in resp.text
     assert resp.text.count('<tr') == 9
+    assert 'Week45' in resp.text
 
     # check opening hours cells
     assert '<div class="opening-hours" style="height:800.0%;top:0.0%;width:97.0%;left:1.0%' in resp.text
diff --git a/tests/manager/test_resource.py b/tests/manager/test_resource.py
index 5f3ddae6..e4e9c415 100644
--- a/tests/manager/test_resource.py
+++ b/tests/manager/test_resource.py
@@ -255,6 +255,7 @@ def test_resource_week_view(app, admin_user):
     resp = app.get('/manage/resource/%s/week/%s/%s/%s/' % (resource.pk, today.year, today.month, today.day))
     assert '<div class="booking' not in resp.text
     assert resp.text.count('<tr') == 9
+    assert 'Week45' in resp.text
 
     # book some slots
     for hour, minute in [(10, 30), (14, 0)]: