Merge pull request #4 from LibCrowds/fix-issues

Fix issues

.gitignore

@@ -63,3 +63,6 @@ target/
 
 #Mac OSX
 .DS_STORE
+
+# Local
+pybossa/

libcrowds_statistics/__init__.py

@@ -7,11 +7,13 @@
 """
 
 import os
+import json
 from flask import current_app as app
 from flask.ext.plugins import Plugin
 
 __plugin__ = "LibCrowdsStatistics"
-__version__ = "0.1.3"
+__version__ = json.load(open(os.path.join(os.path.dirname(__file__),
+                                          'info.json')))['version']
 
 
 class LibCrowdsStatistics(Plugin):
@@ -22,14 +24,12 @@ def setup(self):
         self.setup_blueprint()
         from . import event_listeners
 
-
     def setup_blueprint(self):
         """Setup blueprint."""
         from .blueprint import StatisticsBlueprint
         here = os.path.dirname(os.path.abspath(__file__))
         template_folder = os.path.join(here, 'templates')
         static_folder = os.path.join(here, 'static')
-
         blueprint = StatisticsBlueprint(template_folder=template_folder,
                                         static_folder=static_folder)
         app.register_blueprint(blueprint, url_prefix="/statistics")

libcrowds_statistics/blueprint.py

@@ -14,7 +14,5 @@ class StatisticsBlueprint(Blueprint):
     def __init__(self, **kwargs):
         defaults = {'name': 'statistics', 'import_name': __name__}
         defaults.update(kwargs)
-
         super(StatisticsBlueprint, self).__init__(**defaults)
-
         self.add_url_rule("/", view_func=index)

libcrowds_statistics/info.json

@@ -5,5 +5,5 @@
     "website": "https://github.com/LibCrowds/libcrowds-statistics",
     "license": "BSD",
     "description": "Global statistics page for LibCrowds.",
-    "version": "0.1.3"
+    "version": "0.1.4"
 }

libcrowds_statistics/static/js/charts.js

@@ -440,7 +440,7 @@ function populateTop10PercentChart(stats, id) {
     var top10 = stats.n_tr_top_10_percent
     var bottom90 = stats.n_task_runs - top10
     var top10Label = "Most Active 10%: " + pluralise(top10, "contribution")
-    var bottom90Label = "Remaining 10%: " + pluralise(bottom90, "contribution")
+    var bottom90Label = "Remaining 90%: " + pluralise(bottom90, "contribution")
     var data = getDonutDataset(top10Label, top10, bottom90Label, bottom90);
     drawDonutChart(canvas, con, data, lCon);
 }