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

Remove POST where not needed.

Browse Source 
Use  plural method to display letter or letters
Remove unused params from list_table method.
This commit is contained in:
Rebecca Law
2019-12-27 17:27:55 +00:00
parent a4fed667e4
commit 401828d1e0
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/views/returned_letters.py
View File

@@ -7,7 +7,7 @@ from app.main import main
from app.utils import Spreadsheet, user_has_permissions from app.utils import Spreadsheet, user_has_permissions
@main.route("/services/<uuid:service_id>/returned-letter-summary", methods=["GET", "POST"]) @main.route("/services/<uuid:service_id>/returned-letter-summary", methods=["GET"])
@user_has_permissions('view_activity') @user_has_permissions('view_activity')
def returned_letter_summary(service_id): def returned_letter_summary(service_id):
summary = service_api_client.get_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/<uuid:service_id>/returned-letters-csv/<reported_at>", methods=["GET", "POST"]) @main.route("/services/<uuid:service_id>/returned-letters-csv/<reported_at>", methods=["GET"])
@user_has_permissions('view_activity') @user_has_permissions('view_activity')
def returned_letters_report(service_id, reported_at): def returned_letters_report(service_id, reported_at):
returned_letters = service_api_client.get_returned_letters(service_id, reported_at) returned_letters = service_api_client.get_returned_letters(service_id, reported_at)

15
app/templates/views/returned-letter-summary.html
View File

@@ -1,4 +1,5 @@
{% from "components/table.html" import list_table, field %} {% from "components/table.html" import list_table, field %}
{% from "components/message-count-label.html" import message_count_label %}
{% extends "withnav_template.html" %} {% extends "withnav_template.html" %}
{% block service_page_title %} {% block service_page_title %}
@@ -12,19 +13,13 @@
<div class="body-copy-table" id='pill-selected-item'> <div class="body-copy-table" id='pill-selected-item'>
{% call(item, row_number) list_table( {% call(item, row_number) list_table(
data, data,
caption="Report", caption="Returned letters report",
caption_visible=False, caption_visible=False,
empty_message='If you have returned letter reports they will be listed here', empty_message='If you have returned letter reports they will be listed here'
field_headings=[
'Report date',
'number of letters'
],
field_headings_visible=False
) %} ) %}
{% call field() %} {% call field() %}
<a href="{{url_for('.returned_letters_report', service_id=current_service.id, reported_at=item.reported_at)}}"> <a target="_blank"
Returned letters reported on {{ item.reported_at | format_date}} ({{ item.returned_letter_count}} letters) href="{{url_for('.returned_letters_report', service_id=current_service.id, reported_at=item.reported_at)}}">Returned letters reported on {{ item.reported_at | format_date}} - {{ item.returned_letter_count}} {{ message_count_label(item.returned_letter_count, 'letter', suffix='')}}</a>
</a>
{% endcall %} {% endcall %}
{% endcall %} {% endcall %}
</div> </div>

2
tests/app/main/views/test_returned_letters.py
View File

@@ -13,7 +13,7 @@ def test_returned_letter_summary(
mock.assert_called_once_with(SERVICE_ONE_ID) 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 page.h1.string.strip() == 'Returned letters'
assert normalize_spaces(page.select('.table-field-left-aligned')[0].text) == expected_text assert normalize_spaces(page.select('.table-field-left-aligned')[0].text) == expected_text