diff --git a/app/main/views/returned_letters.py b/app/main/views/returned_letters.py index e720eee0c..39937e3d2 100644 --- a/app/main/views/returned_letters.py +++ b/app/main/views/returned_letters.py @@ -7,7 +7,7 @@ from app.main import main from app.utils import Spreadsheet, user_has_permissions -@main.route("/services//returned-letter-summary", methods=["GET", "POST"]) +@main.route("/services//returned-letter-summary", methods=["GET"]) @user_has_permissions('view_activity') def returned_letter_summary(service_id): summary = service_api_client.get_returned_letter_summary(service_id) @@ -17,7 +17,7 @@ def returned_letter_summary(service_id): ) -@main.route("/services//returned-letters-csv/", methods=["GET", "POST"]) +@main.route("/services//returned-letters-csv/", methods=["GET"]) @user_has_permissions('view_activity') def returned_letters_report(service_id, reported_at): returned_letters = service_api_client.get_returned_letters(service_id, reported_at) diff --git a/app/templates/views/returned-letter-summary.html b/app/templates/views/returned-letter-summary.html index 04dcc117b..ec57325de 100644 --- a/app/templates/views/returned-letter-summary.html +++ b/app/templates/views/returned-letter-summary.html @@ -1,4 +1,5 @@ {% from "components/table.html" import list_table, field %} +{% from "components/message-count-label.html" import message_count_label %} {% extends "withnav_template.html" %} {% block service_page_title %} @@ -12,19 +13,13 @@
{% call(item, row_number) list_table( data, - caption="Report", + caption="Returned letters report", caption_visible=False, - empty_message='If you have returned letter reports they will be listed here', - field_headings=[ - 'Report date', - 'number of letters' - ], - field_headings_visible=False + empty_message='If you have returned letter reports they will be listed here' ) %} {% call field() %} - - Returned letters reported on {{ item.reported_at | format_date}} ({{ item.returned_letter_count}} letters) - + Returned letters reported on {{ item.reported_at | format_date}} - {{ item.returned_letter_count}} {{ message_count_label(item.returned_letter_count, 'letter', suffix='')}} {% endcall %} {% endcall %}
diff --git a/tests/app/main/views/test_returned_letters.py b/tests/app/main/views/test_returned_letters.py index 191b7a3d7..ae7bf3b99 100644 --- a/tests/app/main/views/test_returned_letters.py +++ b/tests/app/main/views/test_returned_letters.py @@ -13,7 +13,7 @@ def test_returned_letter_summary( mock.assert_called_once_with(SERVICE_ONE_ID) - expected_text = "Returned letters reported on Tuesday 24 December 2019 (30 letters)" + expected_text = "Returned letters reported on Tuesday 24 December 2019 - 30 letters" assert page.h1.string.strip() == 'Returned letters' assert normalize_spaces(page.select('.table-field-left-aligned')[0].text) == expected_text