sstent/foodplanner
1
0
Fork 0
mirror of https://github.com/sstent/foodplanner.git synced 2025-12-06 08:01:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing quantities in meals page

Browse Source
This commit is contained in:
sstent
2025-10-01 06:25:48 -07:00
parent c79b42867b
commit 3371d7fa8e
4 changed files with 35 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/api/routes/meals.py
View File

@@ -6,7 +6,7 @@ import logging
from typing import List, Optional
# Import from the database module
from app.database import get_db, Food, Meal, MealFood, convert_grams_to_quantity
from app.database import get_db, Food, Meal, MealFood
from main import templates
router = APIRouter()
@@ -47,7 +47,7 @@ async def bulk_upload_meals(file: UploadFile = File(...), db: Session = Depends(
food_name = row[i].strip()
grams = float(row[i+1].strip())
quantity = convert_grams_to_quantity(food.id, grams, db)
quantity = grams
# Try multiple matching strategies for food names
food = None
@@ -183,8 +183,7 @@ async def add_food_to_meal(meal_id: int, food_id: int = Form(...),
grams: float = Form(..., alias="quantity"), db: Session = Depends(get_db)):
try:
quantity = convert_grams_to_quantity(food_id, grams, db)
meal_food = MealFood(meal_id=meal_id, food_id=food_id, quantity=quantity)
meal_food = MealFood(meal_id=meal_id, food_id=food_id, quantity=grams)
db.add(meal_food)
db.commit()
return {"status": "success"}
@@ -218,8 +217,7 @@ async def update_meal_food_quantity(meal_food_id: int = Form(...), grams: float
if not meal_food:
return {"status": "error", "message": "Meal food not found"}
quantity = convert_grams_to_quantity(meal_food.food_id, grams, db)
meal_food.quantity = quantity
meal_food.quantity = grams
db.commit()
return {"status": "success"}
except ValueError as ve: