darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-06 16:18:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Put day of week on

Browse Source 
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.
This commit is contained in:
Chris Hill-Scott
2020-02-17 12:58:05 +00:00
parent a4fb1b6c06
commit 78ac345148
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/__init__.py
View File

@@ -334,6 +334,10 @@ def format_date_human(date):
return get_human_day(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): def _format_datetime_short(datetime):
return datetime.strftime('%d %B').lstrip('0') return datetime.strftime('%d %B').lstrip('0')
@@ -743,6 +747,7 @@ def add_template_filters(application):
format_date_normal, format_date_normal,
format_date_short, format_date_short,
format_datetime_relative, format_datetime_relative,
format_day_of_week,
format_delta, format_delta,
format_notification_status, format_notification_status,
format_notification_type, format_notification_type,

2
app/templates/views/notifications/notification.html
View File

@@ -67,7 +67,7 @@
{{ letter_print_day }} {{ letter_print_day }}
</p> </p>
<p> <p>
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 }}
</p> </p>
{% endif %} {% endif %}
{% endif %} {% endif %}

6
tests/app/main/views/test_notifications.py
View File

@@ -202,7 +202,7 @@ def test_notification_page_shows_page_for_letter_notification(
'Printing starts today at 5:30pm' 'Printing starts today at 5:30pm'
) )
assert normalize_spaces(page.select('main p:nth-of-type(3)')[0].text) == ( 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 len(page.select('.letter-postage')) == 1
assert normalize_spaces(page.select_one('.letter-postage').text) == ( 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(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) == ( assert normalize_spaces(page.select_one('.letter-postage').text) == (
'Postage: first class' 'Postage: first class'
) )