From 953118188d72f23499900189142b27992097031d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laur=C3=A9line=20Gu=C3=A9rin?= <zebuline@entrouvert.com>
Date: Thu, 15 Dec 2022 11:38:15 +0100
Subject: [PATCH] manager: add a "Today" button (#72326)

---
 .../chrono/manager_agenda_open_events.html        |  2 +-
 .../manager_agenda_view_buttons_fragment.html     | 15 +++++++++++++++
 .../chrono/manager_events_agenda_day_view.html    |  8 +-------
 .../chrono/manager_events_agenda_month_view.html  |  8 +-------
 .../chrono/manager_events_agenda_week_view.html   |  8 +-------
 .../chrono/manager_meetings_agenda_day_view.html  |  6 +-----
 .../manager_meetings_agenda_month_view.html       |  6 +-----
 .../chrono/manager_meetings_agenda_week_view.html |  6 +-----
 .../chrono/manager_resource_day_view.html         |  6 +-----
 .../templates/chrono/manager_resource_detail.html |  7 +------
 .../chrono/manager_resource_month_view.html       |  6 +-----
 .../manager_resource_view_buttons_fragment.html   | 12 ++++++++++++
 .../chrono/manager_resource_week_view.html        |  6 +-----
 tests/manager/test_all.py                         |  4 +++-
 14 files changed, 41 insertions(+), 59 deletions(-)
 create mode 100644 chrono/manager/templates/chrono/manager_agenda_view_buttons_fragment.html
 create mode 100644 chrono/manager/templates/chrono/manager_resource_view_buttons_fragment.html

diff --git a/chrono/manager/templates/chrono/manager_agenda_open_events.html b/chrono/manager/templates/chrono/manager_agenda_open_events.html
index 0e81cd09..f6ce37d4 100644
--- a/chrono/manager/templates/chrono/manager_agenda_open_events.html
+++ b/chrono/manager/templates/chrono/manager_agenda_open_events.html
@@ -16,7 +16,7 @@
     </ul>
   {% endif %}
   {{ block.super }}
-  <a href="{% url 'chrono-manager-agenda-month-redirect-view' pk=agenda.pk %}">{% trans 'Month view' %}</a>
+  {% include "chrono/manager_agenda_view_buttons_fragment.html" with no_today=True no_opened=True %}
 {% endblock %}
 
 {% block content %}
diff --git a/chrono/manager/templates/chrono/manager_agenda_view_buttons_fragment.html b/chrono/manager/templates/chrono/manager_agenda_view_buttons_fragment.html
new file mode 100644
index 00000000..a94e4283
--- /dev/null
+++ b/chrono/manager/templates/chrono/manager_agenda_view_buttons_fragment.html
@@ -0,0 +1,15 @@
+{% load i18n %}
+{% now "Y" as today_year %}
+{% now "m" as today_month %}
+{% now "j" as today_day %}
+{% if not no_opened and agenda.kind == 'events' %}
+  <a href="{% url 'chrono-manager-agenda-open-events-view' pk=agenda.pk %}">{% trans 'Open events' %}</a>
+{% endif %}
+{% if not no_today %}
+  <a href="{% url 'chrono-manager-agenda-day-view' pk=agenda.pk year=today_year month=today_month day=today_day %}">{% trans 'Today' %}</a>
+{% endif %}
+<span class="buttons-group">
+  <a {% if active == 'day' %}class="active"{% endif%} href="{% url 'chrono-manager-agenda-day-view' pk=agenda.pk year=view.date|date:"Y"|default:today_year|default:today_year month=view.date|date:"m"|default:today_month day=view.date|date:"d"|default:today_day %}">{% trans 'Day' %}</a>
+  <a {% if active == 'week' %}class="active"{% endif%} href="{% url 'chrono-manager-agenda-week-view' pk=agenda.pk year=view.date|date:"Y"|default:today_year|default:today_year month=view.date|date:"m"|default:today_month day=view.date|date:"d"|default:today_day %}">{% trans 'Week' %}</a>
+  <a {% if active == 'month' %}class="active"{% endif%} href="{% url 'chrono-manager-agenda-month-view' pk=agenda.pk year=view.date|date:"Y"|default:today_year|default:today_year month=view.date|date:"m"|default:today_month day=view.date|date:"d"|default:today_day %}">{% trans 'Month' %}</a>
+</span>
diff --git a/chrono/manager/templates/chrono/manager_events_agenda_day_view.html b/chrono/manager/templates/chrono/manager_events_agenda_day_view.html
index e4c4d5f0..f27698a0 100644
--- a/chrono/manager/templates/chrono/manager_events_agenda_day_view.html
+++ b/chrono/manager/templates/chrono/manager_events_agenda_day_view.html
@@ -10,13 +10,7 @@
     {% endif %}
   </ul>
   {{ block.super }}
-  <a href="{% url 'chrono-manager-agenda-open-events-view' pk=agenda.pk %}">{% trans 'Open events' %}</a>
-
-  <span class="buttons-group">
-    <a class="active" href="{% url 'chrono-manager-agenda-day-view' pk=agenda.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Day' %}</a>
-    <a href="{% url 'chrono-manager-agenda-week-view' pk=agenda.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Week' %}</a>
-    <a href="{% url 'chrono-manager-agenda-month-view' pk=agenda.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Month' %}</a>
-  </span>
+  {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='day' %}
 {% endblock %}
 
 {% block content %}
diff --git a/chrono/manager/templates/chrono/manager_events_agenda_month_view.html b/chrono/manager/templates/chrono/manager_events_agenda_month_view.html
index e29757a0..1b2888dc 100644
--- a/chrono/manager/templates/chrono/manager_events_agenda_month_view.html
+++ b/chrono/manager/templates/chrono/manager_events_agenda_month_view.html
@@ -10,13 +10,7 @@
     {% endif %}
   </ul>
   {{ block.super }}
-  <a href="{% url 'chrono-manager-agenda-open-events-view' pk=agenda.pk %}">{% trans 'Open events' %}</a>
-
-  <span class="buttons-group">
-    <a href="{% url 'chrono-manager-agenda-day-view' pk=agenda.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Day' %}</a>
-    <a href="{% url 'chrono-manager-agenda-week-view' pk=agenda.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Week' %}</a>
-    <a class="active" href="{% url 'chrono-manager-agenda-month-view' pk=agenda.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Month' %}</a>
-  </span>
+  {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='month' %}
 {% endblock %}
 
 {% block content %}
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 bcdb8e44..f9a6fcd2 100644
--- a/chrono/manager/templates/chrono/manager_events_agenda_week_view.html
+++ b/chrono/manager/templates/chrono/manager_events_agenda_week_view.html
@@ -10,13 +10,7 @@
     {% endif %}
   </ul>
   {{ block.super }}
-  <a href="{% url 'chrono-manager-agenda-open-events-view' pk=agenda.pk %}">{% trans 'Open events' %}</a>
-
-  <span class="buttons-group">
-    <a href="{% url 'chrono-manager-agenda-day-view' pk=agenda.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Day' %}</a>
-    <a class="active" href="{% url 'chrono-manager-agenda-week-view' pk=agenda.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Week' %}</a>
-    <a href="{% url 'chrono-manager-agenda-month-view' pk=agenda.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Month' %}</a>
-  </span>
+  {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='week' %}
 {% endblock %}
 
 {% block content %}
diff --git a/chrono/manager/templates/chrono/manager_meetings_agenda_day_view.html b/chrono/manager/templates/chrono/manager_meetings_agenda_day_view.html
index 2a8352fa..bd49bdf4 100644
--- a/chrono/manager/templates/chrono/manager_meetings_agenda_day_view.html
+++ b/chrono/manager/templates/chrono/manager_meetings_agenda_day_view.html
@@ -3,11 +3,7 @@
 
 {% block actions %}
   {{ block.super }}
-  <span class="buttons-group">
-    <a class="active" href="{% url 'chrono-manager-agenda-day-view' pk=agenda.id year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Day' %}</a>
-    <a href="{% url 'chrono-manager-agenda-week-view' pk=agenda.id year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Week' %}</a>
-    <a href="{% url 'chrono-manager-agenda-month-view' pk=agenda.id year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Month' %}</a>
-  </span>
+  {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='day' %}
 {% endblock %}
 
 {% block content %}
diff --git a/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html b/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html
index 02fe611f..b977c14d 100644
--- a/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html
+++ b/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html
@@ -3,11 +3,7 @@
 
 {% block actions %}
   {{ block.super }}
-  <span class="buttons-group">
-    <a href="{% url 'chrono-manager-agenda-day-view' pk=agenda.id year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Day' %}</a>
-    <a href="{% url 'chrono-manager-agenda-week-view' pk=agenda.id year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Week' %}</a>
-    <a class="active" href="{% url 'chrono-manager-agenda-month-view' pk=agenda.id year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Month' %}</a>
-  </span>
+  {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='month' %}
 {% endblock %}
 
 {% block content %}
diff --git a/chrono/manager/templates/chrono/manager_meetings_agenda_week_view.html b/chrono/manager/templates/chrono/manager_meetings_agenda_week_view.html
index f48ce9a3..d1f34fd0 100644
--- a/chrono/manager/templates/chrono/manager_meetings_agenda_week_view.html
+++ b/chrono/manager/templates/chrono/manager_meetings_agenda_week_view.html
@@ -3,11 +3,7 @@
 
 {% block actions %}
   {{ block.super }}
-  <span class="buttons-group">
-    <a href="{% url 'chrono-manager-agenda-day-view' pk=agenda.id year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Day' %}</a>
-    <a class="active" href="{% url 'chrono-manager-agenda-week-view' pk=agenda.id year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Week' %}</a>
-    <a href="{% url 'chrono-manager-agenda-month-view' pk=agenda.id year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Month' %}</a>
-  </span>
+  {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='week' %}
 {% endblock %}
 
 {% block content %}
diff --git a/chrono/manager/templates/chrono/manager_resource_day_view.html b/chrono/manager/templates/chrono/manager_resource_day_view.html
index ea73cf3c..0c904421 100644
--- a/chrono/manager/templates/chrono/manager_resource_day_view.html
+++ b/chrono/manager/templates/chrono/manager_resource_day_view.html
@@ -25,11 +25,7 @@
   </h2>
 {% endblock %}
 {% block appbar-extras %}
-  <span class="buttons-group">
-    <a class="active" href="{% url 'chrono-manager-resource-day-view' pk=resource.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Day' %}</a>
-    <a href="{% url 'chrono-manager-resource-week-view' pk=resource.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Week' %}</a>
-    <a href="{% url 'chrono-manager-resource-month-view' pk=resource.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Month' %}</a>
-  </span>
+  {% include "chrono/manager_resource_view_buttons_fragment.html" with active='day' %}
 {% endblock %}
 
 {% block content %}
diff --git a/chrono/manager/templates/chrono/manager_resource_detail.html b/chrono/manager/templates/chrono/manager_resource_detail.html
index dc452d79..6004a293 100644
--- a/chrono/manager/templates/chrono/manager_resource_detail.html
+++ b/chrono/manager/templates/chrono/manager_resource_detail.html
@@ -20,12 +20,7 @@
         <a rel="popup" href="{% url 'chrono-manager-resource-edit' pk=resource.pk %}">{% trans 'Edit' %}</a>
         <a rel="popup" href="{% url 'chrono-manager-resource-delete' pk=resource.pk %}">{% trans 'Delete' %}</a>
       {% endif %}
-      {% now "Y" as today_year %}
-      {% now "m" as today_month %}
-      {% now "j" as today_day %}
-      <a href="{% url 'chrono-manager-resource-month-view' pk=resource.pk year=today_year month=today_month day=today_day %}">{% trans 'Month view' %}</a>
-      <a href="{% url 'chrono-manager-resource-week-view' pk=resource.pk year=today_year month=today_month day=today_day %}">{% trans 'Week view' %}</a>
-      <a href="{% url 'chrono-manager-resource-day-view' pk=resource.pk year=today_year month=today_month day=today_day %}">{% trans 'Day view' %}</a>
+      {% include "chrono/manager_resource_view_buttons_fragment.html" with no_today=True no_opened=True %}
     {% endblock %}
   </span>
 {% endblock %}
diff --git a/chrono/manager/templates/chrono/manager_resource_month_view.html b/chrono/manager/templates/chrono/manager_resource_month_view.html
index aa940239..52095a80 100644
--- a/chrono/manager/templates/chrono/manager_resource_month_view.html
+++ b/chrono/manager/templates/chrono/manager_resource_month_view.html
@@ -26,11 +26,7 @@
   </h2>
 {% endblock %}
 {% block appbar-extras %}
-  <span class="buttons-group">
-    <a href="{% url 'chrono-manager-resource-day-view' pk=resource.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Day' %}</a>
-    <a href="{% url 'chrono-manager-resource-week-view' pk=resource.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Week' %}</a>
-    <a class="active" href="{% url 'chrono-manager-resource-month-view' pk=resource.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Month' %}</a>
-  </span>
+  {% include "chrono/manager_resource_view_buttons_fragment.html" with active='month' %}
 {% endblock %}
 
 {% block content %}
diff --git a/chrono/manager/templates/chrono/manager_resource_view_buttons_fragment.html b/chrono/manager/templates/chrono/manager_resource_view_buttons_fragment.html
new file mode 100644
index 00000000..16b64496
--- /dev/null
+++ b/chrono/manager/templates/chrono/manager_resource_view_buttons_fragment.html
@@ -0,0 +1,12 @@
+{% load i18n %}
+{% now "Y" as today_year %}
+{% now "m" as today_month %}
+{% now "j" as today_day %}
+{% if not no_today %}
+  <a href="{% url 'chrono-manager-resource-day-view' pk=resource.pk year=today_year month=today_month day=today_day %}">{% trans 'Today' %}</a>
+{% endif %}
+<span class="buttons-group">
+  <a {% if active == 'day' %}class="active"{% endif%} href="{% url 'chrono-manager-resource-day-view' pk=resource.pk year=view.date|date:"Y"|default:today_year|default:today_year month=view.date|date:"m"|default:today_month day=view.date|date:"d"|default:today_day %}">{% trans 'Day' %}</a>
+  <a {% if active == 'week' %}class="active"{% endif%} href="{% url 'chrono-manager-resource-week-view' pk=resource.pk year=view.date|date:"Y"|default:today_year|default:today_year month=view.date|date:"m"|default:today_month day=view.date|date:"d"|default:today_day %}">{% trans 'Week' %}</a>
+  <a {% if active == 'month' %}class="active"{% endif%} href="{% url 'chrono-manager-resource-month-view' pk=resource.pk year=view.date|date:"Y"|default:today_year|default:today_year month=view.date|date:"m"|default:today_month day=view.date|date:"d"|default:today_day %}">{% trans 'Month' %}</a>
+</span>
diff --git a/chrono/manager/templates/chrono/manager_resource_week_view.html b/chrono/manager/templates/chrono/manager_resource_week_view.html
index 59453aeb..5b5df434 100644
--- a/chrono/manager/templates/chrono/manager_resource_week_view.html
+++ b/chrono/manager/templates/chrono/manager_resource_week_view.html
@@ -53,11 +53,7 @@
   </h2>
 {% endblock %}
 {% block appbar-extras %}
-  <span class="buttons-group">
-    <a href="{% url 'chrono-manager-resource-day-view' pk=resource.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Day' %}</a>
-    <a class="active" href="{% url 'chrono-manager-resource-week-view' pk=resource.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Week' %}</a>
-    <a href="{% url 'chrono-manager-resource-month-view' pk=resource.pk year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Month' %}</a>
-  </span>
+  {% include "chrono/manager_resource_view_buttons_fragment.html" with active='week' %}
 {% endblock %}
 
 {% block content %}
diff --git a/tests/manager/test_all.py b/tests/manager/test_all.py
index 39033bbf..63d6afa1 100644
--- a/tests/manager/test_all.py
+++ b/tests/manager/test_all.py
@@ -1453,7 +1453,9 @@ def test_agenda_open_events_view(app, admin_user, manager_user):
     assert 'Open events' in resp.text
 
     resp = app.get('/manage/agendas/%s/events/open/' % agenda.pk)
-    assert 'Month view' in resp.text
+    assert '>Month<' in resp.text
+    assert '>Week<' in resp.text
+    assert '>Day<' in resp.text
     assert "This agenda doesn't have any open event configured." in resp.text
 
     # create some events