Fix line chart tooltips

LibCrowds · Mar 2, 2016 · 92f3a20 · 92f3a20
1 parent cbbd9cd
commit 92f3a20
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/libcrowds_statistics/__init__.py b/libcrowds_statistics/__init__.py
@@ -11,7 +11,7 @@
 from flask.ext.plugins import Plugin
 
 __plugin__ = "LibCrowdsStatistics"
-__version__ = "0.1.2"
+__version__ = "0.1.3"
 
 
 class LibCrowdsStatistics(Plugin):

diff --git a/libcrowds_statistics/info.json b/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.2"
+    "version": "0.1.3"
 }
diff --git a/libcrowds_statistics/static/js/charts.js b/libcrowds_statistics/static/js/charts.js
@@ -37,11 +37,13 @@ Chart.defaults.global= {
     tooltipCornerRadius: 6,
     tooltipXOffset: 10,
     tooltipTemplate:  "<%if(label)\u007B%><%=label%>: <%}%>"
-                    + "<%=value%> "
-                    + "<%if(value != 1)\u007B%>"
-                    + "<%=datasetLabel%>s"
-                    + "<%}else\u007B%>"
+                    + "<%=value%>"
+                    + "<%if(datasetLabel == '%')\u007B%>"
                     + "<%=datasetLabel%>"
+                    + "<%} else if(value != 1)\u007B%>"
+                    + " <%=datasetLabel%>s"
+                    + "<%}else\u007B%>"
+                    + " <%=datasetLabel%>"
                     + "<%}%>",
     onAnimationProgress: function() {},
     onAnimationComplete: function() {},
@@ -462,7 +464,7 @@ function populateHourlyActivityChart(hourlyActivity, id) {
     }
     var data = {
         labels: labels,
-        datasets: getLineDataset("percent", percentages)
+        datasets: getLineDataset("%", percentages)
     };
     drawLineChart(canvas, con, data);
 }
diff --git a/libcrowds_statistics/templates/stats.html b/libcrowds_statistics/templates/stats.html
@@ -154,7 +154,7 @@ <h4 class="padding-bottom-sm text-center">Total Hourly Activity</h4>
 <script src="{{url_for('statistics.static', filename='js/vendor/leaflet.markercluster.js')}}" type="text/javascript"></script>
 <script src="{{url_for('statistics.static', filename='js/vendor/moment.js')}}"></script>
 <script src="{{url_for('statistics.static', filename='js/vendor/Chart.js-master/Chart.js')}}"></script>
-<script src="{{url_for('statistics.static', filename='js/charts.js')}}"></script>
+<script src="{{url_for('statistics.static', filename='js/charts.js')}}?v=0.2.0"></script>
 <script>
 $(function(){
     var stats = {{ stats|safe }};