Merge branch 'upgrade-py3' into master

CodeForAfrica · Oct 4, 2019 · f3a7565 · f3a7565
2 parents 0e0ba45 + a9838e2
commit f3a7565
Show file tree

Hide file tree

Showing 3 changed files with 357 additions and 169 deletions.
diff --git a/README.rst b/README.rst
@@ -7,6 +7,9 @@ Wazimap
 .. image:: https://travis-ci.org/Code4SA/wazimap.svg
     :target: http://travis-ci.org/Code4SA/wazimap
 
+This is the latest version of wazimap. Version 1 is located in the releases-v1 branch.
+
+
 Wazimap is a Django application for exploring census and other similar data. It makes it easy to understand a place
 through the eyes of the data, and to explore data across a range of places. It is most suited for census data
 but can easily be used with other data that is similarly focused on places in a country.

diff --git a/census/static/js/charts.js b/census/static/js/charts.js
@@ -886,7 +886,7 @@ function Chart(options) {
         var place = (!!geoStr) ? geoStr : 'this',
             decimals = (!!precision) ? precision : 0,
             valueText = data.context.values[place],
-            valueMOEFlag = data.context.error_ratio[place] >= 10 ? "<sup>&dagger;</sup>" : "";
+            valueMOEFlag = "";
         return chart.valFmt(valueText, decimals) + valueMOEFlag;
     }