diff --git a/cove_360/templates/cove_360/explore.html b/cove_360/templates/cove_360/explore.html
index 2c2f406d9..5e5f73391 100644
--- a/cove_360/templates/cove_360/explore.html
+++ b/cove_360/templates/cove_360/explore.html
@@ -154,7 +154,7 @@
{% trans "There are some validation errors in your data, please check them in the table(s) below." %}
- {% with validation_errors=validation_errors_grouped.required %}
+ {% with validation_errors=validation_errors_grouped.required error_prefix='required-' %}
{% if validation_errors %}
@@ -165,9 +165,14 @@
Missing Fields
{% include "validation_table.html" %}
+ {% for error_json, values in validation_errors %}
+ {% with error=error_json|json_decode %}
+ {% cove_modal_errors className="validation-errors-"|concat:error_prefix|concat:forloop.counter modalTitle=error.message errorList=values file_type=file_type full_table=True %}
+ {% endwith %}
+ {% endfor %}
{% endif %}
{% endwith %}
- {% with validation_errors=validation_errors_grouped.format %}
+ {% with validation_errors=validation_errors_grouped.format error_prefix='format-' %}
{% if validation_errors %}
@@ -178,9 +183,14 @@
Incorrect Formats
{% include "validation_table.html" %}
+ {% for error_json, values in validation_errors %}
+ {% with error=error_json|json_decode %}
+ {% cove_modal_errors className="validation-errors-"|concat:error_prefix|concat:forloop.counter modalTitle=error.message errorList=values file_type=file_type full_table=True %}
+ {% endwith %}
+ {% endfor %}
{% endif %}
{% endwith %}
- {% with validation_errors=validation_errors_grouped.other %}
+ {% with validation_errors=validation_errors_grouped.other error_prefix='other-' %}
{% if validation_errors %}
@@ -191,17 +201,17 @@
Other
{% include "validation_table.html" %}
+ {% for error_json, values in validation_errors %}
+ {% with error=error_json|json_decode %}
+ {% cove_modal_errors className="validation-errors-"|concat:error_prefix|concat:forloop.counter modalTitle=error.message errorList=values file_type=file_type full_table=True %}
+ {% endwith %}
+ {% endfor %}
{% endif %}
{% endwith %}
{% endif %}
- {% for error_json, values in validation_errors %}
- {% with error=error_json|json_decode %}
- {% cove_modal_errors className="validation-errors-"|concat:forloop.counter modalTitle=error.message errorList=values file_type=file_type full_table=True %}
- {% endwith %}
- {% endfor %}
{% endblock validation %}
{% block quality_accuracy %}
diff --git a/cove_360/tests_functional.py b/cove_360/tests_functional.py
index cbdd30de6..92697e366 100644
--- a/cove_360/tests_functional.py
+++ b/cove_360/tests_functional.py
@@ -43,7 +43,7 @@ def server_url(request, live_server):
'individual awards ranging from £152,505 (lowest) to £178,990 (highest)',
'Convert to Spreadsheet',
'Invalid against Schema 15 Errors',
- 'There are some validation errors in your data, please check them in the table below',
+ 'There are some validation errors in your data, please check them in the table(s) below',
'Non-unique ID Values',
'Grant identifiers: 2',
'Funder organisation identifiers: 1',