Merge branch 'master' of gitlab.com:uncel_dolan/similar-beer

2 files changed, 13 insertions, 4 deletions

diff --git a/app.py b/app.py
index 26f3447..eb6d9c3 100644
--- a/app.py
+++ b/app.py
@@ -109,7 +109,7 @@ def get_beer_details(brewery_id, beer_id):
         if attr != None and direction != None:
             kwargs['attr'] = attr
             kwargs['direction'] = direction
-            attr_beers = translate_to_attr(full_id, attr, int(direction))
+            attr_beers = translate_to_attr(full_id, attr, directionValue(direction))
             attr_beer_objects = []
             for item in attr_beers:
                 item_result, item_brewer = beer_lookup(item[0])
@@ -126,6 +126,15 @@ def get_beer_details(brewery_id, beer_id):
 
     return render_template('beerpage.jinja2', **kwargs)
 
+def directionValue(name):
+    if name == 'Much more':
+        return 3
+    if name == 'More':
+        return 2
+    if name == 'Slightly more':
+        return 1
+    return 0
+
 @app.route('/all_beers.json')
 def get_all_beers():
     q = request.args.get('q')
diff --git a/templates/beerpage.jinja2 b/templates/beerpage.jinja2
index 9f6bf2b..44a5e82 100644
--- a/templates/beerpage.jinja2
+++ b/templates/beerpage.jinja2
@@ -76,9 +76,9 @@
         <form action="" method="post" class="alert alert-secondary form-inline">
           Show me beers which are
           <select name="direction" class="form-control">
-              <option {% if direction == '3' %}selected{% endif %} value="3">Much more</option>
-              <option {% if direction == '2' %}selected{% endif %} value="2">More</option>
-              <option {% if direction == '1' or not direction%}selected{% endif %} value="1">Slightly more</option>
+            {% for d in ['Much more', 'More', 'Slightly more'] %}
+            <option {% if direction == d %}selected{% endif %}>{{ d }}</option>
+            {% endfor %}
           </select>
           <select name="attr" class="form-control">
             {% for a in attrs %}