[#108] Add ruleset pass percentages

IATI · May 19, 2014 · 0e800eb · 0e800eb
1 parent 9b52d19
commit 0e800eb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git 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
@@ -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
@@ -92,6 +92,7 @@
       <li{% if xml %} class="active"{% endif %}><a href="{{url('xml.html')}}">XML Errors</a></li>
       <li{% if validation %} class="active"{% endif %}><a href="{{url('validation.html')}}">Validation</a></li>
       <li{% if versions %} class="active"{% endif %}><a href="{{url('versions.html')}}">Versions</a></li>
+      <li{% if rulesets %} class="active"{% endif %}><a href="{{url('rulesets.html')}}">Rulesets</a></li>
       <li{% if licenses %} class="active"{% endif %}><a href="{{url('licenses.html')}}">Licenses</a></li>
       <li{% if organisation %} class="active"{% endif %}><a href="{{url('organisation.html')}}">Organisation XML</a></li>
       {% endif %}

diff --git a/templates/publisher.html b/templates/publisher.html
@@ -238,6 +238,8 @@ <h3 class="panel-title">Files</h3>
                 <th>Activities <a href="{{stats_url}}/current/inverted-file/{{publisher}}/activities.json">(J)</a></th>
                 <th>Organisations <a href="{{stats_url}}/current/inverted-file/{{publisher}}/organisations.json">(J)</a></th>
                 <th>File Size <a href="{{stats_url}}/current/inverted-file/{{publisher}}/file_size.json">(J)</a></th>
+                <th>Version <a href="{{stats_url}}/current/inverted-file-publisher/{{publisher}}/versions.json">(J)</a></th>
+                <th><a href="../ruleset.html">Standard Ruleset</a> <a href="{{stats_url}}/current/inverted-./version.json">(J)</a></th>
             </tr>
         </thead>
         <tbody>
@@ -247,6 +249,8 @@ <h3 class="panel-title">Files</h3>
                 <td>{{activities}}</td>
                 <td>{{current_stats.inverted_file.organisations.get(package)}}</td>
                 <td data-bytes="{{current_stats.inverted_file.file_size.get(package)}}">{{current_stats.inverted_file.file_size.get(package)|filesizeformat}}</td>
+                <td>{{current_stats.aggregated_file[publisher][package]['versions'].keys()[0]}}</td>
+                <td>{% 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 %}</td>
             </tr>
             {% endfor %}
         </tbody>