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

Merge pull request #1374 from alphagov/split-the-check

Browse Source 
Split the ‘check’ template into three separate templates, add error tracking
This commit is contained in:
Chris Hill-Scott
2017-07-20 14:02:12 +01:00
committed by GitHub
parent 34db44a96a 82233340b6
commit 35e39eb45b
8 changed files with 324 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/main/views/send.py
View File

@@ -447,10 +447,24 @@ def _check_messages(service_id, template_type, upload_id, letters_as_pdf=False):
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
def check_messages(service_id, template_type, upload_id):
return render_template(
'views/check.html',
**_check_messages(service_id, template_type, upload_id)
)
data = _check_messages(service_id, template_type, upload_id)
if (
data['recipients'].too_many_rows or
not data['count_of_recipients'] or
not data['recipients'].has_recipient_columns or
data['recipients'].missing_column_headers
):
return render_template('views/check/column-errors.html', **data)
if data['row_errors']:
return render_template('views/check/row-errors.html', **data)
if data['errors']:
return render_template('views/check/column-errors.html', **data)
return render_template('views/check/ok.html', **data)
@main.route("/services/<service_id>/<template_type>/check/<upload_id>.<filetype>", methods=['GET'])