diff --git a/data.py b/data.py index 7ca8effa2b..87d9ba2123 100644 --- a/data.py +++ b/data.py @@ -65,6 +65,7 @@ def get_publisher_stats(publisher, stats_type='aggregated'): current_stats = { 'aggregated': JSONDir('./stats-calculated/current/aggregated'), + 'aggregated_file': JSONDir('./stats-calculated/current/aggregated-file'), 'inverted_publisher': JSONDir('./stats-calculated/current/inverted-publisher'), 'inverted_file': JSONDir('./stats-calculated/current/inverted-file'), 'download_errors': [] diff --git a/make_html.py b/make_html.py index f5ca1bd6f0..4198e75406 100644 --- a/make_html.py +++ b/make_html.py @@ -66,6 +66,7 @@ def make_slugs(keys): 'xml.html': iati_stats_page('xml.html', xml=True), 'validation.html': iati_stats_page('validation.html', validation=True), 'versions.html': iati_stats_page('versions.html', versions=True, expected_versions=expected_versions), + 'rulesets.html': iati_stats_page('rulesets.html', versions=True, expected_versions=expected_versions), 'licenses.html': licenses.main, 'organisation.html': iati_stats_page('organisation.html', organisation=True), 'elements.html': iati_stats_page('elements.html', elements=True), diff --git a/templates/base.html b/templates/base.html index 1b182878b2..d47b04f63b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -92,6 +92,7 @@ XML Errors Validation Versions + Rulesets Licenses Organisation XML {% endif %} diff --git a/templates/publisher.html b/templates/publisher.html index c7dc5154c0..86722ee21a 100644 --- a/templates/publisher.html +++ b/templates/publisher.html @@ -238,6 +238,8 @@

Files

Activities (J) Organisations (J) File Size (J) + Version (J) + Standard Ruleset (J) @@ -247,6 +249,8 @@

Files

{{activities}} {{current_stats.inverted_file.organisations.get(package)}} {{current_stats.inverted_file.file_size.get(package)|filesizeformat}} + {{current_stats.aggregated_file[publisher][package]['versions'].keys()[0]}} + {% if package in current_stats.inverted_file.ruleset_passes.standard %}{{100.0*current_stats.inverted_file.ruleset_passes.standard[package]/current_stats.inverted_file.activities[package]}}{% endif %} {% endfor %}