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

Merge pull request #3237 from alphagov/returned-pdf-letters

Browse Source 
Handle precompiled letters in returned letters list
This commit is contained in:
Chris Hill-Scott
2020-01-03 10:04:17 +00:00
committed by GitHub
parent 54a5f1d22c 5ea02119f4
commit d11305741f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/views/returned-letters.html
View File

@@ -28,7 +28,7 @@
field_headings_visible=False field_headings_visible=False
) %} ) %}
{% call field() %} {% call field() %}
<span class="file-list-filename file-list-filename-unlinked">{{ item.template_name or item.uploaded_letter_file_name }}</span> <span class="file-list-filename file-list-filename-unlinked">{{ item.template_name or item.uploaded_letter_file_name or 'Provided as PDF' }}</span>
<span class="file-list-hint"> <span class="file-list-hint">
{% if item.client_reference %} {% if item.client_reference %}
Reference {{ item.client_reference }} Reference {{ item.client_reference }}

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

@@ -67,7 +67,7 @@ def test_returned_letters_page(
'template_version': None, 'template_version': None,
'original_file_name': original_file_name, 'original_file_name': original_file_name,
'job_row_number': None, 'job_row_number': None,
'uploaded_letter_file_name': 'test_letter.pdf', 'uploaded_letter_file_name': uploaded_letter_file_name,
} }
for client_reference, template_name, original_file_name, uploaded_letter_file_name in ( for client_reference, template_name, original_file_name, uploaded_letter_file_name in (
('ABC123', 'Example template', None, None), ('ABC123', 'Example template', None, None),
@@ -75,6 +75,7 @@ def test_returned_letters_page(
(None, 'Example template', None, None), (None, 'Example template', None, None),
('DEF456', None, None, 'Example precompiled.pdf'), ('DEF456', None, None, 'Example precompiled.pdf'),
(None, None, None, 'Example one-off.pdf'), (None, None, None, 'Example one-off.pdf'),
('XYZ999', None, None, None),
) )
] ]
mocker.patch('app.service_api_client.get_returned_letters', return_value=data) mocker.patch('app.service_api_client.get_returned_letters', return_value=data)
@@ -90,8 +91,9 @@ def test_returned_letters_page(
'Example template Reference ABC123 Originally sent 24 December 2019', 'Example template Reference ABC123 Originally sent 24 December 2019',
'Example template Sent from Example spreadsheet.xlsx Originally sent 24 December 2019', 'Example template Sent from Example spreadsheet.xlsx Originally sent 24 December 2019',
'Example template No reference provided Originally sent 24 December 2019', 'Example template No reference provided Originally sent 24 December 2019',
'test_letter.pdf Reference DEF456 Originally sent 24 December 2019', 'Example precompiled.pdf Reference DEF456 Originally sent 24 December 2019',
'test_letter.pdf No reference provided Originally sent 24 December 2019', 'Example one-off.pdf No reference provided Originally sent 24 December 2019',
'Provided as PDF Reference XYZ999 Originally sent 24 December 2019',
] == [ ] == [
normalize_spaces(row.text) for row in page.select('tr') normalize_spaces(row.text) for row in page.select('tr')
] ]