Fake support for model selection.

We still use all the models.

Fake support for model selection.
We still use all the models.
Antoine Goutenoir
1 parent 466912a2
Showing 3 changed files with 80 additions and 19 deletions Show diff stats
flaskr/controllers/main_controller.py
flaskr/forms.py
flaskr/templates/estimate.html
-import importlib
 import geopy
 import sqlalchemy
  
@@ -11,7 +10,7 @@ from flaskr.forms import LoginForm, EstimateForm
 from flaskr.models import db, User, Estimation, StatusEnum
 from flaskr.geocoder import CachedGeocoder
  
-from flaskr.core import generate_unique_id
+from flaskr.core import generate_unique_id, get_emission_models
 from flaskr.content import content
  
 from yaml import safe_dump as yaml_dump
@@ -29,20 +28,6 @@ OUT_ENCODING = &#39;utf-8&#39;
 # -----------------------------------------------------------------------------
 # refactor this outta here, like in core?
  
-def get_emission_models():
-    emission_models_confs = content.models
-    emission_models = []
-
-    for model_conf in emission_models_confs:
-        model_file = model_conf.file
-        the_module = importlib.import_module("flaskr.laws.%s" % model_file)
-
-        model = the_module.EmissionModel(model_conf)
-        # model.configure(extra_model_conf)
-
-        emission_models.append(model)
-
-    return emission_models
  
 # -----------------------------------------------------------------------------
  
@@ -69,6 +54,7 @@ def home():
  
 @main.route("/estimate", methods=["GET", "POST"])
 def estimate():
+    models = get_emission_models()
     form = EstimateForm()
  
     if form.validate_on_submit():
@@ -84,6 +70,11 @@ def estimate():
         estimation.origin_addresses = form.origin_addresses.data
         estimation.destination_addresses = form.destination_addresses.data
         # estimation.compute_optimal_destination = form.compute_optimal_destination.data
+        models_slugs = []
+        for model in models:
+            if getattr(form, 'use_model_' % model.slug).data:
+                models_slugs.append(model.slug)
+        estimation.models_slugs = "\n".join(models_slugs)
  
         db.session.add(estimation)
         db.session.commit()
@@ -96,7 +87,7 @@ def estimate():
         ))
         # return render_template("estimate-debrief.html", form=form)
  
-    return render_template("estimate.html", form=form)
+    return render_template("estimate.html", form=form, models=models)
  
  
 @main.route("/invalidate")
@@ -8,6 +8,7 @@ from wtforms import validators
  
 from .models import User
 from .content import content_dict as content
+from .core import models
  
 form_content = content['estimate']['form']
  
@@ -15,6 +16,7 @@ form_content = content[&#39;estimate&#39;][&#39;form&#39;]
 # ESTIMATION FORM #############################################################
  
 class EstimateForm(FlaskForm):
+
     # email = StringField(
     #     label=form_content['email']['label'],
     #     description=form_content['email']['description'],
@@ -23,6 +25,7 @@ class EstimateForm(FlaskForm):
     #         validators.Email(),
     #     ],
     # )
+
     first_name = StringField(
         label=form_content['first_name']['label'],
         description=form_content['first_name']['description'],
@@ -81,6 +84,7 @@ class EstimateForm(FlaskForm):
             "placeholder": form_content['destination_addresses']['placeholder']
         },
     )
+
     # compute_optimal_destination = BooleanField(
     #     label=form_content['compute_optimal_destination']['label'],
     #     description=form_content['compute_optimal_destination']['description'],
@@ -105,9 +109,40 @@ class EstimateForm(FlaskForm):
         if not check_validate:
             return False
  
+        uses_at_least_one_model = False
+        for model in models:
+            use_model = getattr(self, 'use_model_%s' % model.slug)
+            #print("Model data", model.slug, use_model.data)
+            if use_model.data:
+                uses_at_least_one_model = True
+
+        if not uses_at_least_one_model:
+            last_model = getattr(self, 'use_model_%s' % models[-1].slug)
+            last_model.errors.append("Please select at least one model."
+                                      "&nbsp;&nbsp;"  # It's been a while
+                                      "<em>What are you doing?</em>")
+            return False
+
         return True
  
  
+# Add the models' checkboxes to the above Form
+for model in models:
+    setattr(  # setattr() takes no keyword arguments -.-
+        EstimateForm,
+        'use_model_%s' % model.slug,
+        BooleanField(
+            label=model.name,
+            # description=model.short_description,
+            default=True,
+            # default=model.default,  # todo: from config
+            validators=[
+                validators.Optional(),
+            ],
+        )
+    )
+
+
 # LOGIN FORM ##################################################################
  
 class LoginForm(FlaskForm):
@@ -12,6 +12,11 @@
 {% endblock %}
  
  
+
+{#############################################################################}
+{# MACROS ######################################################################}
+
+
 {% macro render_field(field) %}
 <dt>
     {{ field.label }}
@@ -21,8 +26,9 @@
 </dt>
 <dd>
     {{ field(title=field.description, class_="form-control", **kwargs) | safe }}
+
     {% if field.errors -%}
-    <ul class=errors>
+    <ul class="errors text-danger has-error">
     {% for error in field.errors %}
         <li>{{ error }}</li>
     {% endfor %}
@@ -38,9 +44,18 @@
     class="form-check-label",
     title=field.description
 ) }}
+
+{% if field.errors -%}
+<p class="text-danger help-block">{{ field.errors[0] }}</p>
+{%- endif %}
 {% endmacro %}
  
  
+
+{#############################################################################}
+{# BODY ######################################################################}
+
+
 {% block body %}
 <div class="row">
     <div class="col-md-2"></div>
@@ -68,7 +83,9 @@
             <div class="form-group">
                 {{ render_field(form.origin_addresses) }}
                 <small class="form-text text-muted">
-                    Use <code>en_US</code> city and country names, without diacritics. The comma matters.
+                    Use <code>en_US</code> city and country names, without diacritics.
+                    &nbsp;
+                    The comma matters.
                     <br>
                     These usually are the addresses of your participants.
                 </small>
@@ -88,6 +105,24 @@
 {#                {{ render_checkbox(form.use_atmosfair_rfi) }}#}
 {#                <small class="form-text text-muted">Disabled. Work in Progress. RFI=1.9</small>#}
 {#            </div>#}
+
+            <div class="form-group">
+
+            <h6>Emission Models to consider</h6>
+            <div class="form-check">
+                {% for model in models %}
+                <div>
+                {{ render_checkbox(form['use_model_'~model.slug]) }}
+                </div>
+                {% endfor %}
+            </div>
+            <small class="form-text text-muted">
+                We will use a mean of the selected models.
+                &nbsp;
+                Please select at least one.
+            </small>
+            </div>
+
             <div class="form-group">
                 {{ render_field(form.comment) }}
             </div>