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 details tabe

Browse Source
This commit is contained in:
sstent
2025-10-02 11:39:20 -07:00
parent 0c8173921f
commit 661dbdf0af
6 changed files with 215 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
app/api/routes/tracker.py
View File

@@ -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)