Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0 2 schema #38

Merged
10 commits merged into from
Jul 19, 2019
161 changes: 130 additions & 31 deletions cove_bods/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-07-17 16:19+0000\n"
"POT-Creation-Date: 2019-07-19 13:38+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -105,6 +105,87 @@ msgstr ""
msgid "This Person Statement has a birthday that is to late."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:134
msgid ""
"This Entity Statement has an address type that is not allowed in entity "
"statements."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:137
#: cove_bods/templates/cove_bods/additional_checks_table.html:149
msgid "Type"
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:146
msgid ""
"This Person Statement has an address type that is not allowed in person "
"statements."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:158
msgid "This Entity Statement has an alternate address but no other addresses."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:170
msgid "This Person Statement has an alternate address but no other addresses."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:182
msgid ""
"This Ownership-or-control Statement has a component statement that is not in "
"this package."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:185
msgid "Component Statement ID"
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:194
msgid ""
"An Ownership-or-control Statement cannot both be a component statement "
"(isComponent) and have component statements (componentStatementIDs)."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:205
msgid ""
"This Person Statement is a component (isComponent) but no primary Ownership-"
"or-control Statement references it (from componentStatementIDs)"
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:216
msgid ""
"This Entity Statement is a component (isComponent) but no primary Ownership-"
"or-control Statement references it (from componentStatementIDs)"
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:227
msgid ""
"This Ownership-or-control Statement is a component (isComponent) but no "
"primary Ownership-or-control Statement references it (from "
"componentStatementIDs)"
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:238
msgid ""
"This Person Statement is a component (isComponent) and should appear "
"<strong>before</strong> the primary Ownership-or-control Statement that "
"references it (from componentStatementIDs)."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:249
msgid ""
"This Entity Statement is a component (isComponent) and should appear "
"<strong>before</strong> the primary Ownership-or-control Statement that "
"references it (from componentStatementIDs)."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:260
msgid ""
"This Ownership-or-control Statement is a component (isComponent) and should "
"appear <strong>before</strong> the primary Ownership-or-control Statement "
"that references it (from componentStatementIDs)."
msgstr ""

