Commit 99bca4d0 authored by Willard's avatar Willard

Add type and cuisine in dish forms

parent 0ed4f85d
import os.path import os.path
from canteeneo import app, db from canteeneo import app, db
from canteeneo.models import Stall, Dish, DishType from canteeneo.models import Stall, Dish, DishType, DishCuisine
from canteeneo.forms import DishRegisterForm from canteeneo.forms import DishRegisterForm
from canteeneo.views import flash_form_errors, stall_validate, dish_validate, FormView from canteeneo.views import flash_form_errors, stall_validate, dish_validate, FormView
...@@ -28,6 +28,7 @@ class NewDishView(FormView): ...@@ -28,6 +28,7 @@ class NewDishView(FormView):
def get_form(self): def get_form(self):
form = DishRegisterForm() form = DishRegisterForm()
form.dish_type.choices = [(dish_type.id, dish_type.name) for dish_type in DishType.query.all()] form.dish_type.choices = [(dish_type.id, dish_type.name) for dish_type in DishType.query.all()]
form.dish_cuisine.choices = [(dish_cuisine.id, dish_cuisine.name) for dish_cuisine in DishCuisine.query.all()]
return form return form
class DishView(View): class DishView(View):
...@@ -62,6 +63,7 @@ class EditDishView(FormView): ...@@ -62,6 +63,7 @@ class EditDishView(FormView):
def get_form(self): def get_form(self):
form = DishRegisterForm() form = DishRegisterForm()
form.dish_type.choices = [(dish_type.id, dish_type.name) for dish_type in DishType.query.all()] form.dish_type.choices = [(dish_type.id, dish_type.name) for dish_type in DishType.query.all()]
form.dish_cuisine.choices = [(dish_cuisine.id, dish_cuisine.name) for dish_cuisine in DishCuisine.query.all()]
form.editing = True form.editing = True
return form return form
......
...@@ -69,6 +69,7 @@ class DishRegisterForm(FlaskForm): ...@@ -69,6 +69,7 @@ class DishRegisterForm(FlaskForm):
image = FileField('Image') image = FileField('Image')
price = DecimalField('Price', [DataRequired()], render_kw={"placeholder": "Price"}) price = DecimalField('Price', [DataRequired()], render_kw={"placeholder": "Price"})
dish_type = SelectField('Type', coerce=int) dish_type = SelectField('Type', coerce=int)
dish_cuisine = SelectField('Cuisine', coerce=int)
editing = False editing = False
def validate(self, editing=False): def validate(self, editing=False):
......
...@@ -26,8 +26,13 @@ ...@@ -26,8 +26,13 @@
{{ form.price(class_="form-control", type="number") }} {{ form.price(class_="form-control", type="number") }}
</div> </div>
<div class="form-group form-group-lg col-sm-12"> <div class="form-group form-group-lg col-sm-12">
<div class="col-sm-6">
{{ form.dish_type.label(class_="col-sm-6 control-label") }} {{ form.dish_type(class_="form-control") }} {{ form.dish_type.label(class_="col-sm-6 control-label") }} {{ form.dish_type(class_="form-control") }}
</div> </div>
<div class="col-sm-6">
{{ form.dish_cuisine.label(class_="col-sm-6 control-label") }} {{ form.dish_cuisine(class_="form-control") }}
</div>
</div>
<div class="form-group form-group-lg"> <div class="form-group form-group-lg">
<div class="col-sm-6"> <div class="col-sm-6">
<button class="btn btn-primary btn-block btn-lg" type="submit">{{ submit_label }}</button> <button class="btn btn-primary btn-block btn-lg" type="submit">{{ submit_label }}</button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment