From fa81205d303534194fb01aa15497d49702941c00 Mon Sep 17 00:00:00 2001 From: David Carpenter Date: Thu, 14 Aug 2014 15:52:00 +0100 Subject: [PATCH] Rulesets functionality removed for Iteration 2 #108 Deleted the code that implements rulesets into the visual output of the dashboard only. --- make_html.py | 3 +-- templates/publisher.html | 12 ------------ 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/make_html.py b/make_html.py index 0f52a42e36..dc6b0e99e8 100644 --- a/make_html.py +++ b/make_html.py @@ -119,7 +119,7 @@ top_navigation = ['index', 'headlines', 'data_quality', 'exploring_data', 'github', 'faq'] navigation = { 'headlines': [ 'publishers', 'files', 'activities'], - 'data_quality': ['download', 'xml', 'validation', 'versions', 'rulesets', 'licenses', 'organisation', 'identifiers', 'reporting_orgs'], + 'data_quality': ['download', 'xml', 'validation', 'versions', 'licenses', 'organisation', 'identifiers', 'reporting_orgs'], 'exploring_data': ['elements', 'codelists', 'booleans', 'dates'], 'github': ['github', 'milestones', 'milestones-completed'], 'annualreport': ['annualreport', 'coverage', 'timeliness', 'forwardlooking'] @@ -245,7 +245,6 @@ def make_slugs(keys): 'xml.html': iati_stats_page('xml.html', page='xml'), 'validation.html': iati_stats_page('validation.html', page='validation'), 'versions.html': iati_stats_page('versions.html', page='versions', expected_versions=expected_versions), - 'rulesets.html': iati_stats_page('rulesets.html', page='rulesets', expected_versions=expected_versions), 'licenses.html': licenses.main, 'organisation.html': iati_stats_page('organisation.html', page='organisation'), 'identifiers.html': iati_stats_page('identifiers.html', page='identifiers'), diff --git a/templates/publisher.html b/templates/publisher.html index 49c6b498c4..5157d4ae14 100644 --- a/templates/publisher.html +++ b/templates/publisher.html @@ -319,7 +319,6 @@

Files

Organisations (J) File Size (J) Version (J) - Standard Ruleset (J) @@ -330,17 +329,6 @@

Files

{{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 and (current_stats.inverted_file.activities[package]+current_stats.inverted_file.organisations[package]) > 0 %} - {% if publisher in ckan and package in ckan[publisher] %} - - {% endif %} - {{100.0*current_stats.inverted_file.ruleset_passes.standard[package]/(current_stats.inverted_file.activities[package]+current_stats.inverted_file.organisations[package])}} - {% if publisher in ckan and package in ckan[publisher] %} - - {% endif %} - {% endif %} - {% endfor %}