Rename columns in the estimation output CSV file.

Fixes {41

Rename columns in the estimation output CSV file.
Fixes {41
Antoine Goutenoir
1 parent e2e42156
Showing 2 changed files with 11 additions and 5 deletions Show diff stats
flaskr/controllers/main_controller.py
flaskr/templates/estimation.html
@@ -722,8 +722,10 @@ def consult_estimation(public_id, extension):
         cw = csv.writer(si, quoting=csv.QUOTE_ALL)
         cw.writerow([
             u"city", u"country", u"address",
-            u"co2 (kg)", u"distance (km)",
-            u"plane trips", u'train trips',
+            u"co2_kg",
+            u"distance_km",
+            u"plane trips_amount",
+            u'train trips_amount',
         ])
  
         results = estimation.get_output_dict()
 {% extends "base.html" %}
  
  
+
 {% block title %}Estimation {{ estimation.public_id }} of your ✈ travel footprint{% endblock %}
  
  
+
 {% block hero %}
 <div class="jumbotron">
 {% if estimation.has_failed() %}
@@ -341,10 +343,10 @@ jQuery(document).ready(function($){
     var vizid = "#cities_footprints_d3viz_lollipop";
     var csvUrl = "/estimation/{{ estimation.public_id }}.csv";
     var y_key = 'city';
-    var x_key = 'co2 (kg)';
+    var x_key = 'co2_kg';
  
     var margin = {top: 40, right: 40, bottom: 150, left: 180},
-        height = Math.max(300, 100+16*plots_config['cities_count']) - margin.top - margin.bottom;
+        height = Math.max(300, 100 + 16*plots_config['cities_count']) - margin.top - margin.bottom;
     var width = Math.max(880, $(vizid).parent().width());
     width = width - margin.left - margin.right;
  
@@ -367,7 +369,9 @@ jQuery(document).ready(function($){
     d3.csv(csvUrl, function (data) {
  
         // Extrema
-        var data_x_max = d3.max(data, function (d) { return parseFloat(d[x_key]); });
+        var data_x_max = d3.max(data, function (d) {
+            return parseFloat(d[x_key]);
+        });
         var axis_x_max = ceil_value_to_magnitude(data_x_max);
  
         // X axis