Commit eb5f7e793c91afc0b7f98eaaa6de4481567b5584
1 parent
2f22629a
Exists in
master
Display the CO2 in tons and display distance as well.
Showing
1 changed file
with
8 additions
and
3 deletions
Show diff stats
flaskr/templates/estimation.html
| ... | ... | @@ -32,13 +32,16 @@ |
| 32 | 32 | {% endif %} |
| 33 | 33 | </span> |
| 34 | 34 | – |
| 35 | - {{ "%.d" | format(city.footprint | round(0) | int) }} CO<sub>2</sub><small>EQ</small> | |
| 35 | + {{ "%.d" | format((city.footprint/1000.0) | round() | int) }} tons CO<sub>2</sub><small>EQ</small> | |
| 36 | + – | |
| 37 | + {{ "%.d" | format(city.distance | round() | int) }} km | |
| 36 | 38 | </li> |
| 37 | 39 | {% endfor %} |
| 38 | 40 | </ul> |
| 39 | 41 | {% endmacro %} |
| 40 | 42 | |
| 41 | 43 | |
| 44 | + | |
| 42 | 45 | {% block body %} |
| 43 | 46 | <h2> |
| 44 | 47 | {{ estimation.public_id }} ({{ estimation.status.name }}) |
| ... | ... | @@ -58,8 +61,8 @@ |
| 58 | 61 | {% endif %} |
| 59 | 62 | |
| 60 | 63 | <div class="row"> |
| 61 | - <h4>Total CO<sub>2</sub> footprint (in kilograms-equivalent) of each city</h4> | |
| 62 | - <div id="cities_footprints_d3viz" class="plot-container"></div> | |
| 64 | +{# <h4>Total CO<sub>2</sub> footprint (in kilograms-equivalent) of each city</h4>#} | |
| 65 | +{# <div id="cities_footprints_d3viz" class="plot-container"></div>#} | |
| 63 | 66 | <hr> |
| 64 | 67 | <div id="cities_footprints_d3viz_lollipop" class="plot-container"></div> |
| 65 | 68 | {# <br>#} |
| ... | ... | @@ -188,6 +191,7 @@ var plots_config = { |
| 188 | 191 | |
| 189 | 192 | /** PLOTS **/ |
| 190 | 193 | |
| 194 | +{# | |
| 191 | 195 | jQuery(document).ready(function($){ |
| 192 | 196 | |
| 193 | 197 | var vizid = "#cities_footprints_d3viz"; |
| ... | ... | @@ -260,6 +264,7 @@ jQuery(document).ready(function($){ |
| 260 | 264 | }); |
| 261 | 265 | |
| 262 | 266 | }); |
| 267 | +#} | |
| 263 | 268 | |
| 264 | 269 | |
| 265 | 270 | jQuery(document).ready(function($){ | ... | ... |