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

Remove stuff about test jobs on row errors page

Browse Source 
The send yourself a test flow doesn’t reference any kind of
file/rows/table in the front end any more, and doesn’t create a CSV in
the background (except for letters). And it should validate any mistakes
before getting to the check page.

So any user doing a send yourself a test flow should never get to this
template, which means we can remove some redundant code.
This commit is contained in:
Chris Hill-Scott
2017-07-28 09:09:22 +01:00
parent 849b3737be
commit 25e7015537
1 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
app/templates/views/check/row-errors.html
View File

@@ -46,52 +46,44 @@
</div> </div>
<div class="bottom-gutter-3-2"> <div class="bottom-gutter-3-2">
{% if request.args.from_test %} {{ file_upload(form.file, button_text='Re-upload your file') }}
<a href="{{ back_link }}" class="page-footer-back-link">Back</a>
{% else %}
{{file_upload(form.file, button_text='Re-upload your file')}}
{% endif %}
</div> </div>
{% if not request.args.from_test %} <h2 class="heading-medium" id="{{ file_contents_header_id }}">{{ original_file_name }}</h2>
<h2 class="heading-medium" id="{{ file_contents_header_id }}">{{ original_file_name }}</h2> {% call(item, row_number) list_table(
recipients.initial_annotated_rows_with_errors if row_errors and not recipients.missing_column_headers else recipients.initial_annotated_rows,
{% call(item, row_number) list_table( caption=original_file_name,
recipients.initial_annotated_rows_with_errors if row_errors and not recipients.missing_column_headers else recipients.initial_annotated_rows, caption_visible=False,
caption=original_file_name, field_headings=[
caption_visible=False, '<span class="visually-hidden">Row in file</span><span aria-hidden="true" class="table-field-invisible-error">1</span>'|safe
field_headings=[ ] + recipients.column_headers
'<span class="visually-hidden">Row in file</span><span aria-hidden="true" class="table-field-invisible-error">1</span>'|safe ) %}
] + recipients.column_headers {% call index_field() %}
) %} <span class="{% if item.index in recipients.rows_with_errors %}table-field-error{% endif %}">
{% call index_field() %} {{ item.index + 2 }}
<span class="{% if item.index in recipients.rows_with_errors %}table-field-error{% endif %}"> </span>
{{ item.index + 2 }}
</span>
{% endcall %}
{% for column in recipients.column_headers %}
{% if item['columns'][column].error and not recipients.missing_column_headers %}
{% call field() %}
<span>
<span class="table-field-error-label">{{ item['columns'][column].error }}</span>
{{ item['columns'][column].data if item['columns'][column].data != None }}
</span>
{% endcall %}
{% elif item['columns'][column].ignore %}
{{ text_field(item['columns'][column].data or '', status='default') }}
{% else %}
{{ text_field(item['columns'][column].data or '') }}
{% endif %}
{% endfor %}
{% if item['columns'].get(None) %}
{% for column in item['columns'][None].data %}
{{ text_field(column, status='default') }}
{% endfor %}
{% endif %}
{% endcall %} {% endcall %}
{% for column in recipients.column_headers %}
{% endif %} {% if item['columns'][column].error and not recipients.missing_column_headers %}
{% call field() %}
<span>
<span class="table-field-error-label">{{ item['columns'][column].error }}</span>
{{ item['columns'][column].data if item['columns'][column].data != None }}
</span>
{% endcall %}
{% elif item['columns'][column].ignore %}
{{ text_field(item['columns'][column].data or '', status='default') }}
{% else %}
{{ text_field(item['columns'][column].data or '') }}
{% endif %}
{% endfor %}
{% if item['columns'].get(None) %}
{% for column in item['columns'][None].data %}
{{ text_field(column, status='default') }}
{% endfor %}
{% endif %}
{% endcall %}
{% if count_of_displayed_recipients < count_of_recipients %} {% if count_of_displayed_recipients < count_of_recipients %}
<p class="table-show-more-link"> <p class="table-show-more-link">