#. Translators: Label of a button that triggers search
#: cove_bods/templates/cove_bods/base.html:44
msgid "Go"
@@ -274,107 +355,125 @@ msgstr ""
msgid "Load New File"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:14
#: cove_bods/templates/cove_bods/explore.html:18
msgid "Schema Version"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:22
msgid "Schema Version Used"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:34
msgid "Download Data"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:32
#: cove_bods/templates/cove_bods/explore.html:52
msgid "The JSON could not be converted to Spreadsheet due to the error:"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:64
#: cove_bods/templates/cove_bods/explore.html:84
msgid "Convert to Spreadsheet"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:94
#: cove_bods/templates/cove_bods/explore.html:105
#: cove_bods/templates/cove_bods/explore.html:114
#: cove_bods/templates/cove_bods/explore.html:125
msgid "Validation Errors"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:109
#: cove_bods/templates/cove_bods/explore.html:129
msgid "There were no validation errors!"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:126
#: cove_bods/templates/cove_bods/explore.html:137
#: cove_bods/templates/cove_bods/explore.html:146
#: cove_bods/templates/cove_bods/explore.html:157
msgid "Additional Fields"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:141
#: cove_bods/templates/cove_bods/explore.html:161
msgid "There were no additional fields!"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:156
#: cove_bods/templates/cove_bods/explore.html:167
#: cove_bods/templates/cove_bods/explore.html:176
#: cove_bods/templates/cove_bods/explore.html:187
msgid "Additional Checks"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:171
#: cove_bods/templates/cove_bods/explore.html:191
msgid "All checks passed!"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:183
#: cove_bods/templates/cove_bods/explore.html:203
msgid "Statistics"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:189
#: cove_bods/templates/cove_bods/explore.html:208
msgid "Entity Statements"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:191
#: cove_bods/templates/cove_bods/explore.html:217
#: cove_bods/templates/cove_bods/explore.html:231
#: cove_bods/templates/cove_bods/explore.html:210
#: cove_bods/templates/cove_bods/explore.html:236
#: cove_bods/templates/cove_bods/explore.html:266
msgid "Total Statements"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:196
#: cove_bods/templates/cove_bods/explore.html:222
#: cove_bods/templates/cove_bods/explore.html:260
#: cove_bods/templates/cove_bods/explore.html:215
#: cove_bods/templates/cove_bods/explore.html:241
#: cove_bods/templates/cove_bods/explore.html:295
#, python-format
msgid " ... with type %(key)s"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:205
#: cove_bods/templates/cove_bods/explore.html:224
#, python-format
msgid "%% of registered or legal entities with any identifier"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:210
#: cove_bods/templates/cove_bods/explore.html:229
#, python-format
msgid ""
"%% of registered or legal entities with an identifier that have a 'strict' "
"identifier"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:215
#: cove_bods/templates/cove_bods/explore.html:234
msgid "Person Statements"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:229
#: cove_bods/templates/cove_bods/explore.html:250
msgid "... where PEP status is declared"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:258
msgid ""
"... where PEP status is declared AND (erroneously) a reason for missing PEP "
"information is given"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:264
msgid "Ownership or Control Statements"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:235
#: cove_bods/templates/cove_bods/explore.html:270
msgid " ... where interested party is a person"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:242
#: cove_bods/templates/cove_bods/explore.html:277
msgid " ... where interested party is a entity"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:249
#: cove_bods/templates/cove_bods/explore.html:284
msgid " ... where interested party is unspecified"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:255
#: cove_bods/templates/cove_bods/explore.html:290
msgid "Total Interest Statements"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:268
#: cove_bods/templates/cove_bods/explore.html:303
msgid "Misc"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:271
#: cove_bods/templates/cove_bods/explore.html:306
msgid ""
"Count of previous statements that are referenced from replacesStatement and "
"are missing"
161 changes: 130 additions & 31 deletions cove_bods/locale/es/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-07-17 16:19+0000\n"
"POT-Creation-Date: 2019-07-19 13:38+0000\n"
"PO-Revision-Date: 2018-11-30 13:12+0000\n"
"Last-Translator: Eduardo Gomez <eduardo.gomez@hotmail.co.uk>, 2019\n"
"Language-Team: Spanish (https://www.transifex.com/OpenDataServices/teams/59127/es/)\n"
@@ -111,6 +111,87 @@ msgstr ""
msgid "This Person Statement has a birthday that is to late."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:134
msgid ""
"This Entity Statement has an address type that is not allowed in entity "
"statements."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:137
#: cove_bods/templates/cove_bods/additional_checks_table.html:149
msgid "Type"
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:146
msgid ""
"This Person Statement has an address type that is not allowed in person "
"statements."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:158
msgid "This Entity Statement has an alternate address but no other addresses."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:170
msgid "This Person Statement has an alternate address but no other addresses."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:182
msgid ""
"This Ownership-or-control Statement has a component statement that is not in"
" this package."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:185
msgid "Component Statement ID"
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:194
msgid ""
"An Ownership-or-control Statement cannot both be a component statement "
"(isComponent) and have component statements (componentStatementIDs)."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:205
msgid ""
"This Person Statement is a component (isComponent) but no primary Ownership-"
"or-control Statement references it (from componentStatementIDs)"
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:216
msgid ""
"This Entity Statement is a component (isComponent) but no primary Ownership-"
"or-control Statement references it (from componentStatementIDs)"
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:227
msgid ""
"This Ownership-or-control Statement is a component (isComponent) but no "
"primary Ownership-or-control Statement references it (from "
"componentStatementIDs)"
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:238
msgid ""
"This Person Statement is a component (isComponent) and should appear "
"<strong>before</strong> the primary Ownership-or-control Statement that "
"references it (from componentStatementIDs)."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:249
msgid ""
"This Entity Statement is a component (isComponent) and should appear "
"<strong>before</strong> the primary Ownership-or-control Statement that "
"references it (from componentStatementIDs)."
msgstr ""

