diff --git a/app.py b/app.py index 6d0f516..d4c42a9 100644 --- a/app.py +++ b/app.py @@ -123,9 +123,9 @@ def add_food_item(): energy=form.energy.data, protein=form.protein.data, carbs=form.carbs.data, - fats=form.fat.data, + fat=form.fat.data, barcode=form.barcode.data, - saturated_fats=form.saturated_fat.data, + saturated_fat=form.saturated_fat.data, sugar=form.sugar.data, ) ) diff --git a/application/admin/templates/food_items.html b/application/admin/templates/food_items.html index 2ee2348..eaa40a0 100644 --- a/application/admin/templates/food_items.html +++ b/application/admin/templates/food_items.html @@ -13,8 +13,8 @@ Food Nutritional Info Name Energy (kcal) - Fats (g) - Saturated Fats (g) + fat (g) + Saturated fat (g) Sugars (g) Carbs (g) Protein (g) @@ -25,12 +25,12 @@ Food Nutritional Info {% for food in items %} {{ food.name }} - {{ food.energy_100g }} - {{ food.fats_100g }} - {{ food.saturated_fats_100g }} - {{ food.sugar_100g }} - {{ food.carbs_100g }} - {{ food.protein_100g }} + {{ food.energy_100 }} + {{ food.fat_100 }} + {{ food.saturated_fat_100 }} + {{ food.sugar_100 }} + {{ food.carbs_100 }} + {{ food.protein_100 }}
diff --git a/application/templates/food_item.html b/application/templates/food_item.html index 0d5f8ea..3aa70d3 100644 --- a/application/templates/food_item.html +++ b/application/templates/food_item.html @@ -9,30 +9,30 @@
Energy per 100g
-
{{ item.energy_100g }} kcal
+
{{ item.energy_100 }} kcal
Protein per 100g
-
{{ "%.1f"|format(item.protein_100g) }} g
+
{{ "%.1f"|format(item.protein_100) }} g
Carbohydrates per 100g
-
{{ "%.1f"|format(item.carbs_100g) }} g
+
{{ "%.1f"|format(item.carbs_100) }} g
Sugar per 100g
- {% if item.sugar_100g is not none %} - {{ "%.1f"|format(item.sugar_100g) }} g + {% if item.sugar_100 is not none %} + {{ "%.1f"|format(item.sugar_100) }} g {% else %} N/A {% endif %}
-
Fats per 100g
-
{{ "%.1f"|format(item.fats_100g) }} g
+
fat per 100g
+
{{ "%.1f"|format(item.fat_100) }} g
-
Saturated fats per 100g
+
Saturated fat per 100g
- {% if item.saturated_fats_100g is not none %} - {{ "%.1f"|format(item.saturated_fats_100g) }} g + {% if item.saturated_fat_100 is not none %} + {{ "%.1f"|format(item.saturated_fat_100) }} g {% else %} N/A {% endif %} diff --git a/application/user/routes.py b/application/user/routes.py index d07c90f..e08781c 100644 --- a/application/user/routes.py +++ b/application/user/routes.py @@ -56,12 +56,12 @@ def edit_food_item(barcode: int): return redirect(url_for("user.dashboard")) form.barcode.data = item.barcode form.name.data = item.name - form.energy.data = item.energy_100g - form.protein.data = item.protein_100g - form.carbs.data = item.carbs_100g - form.sugar.data = item.sugar_100g - form.fat.data = item.fats_100g - form.saturated_fat.data = item.saturated_fats_100g + form.energy.data = item.energy_100 + form.protein.data = item.protein_100 + form.carbs.data = item.carbs_100 + form.sugar.data = item.sugar_100 + form.fat.data = item.fat_100 + form.saturated_fat.data = item.saturated_fat_100 return render_template("edit_food_item.html", form=form) else: return redirect(url_for("user.dashboard")) diff --git a/application/user/templates/dashboard.html b/application/user/templates/dashboard.html index 5340ed4..e644f6c 100644 --- a/application/user/templates/dashboard.html +++ b/application/user/templates/dashboard.html @@ -13,8 +13,8 @@ Food Nutritional Info Name Energy (kcal) - Fats (g) - Saturated Fats (g) + fat (g) + Saturated fat (g) Sugars (g) Carbs (g) Protein (g) @@ -25,12 +25,12 @@ Food Nutritional Info {% for food in items %} {{ food.name }} - {{ food.energy_100g }} - {{ food.fats_100g }} - {{ food.saturated_fats_100g }} - {{ food.sugar_100g }} - {{ food.carbs_100g }} - {{ food.protein_100g }} + {{ food.energy_100 }} + {{ food.fat_100 }} + {{ food.saturated_fat_100 }} + {{ food.sugar_100 }} + {{ food.carbs_100 }} + {{ food.protein_100 }}
diff --git a/models.py b/models.py index 052ba8b..4459e58 100644 --- a/models.py +++ b/models.py @@ -43,12 +43,12 @@ class FoodItem(db.Model): owner_id = db.Column(db.Integer, db.ForeignKey("user.id"), nullable=False) name = db.Column(db.String(150), nullable=False) - energy_100g = db.Column(db.Integer, nullable=False) - protein_100g = db.Column(db.Float, nullable=False) - carbs_100g = db.Column(db.Float, nullable=False) - sugar_100g = db.Column(db.Float) - fats_100g = db.Column(db.Float, nullable=False) - saturated_fats_100g = db.Column(db.Float) + energy_100 = db.Column(db.Integer, nullable=False) + protein_100 = db.Column(db.Float, nullable=False) + carbs_100 = db.Column(db.Float, nullable=False) + sugar_100 = db.Column(db.Float) + fat_100 = db.Column(db.Float, nullable=False) + saturated_fat_100 = db.Column(db.Float) __table_args__ = ( db.UniqueConstraint("barcode", "owner_id", name="barcode_owner_key"), @@ -61,29 +61,29 @@ class FoodItem(db.Model): energy: int, protein: float, carbs: float, - fats: float, + fat: float, barcode: int, sugar: Optional[float] = None, - saturated_fats: Optional[float] = None, + saturated_fat: Optional[float] = None, ): self.name = name self.owner_id = owner_id - self.energy_100g = energy - self.protein_100g = protein - self.carbs_100g = carbs - self.sugar_100g = sugar - self.fats_100g = fats - self.saturated_fats_100g = saturated_fats + self.energy_100 = energy + self.protein_100 = protein + self.carbs_100 = carbs + self.sugar_100 = sugar + self.fat_100 = fat + self.saturated_fat_100 = saturated_fat self.barcode = barcode def updateFromForm(self, form: FoodItemForm): self.name = form.name.data - self.energy_100g = form.energy.data - self.protein_100g = form.protein.data - self.carbs_100g = form.carbs.data - self.sugar_100g = form.sugar.data - self.fats_100g = form.fat.data - self.saturated_fats_100g = form.saturated_fat.data + self.energy_100 = form.energy.data + self.protein_100 = form.protein.data + self.carbs_100 = form.carbs.data + self.sugar_100 = form.sugar.data + self.fat_100 = form.fat.data + self.saturated_fat_100 = form.saturated_fat.data def to_dict(self): return { @@ -91,10 +91,10 @@ class FoodItem(db.Model): "barcode": self.barcode, "name": self.name, "owner_id": self.owner_id, - "energy_100g": self.energy_100g, - "protein_100g": self.protein_100g, - "carbs_100g": self.carbs_100g, - "sugar_100g": self.sugar_100g, - "fats_100g": self.fats_100g, - "saturated_fats_100g": self.saturated_fats_100g, + "energy_100": self.energy_100, + "protein_100": self.protein_100, + "carbs_100": self.carbs_100, + "sugar_100": self.sugar_100, + "fat_100": self.fat_100, + "saturated_fat_100": self.saturated_fat_100, } diff --git a/seed.py b/seed.py index 9cfb597..dbc3e05 100644 --- a/seed.py +++ b/seed.py @@ -12,10 +12,10 @@ with app.app_context(): name="AH Matcha cookie", owner_id=1, energy=430, - fats=19, + fat=19, carbs=59, protein=5.5, - saturated_fats=10, + saturated_fat=10, sugar=35, barcode=2278012003502, )