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

Merge pull request #2897 from alphagov/overlay-for-failed-letters

Browse Source 
Precompiled show preview with overlay when validation fails
This commit is contained in:
Pea (Malgorzata Tyczynska)
2019-04-12 16:37:53 +01:00
committed by GitHub
parent 8084dce705 858e98736f
commit 5ac6255be7
3 changed files with 55 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/main/views/notifications.py
View File

@@ -60,7 +60,9 @@ def view_notification(service_id, notification_id):
if notification['template']['is_precompiled_letter']:
try:
file_contents = view_letter_notification_as_preview(service_id, notification_id, "pdf")
file_contents = view_letter_notification_as_preview(
service_id, notification_id, "pdf"
)
page_count = pdf_page_count(io.BytesIO(file_contents))
except PdfReadError:
return render_template(
@@ -72,7 +74,6 @@ def view_notification(service_id, notification_id):
if notification.get('postage'):
notification['template']['postage'] = notification['postage']
template = get_template(
notification['template'],
current_service,
@@ -173,14 +174,22 @@ def view_letter_notification_as_preview(service_id, notification_id, filetype):
if filetype not in ('pdf', 'png'):
abort(404)
notification = notification_api_client.get_notification(service_id, str(notification_id))
try:
preview = notification_api_client.get_notification_letter_preview(
service_id,
notification_id,
filetype,
page=request.args.get('page')
)
if notification['status'] == "validation-failed":
preview = notification_api_client.get_notification_letter_preview_with_overlay(
service_id,
notification_id,
filetype,
page=request.args.get('page')
)
else:
preview = notification_api_client.get_notification_letter_preview(
service_id,
notification_id,
filetype,
page=request.args.get('page')
)
display_file = base64.b64decode(preview['content'])
except APIError: