Merge branch 'master' of https://github.com/onlyphantom/pedagogy

onlyphantom · Jan 25, 2019 · 368fd80 · 368fd80
2 parents b58faf4 + f21ed4f
commit 368fd80
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/app/routes.py b/app/routes.py
@@ -115,6 +115,6 @@ def rate(workshop_id):
         db.session.commit()
         return render_template('response.html')
 
-    return render_template('survey.html', form=form, workshop_name=g.workshop.workshop_name)
+    return render_template('survey.html', form=form, workshop_name=g.workshop.workshop_name, workshop_category=g.workshop.workshop_category)
 
 
diff --git a/app/templates/survey.html b/app/templates/survey.html
@@ -44,13 +44,14 @@ <h4>{{ form.time.label }}</h4>
                     <h5>
                         <output for="time" id="time-score"> {{ form.time.data }} </output> </br>
                     </h5>
-
-                    <h4>{{ form.venue.label }}</h4>
-                        {{ form.venue(min=1, max=5, oninput="venueValue(value)", id='larger') }}
-                    <br/>
-                    <h5>
-                        <output for="venue" id="venue-score"> {{ form.venue.data }} </output> </br>
-                    </h5>
+                    {% if workshop_category != "Corporate" %}
+                        <h4>{{ form.venue.label }}</h4>
+                            {{ form.venue(min=1, max=5, oninput="venueValue(value)", id='larger') }}
+                        <br/>
+                        <h5>
+                            <output for="venue" id="venue-score"> {{ form.venue.data }} </output> </br>
+                        </h5>
+                    {% endif %}
 
                     <h4>{{ form.satisfaction.label }}</h4>
                         {{ form.satisfaction(min=1, max=5, oninput="satisfactionValue(value)", id='larger') }}
@@ -101,12 +102,12 @@ <h4>{{ form.comments.label }}</h4>
 
 <style>
     #larger {
-        width: 400px;
+        width: 25%;
     }
     #area{
-        width:600px;
-        height: 100px;
-        font-size:16pt;
+        width:30%;
+        height: 20%;
+        font-size:12pt;
     }
 </style>