#: cove_bods/templates/cove_bods/additional_checks_table.html:260
msgid ""
"This Ownership-or-control Statement is a component (isComponent) and should "
"appear <strong>before</strong> the primary Ownership-or-control Statement "
"that references it (from componentStatementIDs)."
msgstr ""

#. Translators: Label of a button that triggers search
#: cove_bods/templates/cove_bods/base.html:44
msgid "Go"
@@ -281,107 +362,125 @@ msgstr "Versión en ejecución"
msgid "Load New File"
msgstr "Cargar archivo nuevo"

#: cove_bods/templates/cove_bods/explore.html:14
#: cove_bods/templates/cove_bods/explore.html:18
msgid "Schema Version"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:22
msgid "Schema Version Used"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:34
msgid "Download Data"
msgstr "Descargar datos"

#: cove_bods/templates/cove_bods/explore.html:32
#: cove_bods/templates/cove_bods/explore.html:52
msgid "The JSON could not be converted to Spreadsheet due to the error:"
msgstr "El JSON no se pudo convertir a hoja de cálculo debido al error:"

#: cove_bods/templates/cove_bods/explore.html:64
#: cove_bods/templates/cove_bods/explore.html:84
msgid "Convert to Spreadsheet"
msgstr "Convertir a hoja de cálculo"

#: cove_bods/templates/cove_bods/explore.html:94
#: cove_bods/templates/cove_bods/explore.html:105
#: cove_bods/templates/cove_bods/explore.html:114
#: cove_bods/templates/cove_bods/explore.html:125
msgid "Validation Errors"
msgstr "Errores de validación"

#: cove_bods/templates/cove_bods/explore.html:109
#: cove_bods/templates/cove_bods/explore.html:129
msgid "There were no validation errors!"
msgstr "No hubo errores de validación!"

#: cove_bods/templates/cove_bods/explore.html:126
#: cove_bods/templates/cove_bods/explore.html:137
#: cove_bods/templates/cove_bods/explore.html:146
#: cove_bods/templates/cove_bods/explore.html:157
msgid "Additional Fields"
msgstr "Campos adicionales"

#: cove_bods/templates/cove_bods/explore.html:141
#: cove_bods/templates/cove_bods/explore.html:161
msgid "There were no additional fields!"
msgstr "¡No había campos adicionales!"

#: cove_bods/templates/cove_bods/explore.html:156
#: cove_bods/templates/cove_bods/explore.html:167
#: cove_bods/templates/cove_bods/explore.html:176
#: cove_bods/templates/cove_bods/explore.html:187
msgid "Additional Checks"
msgstr "Comprobaciones adicionales"

#: cove_bods/templates/cove_bods/explore.html:171
#: cove_bods/templates/cove_bods/explore.html:191
msgid "All checks passed!"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:183
#: cove_bods/templates/cove_bods/explore.html:203
msgid "Statistics"
msgstr "Estadísticas "

#: cove_bods/templates/cove_bods/explore.html:189
#: cove_bods/templates/cove_bods/explore.html:208
msgid "Entity Statements"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:191
#: cove_bods/templates/cove_bods/explore.html:217
#: cove_bods/templates/cove_bods/explore.html:231
#: cove_bods/templates/cove_bods/explore.html:210
#: cove_bods/templates/cove_bods/explore.html:236
#: cove_bods/templates/cove_bods/explore.html:266
msgid "Total Statements"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:196
#: cove_bods/templates/cove_bods/explore.html:222
#: cove_bods/templates/cove_bods/explore.html:260
#: cove_bods/templates/cove_bods/explore.html:215
#: cove_bods/templates/cove_bods/explore.html:241
#: cove_bods/templates/cove_bods/explore.html:295
#, python-format
msgid " ... with type %(key)s"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:205
#: cove_bods/templates/cove_bods/explore.html:224
#, python-format
msgid "%% of registered or legal entities with any identifier"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:210
#: cove_bods/templates/cove_bods/explore.html:229
#, python-format
msgid ""
"%% of registered or legal entities with an identifier that have a 'strict' "
"identifier"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:215
#: cove_bods/templates/cove_bods/explore.html:234
msgid "Person Statements"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:229
#: cove_bods/templates/cove_bods/explore.html:250
msgid "... where PEP status is declared"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:258
msgid ""
"... where PEP status is declared AND (erroneously) a reason for missing PEP "
"information is given"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:264
msgid "Ownership or Control Statements"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:235
#: cove_bods/templates/cove_bods/explore.html:270
msgid " ... where interested party is a person"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:242
#: cove_bods/templates/cove_bods/explore.html:277
msgid " ... where interested party is a entity"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:249
#: cove_bods/templates/cove_bods/explore.html:284
msgid " ... where interested party is unspecified"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:255
#: cove_bods/templates/cove_bods/explore.html:290
msgid "Total Interest Statements"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:268
#: cove_bods/templates/cove_bods/explore.html:303
msgid "Misc"
msgstr ""

