mirror of
https://github.com/StefBuwalda/cal_counter.git
synced 2025-11-01 12:19:59 +00:00
Change energy field from integer to float
Updated the FoodItem model and FoodItemForm to use float for the energy field instead of integer.
This commit is contained in:
3
forms.py
3
forms.py
@@ -3,7 +3,6 @@ from wtforms import (
|
|||||||
StringField,
|
StringField,
|
||||||
PasswordField,
|
PasswordField,
|
||||||
SubmitField,
|
SubmitField,
|
||||||
IntegerField,
|
|
||||||
FloatField,
|
FloatField,
|
||||||
)
|
)
|
||||||
from wtforms.validators import DataRequired, InputRequired, Optional
|
from wtforms.validators import DataRequired, InputRequired, Optional
|
||||||
@@ -18,7 +17,7 @@ class LoginForm(FlaskForm):
|
|||||||
class FoodItemForm(FlaskForm):
|
class FoodItemForm(FlaskForm):
|
||||||
barcode = StringField("Barcode", validators=[Optional()])
|
barcode = StringField("Barcode", validators=[Optional()])
|
||||||
name = StringField("Product Name", validators=[DataRequired()])
|
name = StringField("Product Name", validators=[DataRequired()])
|
||||||
energy = IntegerField(
|
energy = FloatField(
|
||||||
"Energy per 100g",
|
"Energy per 100g",
|
||||||
validators=[InputRequired()],
|
validators=[InputRequired()],
|
||||||
render_kw={"inputmode": "decimal"},
|
render_kw={"inputmode": "decimal"},
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ class FoodItem(db.Model):
|
|||||||
owner_id = db.Column(db.Integer, db.ForeignKey("user.id"), nullable=False)
|
owner_id = db.Column(db.Integer, db.ForeignKey("user.id"), nullable=False)
|
||||||
name = db.Column(db.String(150), nullable=False)
|
name = db.Column(db.String(150), nullable=False)
|
||||||
|
|
||||||
energy_100 = db.Column(db.Integer, nullable=False)
|
energy_100 = db.Column(db.Float, nullable=False)
|
||||||
protein_100 = db.Column(db.Float, nullable=False)
|
protein_100 = db.Column(db.Float, nullable=False)
|
||||||
carbs_100 = db.Column(db.Float, nullable=False)
|
carbs_100 = db.Column(db.Float, nullable=False)
|
||||||
sugar_100 = db.Column(db.Float)
|
sugar_100 = db.Column(db.Float)
|
||||||
@@ -68,7 +68,7 @@ class FoodItem(db.Model):
|
|||||||
self,
|
self,
|
||||||
name: str,
|
name: str,
|
||||||
owner_id: int,
|
owner_id: int,
|
||||||
energy: int,
|
energy: float,
|
||||||
protein: float,
|
protein: float,
|
||||||
carbs: float,
|
carbs: float,
|
||||||
fat: float,
|
fat: float,
|
||||||
|
|||||||
Reference in New Issue
Block a user