Update spreadsheet validation errors

This commit is contained in:
karlchillmaid
2019-09-18 16:11:46 +01:00
committed by GitHub
parent 80bc36d3db
commit 592ab58f37

View File

@@ -38,7 +38,7 @@
{% elif not count_of_recipients %} {% elif not count_of_recipients %}
<h1 class='banner-title' data-module="track-error" data-error-type="No rows" data-error-label="{{ upload_id }}"> <h1 class='banner-title' data-module="track-error" data-error-type="No rows" data-error-label="{{ upload_id }}">
Your file is missing some rows Your file is missing rows
</h1> </h1>
{% if recipients.missing_column_headers %} {% if recipients.missing_column_headers %}
<p> <p>
@@ -56,14 +56,17 @@
{% elif not recipients.has_recipient_columns %} {% elif not recipients.has_recipient_columns %}
<h1 class='banner-title' data-module="track-error" data-error-type="Missing recipient columns" data-error-label="{{ upload_id }}"> <h1 class='banner-title' data-module="track-error" data-error-type="Missing recipient columns" data-error-label="{{ upload_id }}">
Your file needs {{ ( Your file is missing columns
</h1>
<p>
It needs {{ (
recipients.missing_column_headers recipients.missing_column_headers
if template.template_type == 'letter' else required_recipient_columns if template.template_type == 'letter' else required_recipient_columns
) | formatted_list( ) | formatted_list(
prefix='a column called', prefix='a column called',
prefix_plural='columns called' prefix_plural='columns called'
) }} ) }}.
</h1> </p>
<p> <p>
Right now it has {{ recipients.column_headers | formatted_list( Right now it has {{ recipients.column_headers | formatted_list(
prefix='one column, called ', prefix='one column, called ',
@@ -74,14 +77,17 @@
{% elif recipients.duplicate_recipient_column_headers %} {% elif recipients.duplicate_recipient_column_headers %}
<h1 class='banner-title' data-module="track-error" data-error-type="Duplicate recipient columns" data-error-label="{{ upload_id }}"> <h1 class='banner-title' data-module="track-error" data-error-type="Duplicate recipient columns" data-error-label="{{ upload_id }}">
Your file has more than one column called {{ ( Your file has duplicate columns
</h1>
<p>
We found more than one column called {{ (
recipients.duplicate_recipient_column_headers recipients.duplicate_recipient_column_headers
) | formatted_list( ) | formatted_list(
conjunction='or', conjunction='or',
prefix='', prefix='',
prefix_plural='' prefix_plural=''
) }} ) }}.
</h1> </p>
<p> <p>
Delete or rename one of these columns and try again. Delete or rename one of these columns and try again.
</p> </p>
@@ -89,9 +95,11 @@
{% elif recipients.missing_column_headers %} {% elif recipients.missing_column_headers %}
<h1 class='banner-title' data-module="track-error" data-error-type="Missing placeholder columns" data-error-label="{{ upload_id }}"> <h1 class='banner-title' data-module="track-error" data-error-type="Missing placeholder columns" data-error-label="{{ upload_id }}">
The columns in your file need to match the double brackets in Your file is missing columns
your template
</h1> </h1>
<p>
The column names need to match the double brackets in your template.
</p>
<p> <p>
Your file is missing {{ recipients.missing_column_headers | formatted_list( Your file is missing {{ recipients.missing_column_headers | formatted_list(
conjunction='and', conjunction='and',
@@ -141,7 +149,7 @@
{{ file_upload( {{ file_upload(
form.file, form.file,
action=url_for('.send_messages', service_id=current_service.id, template_id=template.id), action=url_for('.send_messages', service_id=current_service.id, template_id=template.id),
button_text='Re-upload your file' button_text='Upload a new file'
) }} ) }}
{% endif %} {% endif %}
</div> </div>