From eb5f7e793c91afc0b7f98eaaa6de4481567b5584 Mon Sep 17 00:00:00 2001
From: Antoine Goutenoir <antoine.goutenoir@irap.omp.eu>
Date: Sat, 2 Nov 2019 07:19:11 +0100
Subject: [PATCH] Display the CO2 in tons and display distance as well.

---
 flaskr/templates/estimation.html | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/flaskr/templates/estimation.html b/flaskr/templates/estimation.html
index 8e4da71..1fe93a7 100644
--- a/flaskr/templates/estimation.html
+++ b/flaskr/templates/estimation.html
@@ -32,13 +32,16 @@
     {% endif %}
         </span>
         –
-        {{ "%.d" | format(city.footprint | round(0) | int) }} CO<sub>2</sub><small>EQ</small>
+        {{ "%.d" | format((city.footprint/1000.0) | round() | int) }} tons CO<sub>2</sub><small>EQ</small>
+        –
+        {{ "%.d" | format(city.distance | round() | int) }} km
     </li>
 {% endfor %}
 </ul>
 {% endmacro %}
 
 
+
 {% block body %}
 <h2>
     {{ estimation.public_id }} ({{ estimation.status.name }})
@@ -58,8 +61,8 @@
 {% endif %}
 
 <div class="row">
-    <h4>Total CO<sub>2</sub> footprint (in kilograms-equivalent) of each city</h4>
-    <div id="cities_footprints_d3viz" class="plot-container"></div>
+{#    <h4>Total CO<sub>2</sub> footprint (in kilograms-equivalent) of each city</h4>#}
+{#    <div id="cities_footprints_d3viz" class="plot-container"></div>#}
     <hr>
     <div id="cities_footprints_d3viz_lollipop" class="plot-container"></div>
 {#    <br>#}
@@ -188,6 +191,7 @@ var plots_config = {
 
 /** PLOTS **/
 
+{#
 jQuery(document).ready(function($){
 
     var vizid = "#cities_footprints_d3viz";
@@ -260,6 +264,7 @@ jQuery(document).ready(function($){
     });
 
 });
+#}
 
 
 jQuery(document).ready(function($){
--
libgit2 0.21.2