mirror of
https://github.com/StefBuwalda/cal_counter.git
synced 2025-10-30 03:10:00 +00:00
Stef
c5acf7d19b
Removed the unused index.html template. Refactored the food item editing route to use a new updateFromForm method in the FoodItem model for updating fields from the form, simplifying the update logic and form population in routes.py.
101 lines
3.3 KiB
Python
101 lines
3.3 KiB
Python
from flask_login import UserMixin # type: ignore
|
|
from werkzeug.security import generate_password_hash, check_password_hash
|
|
from application import db
|
|
from typing import Optional
|
|
from forms import FoodItemForm
|
|
|
|
|
|
class User(UserMixin, db.Model):
|
|
__tablename__ = "user"
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
username = db.Column(db.String(150), unique=True, nullable=False)
|
|
password = db.Column(db.String, nullable=False)
|
|
is_admin = db.Column(db.Boolean, nullable=False, default=False)
|
|
|
|
food_items = db.relationship("FoodItem", lazy="dynamic")
|
|
|
|
def __init__(
|
|
self, username: str, password: str, is_admin: bool = False
|
|
) -> None:
|
|
super().__init__()
|
|
self.username = username
|
|
self.password = generate_password_hash(password=password)
|
|
self.is_admin = is_admin
|
|
|
|
def check_password(self, password: str) -> bool:
|
|
return check_password_hash(pwhash=self.password, password=password)
|
|
|
|
def change_password(self, password: str) -> None:
|
|
self.password = generate_password_hash(password=password)
|
|
|
|
|
|
class Unit(db.Model):
|
|
__tablename__ = "unit"
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
symbol = db.Column(db.String(10), unique=True, nullable=False)
|
|
name = db.Column(db.String(50), unique=True, nullable=False)
|
|
|
|
|
|
class FoodItem(db.Model):
|
|
__tablename__ = "food_item"
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
barcode = db.Column(db.Integer, nullable=False)
|
|
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)
|
|
|
|
__table_args__ = (
|
|
db.UniqueConstraint("barcode", "owner_id", name="barcode_owner_key"),
|
|
)
|
|
|
|
def __init__(
|
|
self,
|
|
name: str,
|
|
owner_id: int,
|
|
energy: int,
|
|
protein: float,
|
|
carbs: float,
|
|
fats: float,
|
|
barcode: int,
|
|
sugar: Optional[float] = None,
|
|
saturated_fats: 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.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
|
|
|
|
def to_dict(self):
|
|
return {
|
|
"id": self.id,
|
|
"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,
|
|
}
|