diff --git a/cove/cove_360/fixtures/additional_fields.json b/cove/cove_360/fixtures/additional_fields.json new file mode 100644 index 0000000..c4dbb9f --- /dev/null +++ b/cove/cove_360/fixtures/additional_fields.json @@ -0,0 +1,27 @@ +{ + "grants": [ + { + "id": "360G-sampletrust-105177/Z/14/Z", + "awardDate": "2024-12-30", + "amountAwarded": 10, + "url": "http://example.com", + "title": "test", + "currency": "GBP", + "description": "test", + "AdditionalField": "2", + "CheckMicOne": "two", + "recipientOrganization": [ + { + "id": "GB-323242-test", + "name": "Example Project Limited" + } + ], + "fundingOrganization": [ + { + "id": "GB-323242-test", + "name": "Example Project Limited" + } + ] + } + ] +} diff --git a/cove/cove_360/fixtures/duration_usefulness.json b/cove/cove_360/fixtures/duration_usefulness.json index 87507d1..9543e8f 100644 --- a/cove/cove_360/fixtures/duration_usefulness.json +++ b/cove/cove_360/fixtures/duration_usefulness.json @@ -14,7 +14,6 @@ "name": "Example Project Limited" } ], - "plannedDates": [], "fundingOrganization": [ { "id": "GB-323242-test", diff --git a/cove/cove_360/templates/cove_360/components/explore/accuracy.html b/cove/cove_360/templates/cove_360/components/explore/accuracy.html index eab70be..1ff3560 100644 --- a/cove/cove_360/templates/cove_360/components/explore/accuracy.html +++ b/cove/cove_360/templates/cove_360/components/explore/accuracy.html @@ -4,6 +4,9 @@
The data provided did not pass validation therefore the accuracy of the data could not be determined. + {% else %} {% if quality_accuracy_checks_passed %}
We could not converting the data for checking. See Data conversion errors for details. +
+We have converted your JSON data into spreadsheet format. See Download and share for more details.
+The file "{{file_name}}" was @@ -36,9 +54,56 @@
Explore your data:
+{% trans "Before checking your data we needed to convert it to JSON" %}{% if conversion_error or conversion_warning_messages %}{% blocktrans %} but we were not able to do this successfully{% endblocktrans %}{% endif %}.
+ {% blocktrans %}This tool converts data into JSON because the 360Giving Data Standard uses a JSON Schema to describe the standard in a technical way.{% endblocktrans %}{% blocktrans %}The JSON data could not be converted to spreadsheet due to the following error: {{conversion_error}}{% endblocktrans %}
+ {% include 'error_extra.html' %} + {% endif %} + + {% if conversion_warning_messages %} +{% trans "Conversion errors:" %}
+{% trans "Please resolve this error, as well as any others found, and test the data again." %} Load new file.
+ {% endif %} +{% endif %} {# / if conversion errors #} + + + {% if metadata %} -{% trans "Use this section to get an overview of the data and check if this was what you were expecting to see." %}
{% blocktrans %}Do these results look correct?{% endblocktrans %}
+{% blocktrans %}If any of this information appears incorrect, the feedback below will help you to investigate what happened. {% endblocktrans %}
-{% blocktrans %}The feedback is split into several sections. Use the small arrow icon on the far right side to display or hide the details for each section.{% endblocktrans %}
-A maximum of 10 additional checks can be displayed at once.
-The check your data section allows you to review the data itself to help identify any issues.
-If you make changes to the data prompted by this feedback, return here to upload the updated file for a new check. It may take several iterations to get the data to a state you are happy with and are ready to publish as open data.
- -You can read about common data errors and what causes them in the Common Errors section.
-Visit our Data Quality Dashboard to see the data quality of 360Giving data as a whole and for each individual publisher. If you have already published data, you can view your own publisher page there too. It provides insights into the key features that make the data useful for analysis to help publishers to identify opportunities for their data to be improved.
- +Convert the data from JSON format to spreadsheet.
+ + {% endif %} + - {% if conversion == 'unflatten' %} -{% trans "Before checking your data we needed to convert it to JSON" %}{% if conversion_error or conversion_warning_messages %}{% blocktrans %} but we were not able to do this successfully{% endblocktrans %}{% endif %}.
- {% blocktrans %}This tool converts data into JSON because the 360Giving Data Standard uses a JSON Schema to describe the standard in a technical way.{% endblocktrans %}We have converted your JSON data into spreadsheet format.
- {% if conversion_error %} -{% blocktrans %}The JSON data could not be converted to spreadsheet due to the following error: {{conversion_error}}{% endblocktrans %}
- {% include 'error_extra.html' %} - {% endif %} - {% endif %} - {% if conversion_warning_messages %} -{% trans "Conversion errors:" %}
-{% trans "Please resolve this error, as well as any others found, and test the data again." %}
- {% endif %} -{% endif %} {% cove_360_modal_list className="unique-ids" modalTitle="Unique IDs" itemList=grants_aggregates.unique_ids %} {% cove_360_modal_list className="distinct-funding-org-identifier" modalTitle="Funder Organisation IDs" itemList=grants_aggregates.distinct_funding_org_identifier %} {% cove_360_modal_list className="distinct-recipient-org-identifier" modalTitle="Recipient Organisation IDs" itemList=grants_aggregates.distinct_recipient_org_identifier %} - -{% trans "This application converts data in Excel and CSV format into JSON format, allowing you download the converted version." %}
{% trans "If your file is originally in JSON format select ‘Convert to Spreadsheet’ in the summary section to create an Excel version of the file." %}
- {% if conversion == 'flattenable' %} - - {% endif %} - {% if not conversion_error and conversion != 'flattenable' %}{% trans "We provide the following formats to download:" %}
You can read about common data errors and what causes them in the Common Errors section.
+Visit our Data Quality Dashboard to see the data quality of 360Giving data as a whole and for each individual publisher. If you have already published data, you can view your own publisher page there too. It provides insights into the key features that make the data useful for analysis to help publishers to identify opportunities for their data to be improved.
+ diff --git a/cove/cove_360/templates/cove_360/components/explore/usefulness.html b/cove/cove_360/templates/cove_360/components/explore/usefulness.html index b586102..91a3fc5 100644 --- a/cove/cove_360/templates/cove_360/components/explore/usefulness.html +++ b/cove/cove_360/templates/cove_360/components/explore/usefulness.html @@ -4,6 +4,10 @@The data provided did not pass validation therefore the usefulness of the data could not be determined. + {% else %} + {% if usefulness_checks_passed %}
checkCongratulations, {{usefulness_checks_passed|length}} of our usefulness checks passed.
@@ -99,3 +103,4 @@No usefulness opportunities detected.
{% endif %} +{% endif %} {# validation failed #} \ No newline at end of file diff --git a/cove/cove_360/templates/cove_360/components/explore_checking.html b/cove/cove_360/templates/cove_360/components/explore_checking.html index 0f1e9dc..248c85d 100644 --- a/cove/cove_360/templates/cove_360/components/explore_checking.html +++ b/cove/cove_360/templates/cove_360/components/explore_checking.html @@ -40,7 +40,13 @@Potential accuracy issue
Usefulness opportunities