#: cove_bods/templates/cove_bods/explore.html:271
#: cove_bods/templates/cove_bods/explore.html:306
msgid ""
"Count of previous statements that are referenced from replacesStatement and "
"are missing"
137 changes: 137 additions & 0 deletions cove_bods/templates/cove_bods/additional_checks_table.html
Original file line number Diff line number Diff line change
@@ -128,6 +128,143 @@
{{ additional_check.person_statement }}
</td>
</tr>
{% elif additional_check.type == 'wrong_address_type_used' and additional_check.statement_type == 'entity' %}
<tr>
<td>
{% trans 'This Entity Statement has an address type that is not allowed in entity statements.' %}
</td>
<td>
{% trans 'Type' %}: {{ additional_check.address_type }}
</td>
<td>
{{ additional_check.statement }}
</td>
</tr>
{% elif additional_check.type == 'wrong_address_type_used' and additional_check.statement_type == 'person' %}
<tr>
<td>
{% trans 'This Person Statement has an address type that is not allowed in person statements.' %}
</td>
<td>
{% trans 'Type' %}: {{ additional_check.address_type }}
</td>
<td>
{{ additional_check.statement }}
</td>
</tr>
{% elif additional_check.type == 'alternative_address_with_no_other_address_types' and additional_check.statement_type == 'entity' %}
<tr>
<td>
{% trans 'This Entity Statement has an alternate address but no other addresses.' %}
</td>
<td>

</td>
<td>
{{ additional_check.statement }}
</td>
</tr>
{% elif additional_check.type == 'alternative_address_with_no_other_address_types' and additional_check.statement_type == 'person' %}
<tr>
<td>
{% trans 'This Person Statement has an alternate address but no other addresses.' %}
</td>
<td>

