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

Call precompiled letter preview with overlay

Browse Source
This commit is contained in:
Pea Tyczynska
2019-04-04 12:05:17 +01:00
parent 7436a568dd
commit e0b61e3d70
2 changed files with 29 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:

11
app/notify_client/notification_api_client.py
View File

@@ -94,6 +94,17 @@ class NotificationApiClient(NotifyAdminAPIClient):
return self.get(url=get_url)
def get_notification_letter_preview_with_overlay(self, service_id, notification_id, file_type, page=None):
get_url = '/service/{}/template/preview/{}/{}{}{}'.format(
service_id,
notification_id,
file_type,
'?overlay=1',
'&page={}'.format(page) if page else '',
)
return self.get(url=get_url)
def update_notification_to_cancelled(self, service_id, notification_id):
return self.post(
url='/service/{}/notifications/{}/cancel'.format(service_id, notification_id),