diff --git a/chrono/manager/templates/chrono/manager_shared_custody_agenda_month_view.html b/chrono/manager/templates/chrono/manager_shared_custody_agenda_month_view.html index da686fb8..314e599b 100644 --- a/chrono/manager/templates/chrono/manager_shared_custody_agenda_month_view.html +++ b/chrono/manager/templates/chrono/manager_shared_custody_agenda_month_view.html @@ -36,4 +36,16 @@

{% trans "Configuration is not completed yet." %}

{% endif %} + +
+ {% if agenda.date_end %} + {% blocktrans trimmed with date_start=agenda.date_start date_end=agenda.date_end %} + This agenda applies from {{ date_start }} to {{ date_end }}. + {% endblocktrans %} + {% else %} + {% blocktrans trimmed with date_start=agenda.date_start %} + This agenda applies from {{ date_start }}. + {% endblocktrans %} + {% endif %} +
{% endblock %} diff --git a/tests/manager/test_shared_custody_agenda.py b/tests/manager/test_shared_custody_agenda.py index 5d831c4d..c96a379b 100644 --- a/tests/manager/test_shared_custody_agenda.py +++ b/tests/manager/test_shared_custody_agenda.py @@ -236,6 +236,8 @@ def test_shared_custody_agenda_month_view_dates(app, admin_user): days = [x.text for x in resp.pyquery('tbody tr th span')] assert len(days) == 7 * 5 + assert 'This agenda applies from Jan. 1, 2022.' in resp.text + # custody for half the month agenda.date_start = datetime.date(2022, 2, 14) agenda.save() @@ -255,6 +257,8 @@ def test_shared_custody_agenda_month_view_dates(app, admin_user): assert resp.text.count('') == 34 assert len([x.text for x in resp.pyquery('tbody tr td.guardian')]) == 1 + assert 'This agenda applies from Feb. 14, 2022 to Feb. 14, 2022.' in resp.text + # month before date_start resp = resp.click('←') assert resp.text.count('') == 42