</td>
<td>
{{ additional_check.statement }}
</td>
</tr>
{% elif additional_check.type == 'component_statement_id_not_in_package' %}
<tr>
<td>
{% trans 'This Ownership-or-control Statement has a component statement that is not in this package.' %}
</td>
<td>
{% trans 'Component Statement ID' %}: {{ additional_check.component_statement_id }}
</td>
<td>
{{ additional_check.seen_in_ownership_or_control_statement }}
</td>
</tr>
{% elif additional_check.type == 'ownership_or_control_statement_has_is_compontent_and_component_statement_ids' %}
<tr>
<td>
{% trans 'An Ownership-or-control Statement cannot both be a component statement (isComponent) and have component statements (componentStatementIDs).' %}
</td>
<td>
</td>
<td>
{{ additional_check.statement }}
</td>
</tr>
{% elif additional_check.type == 'statement_is_component_but_not_used_in_component_statement_ids' and additional_check.statement_type == 'person' %}
<tr>
<td>
{% trans 'This Person Statement is a component (isComponent) but no primary Ownership-or-control Statement references it (from componentStatementIDs)' %}
</td>
<td>
</td>
<td>
{{ additional_check.statement }}
</td>
</tr>
{% elif additional_check.type == 'statement_is_component_but_not_used_in_component_statement_ids' and additional_check.statement_type == 'entity' %}
<tr>
<td>
{% trans 'This Entity Statement is a component (isComponent) but no primary Ownership-or-control Statement references it (from componentStatementIDs)' %}
</td>
<td>
</td>
<td>
{{ additional_check.statement }}
</td>
</tr>
{% elif additional_check.type == 'statement_is_component_but_not_used_in_component_statement_ids' and additional_check.statement_type == 'ownership_or_control' %}
<tr>
<td>
{% trans 'This Ownership-or-control Statement is a component (isComponent) but no primary Ownership-or-control Statement references it (from componentStatementIDs)' %}
</td>
<td>
</td>
<td>
{{ additional_check.statement }}
</td>
</tr>
{% elif additional_check.type == 'statement_is_component_but_is_after_use_in_component_statement_id' and additional_check.statement_type == 'person' %}
<tr>
<td>
{% blocktrans %}This Person Statement is a component (isComponent) and should appear <strong>before</strong> the primary Ownership-or-control Statement that references it (from componentStatementIDs).{%endblocktrans%}
</td>
<td>
</td>
<td>
{{ additional_check.statement }}
</td>
</tr>
{% elif additional_check.type == 'statement_is_component_but_is_after_use_in_component_statement_id' and additional_check.statement_type == 'entity' %}
<tr>
<td>
{% blocktrans %}This Entity Statement is a component (isComponent) and should appear <strong>before</strong> the primary Ownership-or-control Statement that references it (from componentStatementIDs).{%endblocktrans%}
</td>
<td>
</td>
<td>
{{ additional_check.statement }}
</td>
</tr>
{% elif additional_check.type == 'statement_is_component_but_is_after_use_in_component_statement_id' and additional_check.statement_type == 'ownership_or_control' %}
<tr>
<td>
{% blocktrans %}This Ownership-or-control Statement is a component (isComponent) and should appear <strong>before</strong> the primary Ownership-or-control Statement that references it (from componentStatementIDs).{%endblocktrans%}
</td>
<td>
</td>
<td>
{{ additional_check.statement }}
</td>
</tr>
{% endif %}
{% endfor %}
</tbody>
37 changes: 36 additions & 1 deletion cove_bods/templates/cove_bods/explore.html
Original file line number Diff line number Diff line change
@@ -6,6 +6,26 @@
{% endblock %}

{% block explore_content %}


{# TEMPORARY Until 0.2 is officially released, we only show this block if the data is 0.2 #}
{% if schema_version_used != '0.1' %}
<div class="row">

<div class="panel panel-success">
<div id="validation-panel" class="panel-heading pointer" role="region" aria-expanded="true" aria-controls="validationTable" data-toggle="collapse" data-target="#validationTable">
<h4 class="panel-title">
<span class="glyphicon glyphicon-collapse-up"></span>{% trans 'Schema Version' %}
</h4>
</div>
<div id="validationTable" class="collapse in panel-body">
<p>{% trans 'Schema Version Used' %}: {{ schema_version_used }}</p>
</div>
</div>
</div>
{% endif %}


<div class="row">

<div class="panel panel-success">
@@ -185,7 +205,6 @@ <h4 class="panel-title">
</div>
<div id="statisticsTable" class="collapse in panel-body">


<h4>{% trans 'Entity Statements' %}</h4>

<p>{% trans 'Total Statements' %}: {{ statistics.count_entity_statements }}</p>
@@ -226,6 +245,22 @@ <h4>{% trans 'Person Statements' %}</h4>
{% endif %}
{% endfor %}

{% if statistics.count_person_statements_have_pep_status %}
<p>
{% trans '... where PEP status is declared' %}:
{{ statistics.count_person_statements_have_pep_status }}
({% widthratio statistics.count_person_statements_have_pep_status statistics.count_person_statements 100 %}%)
</p>
{% endif %}

{% if statistics.count_person_statements_have_pep_status_and_reason_missing_info %}
<p>
{% trans '... where PEP status is declared AND (erroneously) a reason for missing PEP information is given' %}:
{{ statistics.count_person_statements_have_pep_status_and_reason_missing_info }}
({% widthratio statistics.count_person_statements_have_pep_status_and_reason_missing_info statistics.count_person_statements 100 %}%)
</p>
{% endif %}

<h4>{% trans 'Ownership or Control Statements' %}</h4>

<p>{% trans 'Total Statements' %}: {{ statistics.count_ownership_or_control_statement }}</p>
5 changes: 4 additions & 1 deletion cove_bods/views.py
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ def explore_bods(request, pk):
'msg': _('BODS JSON should have a list as the top level, the JSON you supplied does not.'),
})

