mirror of
https://github.com/StefBuwalda/cal_counter.git
synced 2025-10-30 03:10:00 +00:00
Enhanced the barcode scanner page with a search box and autocomplete suggestions for food items. Updated backend routes to support searching by both barcode and name, and added a new /query endpoint for AJAX search. Refactored step3 and step3_alt1 routes to handle both barcode and name inputs.
162 lines
4.6 KiB
Python
162 lines
4.6 KiB
Python
from flask import (
|
|
Blueprint,
|
|
redirect,
|
|
url_for,
|
|
render_template,
|
|
session,
|
|
request,
|
|
jsonify,
|
|
)
|
|
from flask_login import current_user
|
|
from forms import FoodItemForm, FoodLogForm
|
|
from application import db
|
|
from models import FoodItem, FoodLog
|
|
from sqlalchemy import and_
|
|
|
|
bp = Blueprint(
|
|
"add_meal",
|
|
__name__,
|
|
url_prefix="/add_meal",
|
|
template_folder="templates",
|
|
)
|
|
|
|
|
|
@bp.before_request
|
|
def login_required():
|
|
if not current_user.is_authenticated:
|
|
return redirect(url_for("login"))
|
|
|
|
|
|
@bp.route("/select_meal/<int:meal_type>", methods=["GET"])
|
|
def step1(meal_type: int):
|
|
assert type(meal_type) is int
|
|
assert 0 <= meal_type <= 3
|
|
session["meal_type"] = meal_type
|
|
return redirect(url_for("add_meal.step2"))
|
|
|
|
|
|
@bp.route("/get_barcode", methods=["GET"])
|
|
def step2():
|
|
return render_template("scan_barcode.html")
|
|
|
|
|
|
@bp.route("/step3/<string:input>", methods=["GET"])
|
|
def step3(input: str):
|
|
# check if meal_type cookie is set
|
|
if "meal_type" not in session:
|
|
return redirect("/")
|
|
|
|
# Check if input is a barcode
|
|
if input.isdigit():
|
|
item = current_user.food_items.filter_by(barcode=input).first()
|
|
if item is None:
|
|
# Does not exist, add item
|
|
return redirect(url_for("add_meal.step3_alt1", input=input))
|
|
else:
|
|
# input is not a number, must be the name of the item.
|
|
item = current_user.food_items.filter_by(name=input).first()
|
|
if item is None:
|
|
# Does not exist, add manually.
|
|
return redirect(url_for("add_meal.step3_alt1", input=input))
|
|
|
|
# Track item to add and continue to next step
|
|
session["item_id"] = item.id
|
|
return redirect(url_for("add_meal.step4"))
|
|
|
|
|
|
@bp.route("/step3_alt1/<string:input>", methods=["GET", "POST"])
|
|
def step3_alt1(input: str):
|
|
form = FoodItemForm()
|
|
if form.validate_on_submit():
|
|
print("[DEBUG] Valid form")
|
|
if (
|
|
current_user.food_items.filter_by(
|
|
barcode=form.barcode.data
|
|
).first()
|
|
is None
|
|
):
|
|
assert form.name.data is not None
|
|
assert form.energy.data is not None
|
|
assert form.protein.data is not None
|
|
assert form.carbs.data is not None
|
|
assert form.fat.data is not None
|
|
assert form.barcode.data is not None
|
|
db.session.add(
|
|
FoodItem(
|
|
name=form.name.data,
|
|
owner_id=current_user.id,
|
|
energy=form.energy.data,
|
|
protein=form.protein.data,
|
|
carbs=form.carbs.data,
|
|
fat=form.fat.data,
|
|
barcode=(
|
|
form.barcode.data
|
|
if form.barcode.data.isdigit()
|
|
else None
|
|
),
|
|
saturated_fat=form.saturated_fat.data,
|
|
sugar=form.sugar.data,
|
|
)
|
|
)
|
|
db.session.commit()
|
|
print("[DEBUG] New item added")
|
|
return redirect(url_for("add_meal.step3", barcode=form.barcode.data))
|
|
print("[DEBUG] Invalid form")
|
|
if input.isdigit():
|
|
form.barcode.data = input
|
|
else:
|
|
form.name.data = input
|
|
return render_template("add_item.html", form=form)
|
|
|
|
|
|
@bp.route("/step4", methods=["GET", "POST"])
|
|
def step4():
|
|
if "item_id" not in session:
|
|
return redirect(url_for("add_meal.step2"))
|
|
form = FoodLogForm()
|
|
item = db.session.get(FoodItem, session["item_id"])
|
|
|
|
assert item
|
|
if form.validate_on_submit():
|
|
assert form.amount.data
|
|
db.session.add(
|
|
FoodLog(
|
|
food_item_id=item.id,
|
|
user_id=current_user.id,
|
|
amount=form.amount.data,
|
|
part_of_day=session["meal_type"],
|
|
)
|
|
)
|
|
db.session.commit()
|
|
session.pop("meal_type")
|
|
session.pop("item_id")
|
|
return redirect("/")
|
|
|
|
match session["meal_type"]:
|
|
case 0:
|
|
tod = "Breakfast"
|
|
case 1:
|
|
tod = "Lunch"
|
|
case 2:
|
|
tod = "Dinner"
|
|
case 3:
|
|
tod = "Snack"
|
|
case _:
|
|
tod = "Unknown"
|
|
return render_template("step4.html", tod=tod, item=item, form=form)
|
|
|
|
|
|
@bp.route("/query", methods=["GET"])
|
|
def query():
|
|
q = request.args.get("q", "").strip().lower()
|
|
if not q:
|
|
return jsonify([])
|
|
|
|
words = q.split()
|
|
filters = [
|
|
FoodItem.name.ilike(f"%{word}%") for word in words # type: ignore
|
|
]
|
|
|
|
results = current_user.food_items.filter(and_(*filters)).all()
|
|
return jsonify([item.name for item in results])
|