mirror of
https://github.com/sstent/foodplanner.git
synced 2026-01-26 03:31:40 +00:00
fixing details tabe
This commit is contained in:
@@ -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, Plan, Template, TemplateMeal, WeeklyMenu, WeeklyMenuDay, TrackedDay, TrackedMeal, calculate_meal_nutrition, calculate_day_nutrition, calculate_tracked_meal_nutrition
|
||||
from app.database import get_db, Food, Meal, MealFood, Plan, Template, TemplateMeal, WeeklyMenu, WeeklyMenuDay, TrackedDay, TrackedMeal, TrackedMealFood, calculate_meal_nutrition, calculate_day_nutrition, calculate_tracked_meal_nutrition
|
||||
from sqlalchemy.orm import joinedload
|
||||
from main import templates
|
||||
|
||||
@@ -293,62 +293,109 @@ async def detailed(request: Request, person: str = "Sarah", plan_date: str = Non
|
||||
day_totals = {'calories': 0, 'protein': 0, 'carbs': 0, 'fat': 0, 'fiber': 0, 'sugar': 0, 'sodium': 0, 'calcium': 0}
|
||||
|
||||
if tracked_day:
|
||||
tracked_meals = db.query(TrackedMeal).filter(
|
||||
TrackedMeal.tracked_day_id == tracked_day.id
|
||||
).options(joinedload(TrackedMeal.meal).joinedload(Meal.meal_foods).joinedload(MealFood.food)).all()
|
||||
tracked_meals = db.query(TrackedMeal).options(
|
||||
joinedload(TrackedMeal.meal).joinedload(Meal.meal_foods).joinedload(MealFood.food),
|
||||
joinedload(TrackedMeal.tracked_foods).joinedload(TrackedMealFood.food)
|
||||
).filter(TrackedMeal.tracked_day_id == tracked_day.id).all()
|
||||
|
||||
logging.info(f"debug: found {len(tracked_meals)} tracked meals for {person} on {plan_date_obj}")
|
||||
|
||||
for tracked_meal in tracked_meals:
|
||||
meal_nutrition = calculate_tracked_meal_nutrition(tracked_meal, db)
|
||||
meal = tracked_meal.meal
|
||||
base_foods = {mf.food_id: mf for mf in meal.meal_foods}
|
||||
tracked_foods_list = tracked_meal.tracked_foods
|
||||
|
||||
final_foods = {}
|
||||
|
||||
# Process base foods
|
||||
for food_id, base_food in base_foods.items():
|
||||
final_foods[food_id] = {
|
||||
"food_obj": base_food.food,
|
||||
"total_grams": base_food.quantity,
|
||||
"is_deleted": False
|
||||
}
|
||||
|
||||
# Process tracked foods (overrides, additions, deletions)
|
||||
for tf in tracked_foods_list:
|
||||
if tf.is_deleted:
|
||||
if tf.food_id in final_foods:
|
||||
final_foods[tf.food_id]["is_deleted"] = True
|
||||
else:
|
||||
# This is an override or a new addition
|
||||
final_foods[tf.food_id] = {
|
||||
"food_obj": tf.food,
|
||||
"total_grams": tf.quantity,
|
||||
"is_deleted": False
|
||||
}
|
||||
|
||||
foods = []
|
||||
|
||||
# Show base meal foods
|
||||
for mf in tracked_meal.meal.meal_foods:
|
||||
try:
|
||||
serving_size_value = float(mf.food.serving_size)
|
||||
num_servings = mf.quantity / serving_size_value if serving_size_value != 0 else 0
|
||||
except (ValueError, TypeError):
|
||||
num_servings = 0 # Fallback for invalid serving_size
|
||||
for food_id, food_data in final_foods.items():
|
||||
if not food_data["is_deleted"]:
|
||||
food_obj = food_data["food_obj"]
|
||||
total_grams = food_data["total_grams"]
|
||||
|
||||
try:
|
||||
serving_size_value = float(food_obj.serving_size)
|
||||
num_servings = total_grams / serving_size_value if serving_size_value != 0 else 0
|
||||
except (ValueError, TypeError):
|
||||
num_servings = 0
|
||||
|
||||
foods.append({
|
||||
'name': food_obj.name,
|
||||
'total_grams': total_grams,
|
||||
'num_servings': num_servings,
|
||||
'serving_size': food_obj.serving_size,
|
||||
'serving_unit': food_obj.serving_unit,
|
||||
'calories': (food_obj.calories or 0) * num_servings,
|
||||
'protein': (food_obj.protein or 0) * num_servings,
|
||||
'carbs': (food_obj.carbs or 0) * num_servings,
|
||||
'fat': (food_obj.fat or 0) * num_servings,
|
||||
'fiber': (food_obj.fiber or 0) * num_servings,
|
||||
'sugar': (food_obj.sugar or 0) * num_servings,
|
||||
'sodium': (food_obj.sodium or 0) * num_servings,
|
||||
'calcium': (food_obj.calcium or 0) * num_servings,
|
||||
})
|
||||
|
||||
foods.append({
|
||||
'name': mf.food.name,
|
||||
'total_grams': mf.quantity,
|
||||
'num_servings': num_servings,
|
||||
'serving_size': mf.food.serving_size,
|
||||
'serving_unit': mf.food.serving_unit,
|
||||
'calories': (mf.food.calories or 0) * num_servings,
|
||||
'protein': (mf.food.protein or 0) * num_servings,
|
||||
'carbs': (mf.food.carbs or 0) * num_servings,
|
||||
'fat': (mf.food.fat or 0) * num_servings,
|
||||
'fiber': (mf.food.fiber or 0) * num_servings,
|
||||
'sodium': (mf.food.sodium or 0) * num_servings,
|
||||
})
|
||||
|
||||
# Show custom tracked foods (overrides/additions)
|
||||
for tracked_food in tracked_meal.tracked_foods:
|
||||
try:
|
||||
serving_size_value = float(tracked_food.food.serving_size)
|
||||
num_servings = tracked_food.quantity / serving_size_value if serving_size_value != 0 else 0
|
||||
except (ValueError, TypeError):
|
||||
num_servings = 0 # Fallback for invalid serving_size
|
||||
# Calculate effective meal nutrition
|
||||
if foods:
|
||||
cal_sum = sum(f['calories'] for f in foods)
|
||||
prot_sum = sum(f['protein'] for f in foods)
|
||||
carb_sum = sum(f['carbs'] for f in foods)
|
||||
fat_sum = sum(f['fat'] for f in foods)
|
||||
fiber_sum = sum(f['fiber'] for f in foods)
|
||||
sugar_sum = sum(f['sugar'] for f in foods)
|
||||
sodium_sum = sum(f['sodium'] for f in foods)
|
||||
calcium_sum = sum(f['calcium'] for f in foods)
|
||||
|
||||
meal_nutrition = {
|
||||
'calories': cal_sum,
|
||||
'protein': prot_sum,
|
||||
'carbs': carb_sum,
|
||||
'fat': fat_sum,
|
||||
'fiber': fiber_sum,
|
||||
'net_carbs': carb_sum - fiber_sum,
|
||||
'sugar': sugar_sum,
|
||||
'sodium': sodium_sum,
|
||||
'calcium': calcium_sum,
|
||||
}
|
||||
|
||||
if cal_sum > 0:
|
||||
meal_nutrition['protein_pct'] = round((prot_sum * 4 / cal_sum) * 100, 1)
|
||||
meal_nutrition['carbs_pct'] = round((carb_sum * 4 / cal_sum) * 100, 1)
|
||||
meal_nutrition['fat_pct'] = round((fat_sum * 9 / cal_sum) * 100, 1)
|
||||
else:
|
||||
meal_nutrition['protein_pct'] = 0
|
||||
meal_nutrition['carbs_pct'] = 0
|
||||
meal_nutrition['fat_pct'] = 0
|
||||
else:
|
||||
meal_nutrition = {
|
||||
'calories': 0, 'protein': 0, 'carbs': 0, 'fat': 0, 'fiber': 0,
|
||||
'net_carbs': 0, 'sugar': 0, 'sodium': 0, 'calcium': 0,
|
||||
'protein_pct': 0, 'carbs_pct': 0, 'fat_pct': 0
|
||||
}
|
||||
|
||||
foods.append({
|
||||
'name': f"{tracked_food.food.name} {'(override)' if tracked_food.is_override else '(addition)'}",
|
||||
'total_grams': tracked_food.quantity,
|
||||
'num_servings': num_servings,
|
||||
'serving_size': tracked_food.food.serving_size,
|
||||
'serving_unit': tracked_food.food.serving_unit,
|
||||
'calories': (tracked_food.food.calories or 0) * num_servings,
|
||||
'protein': (tracked_food.food.protein or 0) * num_servings,
|
||||
'carbs': (tracked_food.food.carbs or 0) * num_servings,
|
||||
'fat': (tracked_food.food.fat or 0) * num_servings,
|
||||
'fiber': (tracked_food.food.fiber or 0) * num_servings,
|
||||
'sodium': (tracked_food.food.sodium or 0) * num_servings,
|
||||
})
|
||||
|
||||
meal_details.append({
|
||||
'plan': tracked_meal, # Use tracked_meal instead of plan
|
||||
'plan': tracked_meal,
|
||||
'nutrition': meal_nutrition,
|
||||
'foods': foods
|
||||
})
|
||||
|
||||
@@ -50,10 +50,7 @@ async def tracker_page(request: Request, person: str = "Sarah", date: str = None
|
||||
TrackedMeal.tracked_day_id == tracked_day.id
|
||||
).all()
|
||||
|
||||
# Filter out deleted tracked foods from each tracked meal
|
||||
for tracked_meal in tracked_meals:
|
||||
tracked_meal.tracked_foods = [tf for tf in tracked_meal.tracked_foods if not tf.is_deleted]
|
||||
|
||||
# Template will handle filtering of deleted foods
|
||||
# Get all meals for dropdown
|
||||
meals = db.query(Meal).all()
|
||||
|
||||
@@ -672,131 +669,3 @@ async def tracker_add_food(data: dict = Body(...), db: Session = Depends(get_db)
|
||||
except Exception as e:
|
||||
db.rollback()
|
||||
return {"status": "error", "message": str(e)}
|
||||
|
||||
@router.get("/detailed_tracked_day", response_class=HTMLResponse, name="detailed_tracked_day")
|
||||
async def detailed_tracked_day(request: Request, person: str = "Sarah", date: Optional[str] = None, db: Session = Depends(get_db)):
|
||||
"""
|
||||
Displays a detailed view of a tracked day, including all meals and their food breakdowns.
|
||||
"""
|
||||
try:
|
||||
# If no date is provided, default to today's date
|
||||
if not date:
|
||||
current_date = date.today()
|
||||
else:
|
||||
try:
|
||||
current_date = datetime.fromisoformat(date).date()
|
||||
except ValueError:
|
||||
return templates.TemplateResponse("error.html", {
|
||||
"request": request,
|
||||
"error_title": "Invalid Date Format",
|
||||
"error_message": "The date format is invalid. Please use YYYY-MM-DD format.",
|
||||
"error_details": f"Date provided: {date}"
|
||||
}, status_code=400)
|
||||
|
||||
tracked_day = db.query(TrackedDay).filter(
|
||||
TrackedDay.person == person,
|
||||
TrackedDay.date == current_date
|
||||
).first()
|
||||
|
||||
if not tracked_day:
|
||||
return templates.TemplateResponse("detailed_tracked_day.html", {
|
||||
"request": request, "title": "No Tracked Day Found",
|
||||
"error": "No tracked meals found for this day.",
|
||||
"day_totals": {},
|
||||
"person": person,
|
||||
"plan_date": current_date # Pass current_date for consistent template behavior
|
||||
})
|
||||
|
||||
tracked_meals = db.query(TrackedMeal).options(
|
||||
joinedload(TrackedMeal.meal).joinedload(Meal.meal_foods).joinedload(MealFood.food),
|
||||
joinedload(TrackedMeal.tracked_foods).joinedload(TrackedMealFood.food)
|
||||
).filter(
|
||||
TrackedMeal.tracked_day_id == tracked_day.id
|
||||
).all()
|
||||
|
||||
# Filter out deleted tracked foods from each tracked meal
|
||||
for tracked_meal in tracked_meals:
|
||||
tracked_meal.tracked_foods = [tf for tf in tracked_meal.tracked_foods if not tf.is_deleted]
|
||||
|
||||
day_totals = calculate_day_nutrition_tracked(tracked_meals, db)
|
||||
|
||||
meal_details = []
|
||||
for tracked_meal in tracked_meals:
|
||||
meal_nutrition = calculate_meal_nutrition(tracked_meal.meal, db) # Base meal nutrition
|
||||
|
||||
foods = []
|
||||
# Add foods from the base meal definition
|
||||
for mf in tracked_meal.meal.meal_foods:
|
||||
try:
|
||||
serving_size_value = float(mf.food.serving_size)
|
||||
num_servings = mf.quantity / serving_size_value if serving_size_value != 0 else 0
|
||||
except (ValueError, TypeError):
|
||||
num_servings = 0 # Fallback for invalid serving_size
|
||||
|
||||
foods.append({
|
||||
'name': mf.food.name,
|
||||
'total_grams': mf.quantity,
|
||||
'num_servings': num_servings,
|
||||
'serving_size': mf.food.serving_size,
|
||||
'serving_unit': mf.food.serving_unit,
|
||||
'calories': mf.food.calories * num_servings,
|
||||
'protein': mf.food.protein * num_servings,
|
||||
'carbs': mf.food.carbs * num_servings,
|
||||
'fat': mf.food.fat * num_servings,
|
||||
'fiber': (mf.food.fiber or 0) * num_servings,
|
||||
'sugar': (mf.food.sugar or 0) * num_servings,
|
||||
'sodium': (mf.food.sodium or 0) * num_servings,
|
||||
'calcium': (mf.food.calcium or 0) * num_servings,
|
||||
})
|
||||
# Add custom tracked foods (overrides or additions)
|
||||
for tmf in tracked_meal.tracked_foods:
|
||||
try:
|
||||
serving_size_value = float(tmf.food.serving_size)
|
||||
num_servings = tmf.quantity / serving_size_value if serving_size_value != 0 else 0
|
||||
except (ValueError, TypeError):
|
||||
num_servings = 0 # Fallback for invalid serving_size
|
||||
|
||||
foods.append({
|
||||
'name': tmf.food.name,
|
||||
'total_grams': tmf.quantity,
|
||||
'num_servings': num_servings,
|
||||
'serving_size': tmf.food.serving_size,
|
||||
'serving_unit': tmf.food.serving_unit,
|
||||
'calories': tmf.food.calories * num_servings,
|
||||
'protein': tmf.food.protein * num_servings,
|
||||
'carbs': tmf.food.carbs * num_servings,
|
||||
'fat': tmf.food.fat * num_servings,
|
||||
'fiber': (tmf.food.fiber or 0) * num_servings,
|
||||
'sugar': (tmf.food.sugar or 0) * num_servings,
|
||||
'sodium': (tmf.food.sodium or 0) * num_servings,
|
||||
'calcium': (tmf.food.calcium or 0) * num_servings,
|
||||
})
|
||||
|
||||
meal_details.append({
|
||||
'plan': {'meal': tracked_meal.meal, 'meal_time': tracked_meal.meal_time},
|
||||
'nutrition': meal_nutrition,
|
||||
'foods': foods
|
||||
})
|
||||
|
||||
context = {
|
||||
"request": request,
|
||||
"title": f"Detailed Day for {person} on {current_date.strftime('%B %d, %Y')}",
|
||||
"meal_details": meal_details,
|
||||
"day_totals": day_totals,
|
||||
"person": person,
|
||||
"plan_date": current_date # Renamed from current_date to plan_date for consistency with detailed.html
|
||||
}
|
||||
|
||||
if not meal_details:
|
||||
context["message"] = "No meals tracked for this day."
|
||||
|
||||
return templates.TemplateResponse("detailed_tracked_day.html", context)
|
||||
|
||||
except Exception as e:
|
||||
# Return a detailed error page instead of generic Internal Server Error
|
||||
return templates.TemplateResponse("error.html", {
|
||||
"request": request,
|
||||
"error_title": "Error Loading Detailed View",
|
||||
"error_message": f"An error occurred while loading the detailed view: {str(e)}",
|
||||
"error_details": f"Person: {person}, Date: {date}"
|
||||
}, status_code=500)
|
||||
Reference in New Issue
Block a user