schema_bods = SchemaBODS(lib_cove_bods_config=lib_cove_bods_config)
schema_bods = SchemaBODS(json_data=json_data, lib_cove_bods_config=lib_cove_bods_config)

context.update(convert_json(upload_dir, upload_url, file_name, lib_cove_bods_config,
schema_url=schema_bods.release_pkg_schema_url, replace=True,
@@ -94,6 +94,9 @@ def explore_bods(request, pk):
db_data.rendered = True
db_data.save()

# Some extra info from the Schema
context['schema_version_used'] = schema_bods.schema_version

# We need to calculate some stats for showing in the view
total_ownership_or_control_interest_statements = 0
for key, count in context['statistics']['count_ownership_or_control_statement_interest_statement_types'].items():
6 changes: 3 additions & 3 deletions requirements.in
Original file line number Diff line number Diff line change
@@ -4,6 +4,6 @@ Django<1.12
# Lock this version of jsonschema, as that's what some of our libraries lock
jsonschema<2.7
-e git+https://github.com/OpenDataServices/flatten-tool.git@v0.5.0#egg=flattentool
-e git+https://github.com/OpenDataServices/lib-cove.git@v0.5.0#egg=libcove
-e git+https://github.com/openownership/lib-cove-bods.git@v0.4.0#egg=libcovebods
-e git+https://github.com/OpenDataServices/lib-cove-web.git@v0.7.0#egg=libcoveweb
-e git+https://github.com/OpenDataServices/lib-cove.git@v0.7.0#egg=libcove
-e git+https://github.com/openownership/lib-cove-bods.git@v0.5.0#egg=libcovebods
-e git+https://github.com/OpenDataServices/lib-cove-web.git@v0.9.2#egg=libcoveweb
26 changes: 13 additions & 13 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
# Lock this version of dealer because later versions have a problem - middleware is of wrong style to use with MIDDLEWARE_CLASSES
dealer==2.0.5
Django==1.11.20
Django==1.11.22
# Lock this version of jsonschema, as that's what some of our libraries lock
jsonschema==2.6.0
-e git+https://github.com/OpenDataServices/flatten-tool.git@4c13ef0b32a59e810919a3de09bc8f64ce8f9392#egg=flattentool
-e git+https://github.com/OpenDataServices/lib-cove.git@fe3746eee2e695e94d551ce5bb19f02d8305e6f8#egg=libcove
-e git+https://github.com/openownership/lib-cove-bods.git@9de318c1d76cfc6f5d6ab670fc96f1ae56b581eb#egg=libcovebods
-e git+https://github.com/OpenDataServices/lib-cove-web.git@6d4f9437c513fc38057ff9dd928eb0ea32a86f9a#egg=libcoveweb
-e git+https://github.com/OpenDataServices/lib-cove.git@213e5fe3145ab186e34db325d4f40fe051755b84#egg=libcove
-e git+https://github.com/openownership/lib-cove-bods.git@bc5336e09a2e49aec4188fd292bd3603aad66c31#egg=libcovebods
-e git+https://github.com/OpenDataServices/lib-cove-web.git@62663c3dd6f71c57d53dc5ea7a285210b140f4ab#egg=libcoveweb
## The following requirements were added by pip freeze:
bleach==3.1.0
cached-property==1.5.1
certifi==2019.3.9
certifi==2019.6.16
chardet==3.0.4
commonmark==0.8.1
commonmark==0.9.0
contextlib2==0.5.5
django-bootstrap3==11.0.0
django-debug-toolbar==1.11
django-bootstrap3==11.1.0
django-debug-toolbar==2.0
django-environ==0.4.5
et-xmlfile==1.0.1
future==0.17.1
idna==2.8
jdcal==1.4
jdcal==1.4.1
json-merge-patch==0.2
jsonref==0.2
LEPL==5.1.3
lxml==4.3.3
lxml==4.3.4
openpyxl==2.6.2
python-dateutil==2.8.0
pytz==2018.9
pytz==2019.1
raven==6.10.0
requests==2.21.0
requests==2.22.0
rfc3987==1.3.8
rfc6266==0.0.4
schema==0.7.0
six==1.12.0
sqlparse==0.3.0
strict-rfc3339==0.7
urllib3==1.24.1
urllib3==1.25.3
webencodings==0.5.1
xmltodict==0.12.0
47 changes: 26 additions & 21 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Lock this version of dealer because later versions have a problem - middleware is of wrong style to use with MIDDLEWARE_CLASSES
dealer==2.0.5
Django==1.11.20
Django==1.11.22
# Lock this version of jsonschema, as that's what some of our libraries lock
jsonschema==2.6.0
-e git+https://github.com/OpenDataServices/flatten-tool.git@4c13ef0b32a59e810919a3de09bc8f64ce8f9392#egg=flattentool
-e git+https://github.com/OpenDataServices/lib-cove.git@fe3746eee2e695e94d551ce5bb19f02d8305e6f8#egg=libcove
-e git+https://github.com/openownership/lib-cove-bods.git@9de318c1d76cfc6f5d6ab670fc96f1ae56b581eb#egg=libcovebods
-e git+https://github.com/OpenDataServices/lib-cove-web.git@6d4f9437c513fc38057ff9dd928eb0ea32a86f9a#egg=libcoveweb
-e git+https://github.com/OpenDataServices/lib-cove.git@213e5fe3145ab186e34db325d4f40fe051755b84#egg=libcove
-e git+https://github.com/openownership/lib-cove-bods.git@bc5336e09a2e49aec4188fd292bd3603aad66c31#egg=libcovebods
-e git+https://github.com/OpenDataServices/lib-cove-web.git@62663c3dd6f71c57d53dc5ea7a285210b140f4ab#egg=libcoveweb

pytest==4.4.0
pytest-django==3.4.8
flake8==3.7.7
pytest==5.0.1
pytest-django==3.5.1
flake8==3.7.8
pytest-localserver==0.5.0
selenium==3.141.0
transifex-client==0.13.6
@@ -19,43 +19,48 @@ atomicwrites==1.3.0
attrs==19.1.0
bleach==3.1.0
cached-property==1.5.1
certifi==2019.3.9
certifi==2019.6.16
chardet==3.0.4
commonmark==0.8.1
commonmark==0.9.0
contextlib2==0.5.5
django-bootstrap3==11.0.0
django-debug-toolbar==1.11
django-bootstrap3==11.1.0
django-debug-toolbar==2.0
django-environ==0.4.5
entrypoints==0.3
et-xmlfile==1.0.1
future==0.17.1
idna==2.8
jdcal==1.4
importlib-metadata==0.18
jdcal==1.4.1
json-merge-patch==0.2
jsonref==0.2
LEPL==5.1.3
lxml==4.3.3
lxml==4.3.4
mccabe==0.6.1
more-itertools==7.0.0
more-itertools==7.1.0
openpyxl==2.6.2
pathlib2==2.3.3
pluggy==0.9.0
packaging==19.0
pathlib2==2.3.4
pluggy==0.12.0
py==1.8.0
pycodestyle==2.5.0
pyflakes==2.1.1
pyparsing==2.4.0
python-dateutil==2.8.0
python-slugify==1.2.6
pytz==2018.9
pytz==2019.1
raven==6.10.0
requests==2.21.0
requests==2.22.0
rfc3987==1.3.8
rfc6266==0.0.4
schema==0.7.0
six==1.12.0
sqlparse==0.3.0
strict-rfc3339==0.7
Unidecode==1.0.23
urllib3==1.24.1
Unidecode==1.1.1
urllib3==1.25.3
wcwidth==0.1.7
webencodings==0.5.1
Werkzeug==0.15.2
Werkzeug==0.15.5
xmltodict==0.12.0
zipp==0.5.2