Fix home plot legend labels.

Also, add @jglorian because he totally deserves it.

Fix home plot legend labels.
Also, add @jglorian because he totally deserves it.
Antoine Goutenoir
1 parent eb5f7e79
Showing 5 changed files with 32 additions and 7 deletions Show diff stats
content.yml
flaskr/controllers/main_controller.py
flaskr/models.py
flaskr/templates/estimation.html
flaskr/templates/home.html
@@ -11,8 +11,11 @@ meta:
       email: dbarret@irap.omp.eu
       role:  Principal Investigator
     - name:  Antoine Goutenoir
-      email: agoutenoir@irap.omp.eu
+      email: antoine@goutenoir.com
       role:  Software Ninja
+    - name:  Jean-Michel Glorian
+      email: Jean-Michel.Glorian@irap.omp.eu
+      role:  Benevolent Wizard
  
  
 # Aka. Laws
@@ -45,10 +45,14 @@ def favicon():  # we want it served from the root, not from static/
 @cache.cached(timeout=1000)
 def home():
     models = get_emission_models()
+    models_dict = {}
+    for model in models:
+        models_dict[model.slug] = model.__dict__
     return render_template(
         'home.html',
-        models=models,
+        models=models_dict,
         colors=[model.color for model in models],
+        labels=[model.name for model in models],
     )
  
  
@@ -229,8 +233,9 @@ def compute():  # process the queue of estimation requests
  
     # GRAB AND CONFIGURE THE EMISSION MODELS ##################################
  
-    mdl_slugs = estimation.models_slugs.split("\n")
-    emission_models = [m for m in get_emission_models() if m.slug in mdl_slugs]
+    emission_models = estimation.get_models()
+    # mdl_slugs = estimation.models_slugs.split("\n")
+    # emission_models = [m for m in get_emission_models() if m.slug in mdl_slugs]
     # print(emission_models)
  
     # PREPARE RESULT DICTIONARY THAT WILL BE STORED ###########################
 from flask_admin.contrib.sqla import ModelView
  
-from flaskr.core import generate_unique_id
+from flaskr.core import generate_unique_id, models
 from flask_sqlalchemy import SQLAlchemy
 from flask_login import UserMixin, AnonymousUserMixin
 from werkzeug.security import generate_password_hash, check_password_hash
@@ -55,12 +55,24 @@ class Estimation(db.Model):
     def has_failed(self):
         return self.status == StatusEnum.failure
  
+    _output_dict = None
+
     def get_output_dict(self):
-        return yaml_load(self.output_yaml)
+        if self._output_dict is None:
+            self._output_dict = yaml_load(self.output_yaml)
+        return self._output_dict
  
     def has_many_to_many(self):
         return 'cities' in self.get_output_dict()
  
+    _models = None
+
+    def get_models(self):
+        if self._models is None:
+            mdl_slugs = self.models_slugs.split("\n")
+            self._models = [m for m in models if m.slug in mdl_slugs]
+        return self._models
+
  
 class EstimationView(ModelView):
     # Show only name and email columns in list view
@@ -61,6 +61,10 @@
 {% endif %}
  
 <div class="row">
+    Using
+    {% for model in estimation.get_models() %}
+        {{ model.name }}{{ ',' if not loop.last }}
+    {% endfor %}
 {#    <h4>Total CO<sub>2</sub> footprint (in kilograms-equivalent) of each city</h4>#}
 {#    <div id="cities_footprints_d3viz" class="plot-container"></div>#}
     <hr>
@@ -82,7 +82,7 @@ var ceil_value_to_magnitude = function(value) {
 };
  
  
-{#var models = {{ models | tojson }};#}
+var models = {{ models | tojson }};
  
  
 /** PLOTS **/
@@ -206,6 +206,7 @@ jQuery(document).ready(function($){
             {#.useClass(true)#}
             {#.title("Legend")#}
             {#.titleWidth(100)#}
+            .labels({{ labels | tojson }})
             .scale(color);
  
         svg.select(".legendQuant")