mirror of
https://github.com/StefBuwalda/cal_counter.git
synced 2025-10-29 19:00:00 +00:00
Stef
d5e8c3fa94
Renamed FoodItems to FoodItem and Units to Unit in models.py, updated related imports and usage throughout the codebase. Added a barcode scanner test page using ZXing in the admin section. Improved food_items.html to display nutritional information in a table. Registered the admin blueprint in app.py and cleaned up blueprint registration in __init__.py. Updated seed.py to use the new FoodItem model.
65 lines
2.1 KiB
Python
65 lines
2.1 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
|
|
|
|
|
|
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)
|
|
|
|
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)
|
|
name = db.Column(db.String(150), unique=True, nullable=False)
|
|
|
|
energy_100g = db.Column(db.Integer, nullable=False)
|
|
protein_100g = db.Column(db.Float, nullable=False)
|
|
carbs_100g = db.Column(db.Integer, nullable=False)
|
|
sugar_100g = db.Column(db.Integer)
|
|
fats_100g = db.Column(db.Integer, nullable=False)
|
|
saturated_fats_100g = db.Column(db.Integer)
|
|
|
|
def __init__(
|
|
self,
|
|
name: str,
|
|
energy: int,
|
|
protein: float,
|
|
carbs: int,
|
|
fats: int,
|
|
sugar: Optional[int] = False,
|
|
saturated_fats: Optional[int] = False,
|
|
):
|
|
self.name = name
|
|
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
|