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

Show dynamic message when letter fails validation in validation checker - part 2

Browse Source
This commit is contained in:
Pea Tyczynska
2019-10-25 16:53:31 +01:00
parent 5e10ed23a1
commit f12dc823cb
5 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/main/views/platform_admin.py
View File

@@ -399,7 +399,7 @@ def service_letter_validation_preview(service_id):
def letter_validation_preview(from_platform_admin):
message, pages, result = None, [], None
message, pages, passed_validation, error_code = None, [], None, None
form = PDFUploadForm()
view_location = 'views/platform-admin/letter-validation-preview.html' \
@@ -412,7 +412,8 @@ def letter_validation_preview(from_platform_admin):
if not virus_free:
return render_template(
view_location,
form=form, message="Document did not pass the virus scan", pages=pages, result=result
form=form, message="Document did not pass the virus scan",
pages=pages, passed_validation=passed_validation
), 400
try:
@@ -421,7 +422,7 @@ def letter_validation_preview(from_platform_admin):
view_location,
form=form,
message="File must be less than 2MB",
pages=pages, result=result
pages=pages, passed_validation=passed_validation
), 400
pdf_file.seek(0)
response = validate_letter(pdf_file)
@@ -436,6 +437,7 @@ def letter_validation_preview(from_platform_admin):
passed_validation = False
if not passed_validation:
error_code = message
message = get_letter_validation_error(
message, invalid_pages=invalid_pages, page_count=page_count
)
@@ -444,14 +446,14 @@ def letter_validation_preview(from_platform_admin):
message = "Something was wrong with the file you tried to upload. Please upload a valid PDF file."
return render_template(
view_location,
form=form, message=message, pages=pages, result=result
form=form, message=message, pages=pages, passed_validation=passed_validation
), 400
else:
raise error
return render_template(
view_location,
form=form, message=message, pages=pages, result=result
form=form, message=message, pages=pages, passed_validation=passed_validation, error_code=error_code
)