From 78ac345148a11ac93a242f5ef2a516f25b79e7f2 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Mon, 17 Feb 2020 12:58:05 +0000 Subject: [PATCH] Put day of week on This helps people understand how delivery dates fit into the week, because if sending a letter spans the weekend it will take a bit longer. We can remove `|string` now because `utc_string_to_aware_gmt_datetime` now accepts datetimes. --- app/__init__.py | 5 +++++ app/templates/views/notifications/notification.html | 2 +- tests/app/main/views/test_notifications.py | 6 ++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 4daf81b80..0242fea30 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -334,6 +334,10 @@ def format_date_human(date): return get_human_day(date) +def format_day_of_week(date): + return utc_string_to_aware_gmt_datetime(date).strftime('%A') + + def _format_datetime_short(datetime): return datetime.strftime('%d %B').lstrip('0') @@ -743,6 +747,7 @@ def add_template_filters(application): format_date_normal, format_date_short, format_datetime_relative, + format_day_of_week, format_delta, format_notification_status, format_notification_type, diff --git a/app/templates/views/notifications/notification.html b/app/templates/views/notifications/notification.html index f422414ea..f2004a6ec 100644 --- a/app/templates/views/notifications/notification.html +++ b/app/templates/views/notifications/notification.html @@ -67,7 +67,7 @@ {{ letter_print_day }}

- Estimated delivery date: {{ estimated_letter_delivery_date|string|format_date_short }} + Estimated delivery date: {{ estimated_letter_delivery_date|format_day_of_week }} {{ estimated_letter_delivery_date|format_date_short }}

{% endif %} {% endif %} diff --git a/tests/app/main/views/test_notifications.py b/tests/app/main/views/test_notifications.py index 012ccaa1a..426aeade2 100644 --- a/tests/app/main/views/test_notifications.py +++ b/tests/app/main/views/test_notifications.py @@ -202,7 +202,7 @@ def test_notification_page_shows_page_for_letter_notification( 'Printing starts today at 5:30pm' ) assert normalize_spaces(page.select('main p:nth-of-type(3)')[0].text) == ( - 'Estimated delivery date: 6 January' + 'Estimated delivery date: Wednesday 6 January' ) assert len(page.select('.letter-postage')) == 1 assert normalize_spaces(page.select_one('.letter-postage').text) == ( @@ -473,7 +473,9 @@ def test_notification_page_shows_page_for_first_class_letter_notification( ) assert normalize_spaces(page.select('main p:nth-of-type(2)')[0].text) == 'Printing starts tomorrow at 5:30pm' - assert normalize_spaces(page.select('main p:nth-of-type(3)')[0].text) == 'Estimated delivery date: 5 January' + assert normalize_spaces(page.select('main p:nth-of-type(3)')[0].text) == ( + 'Estimated delivery date: Tuesday 5 January' + ) assert normalize_spaces(page.select_one('.letter-postage').text) == ( 'Postage: first class' )