diff --git a/app/api/routes/plans.py b/app/api/routes/plans.py index d8ee05c..696a01d 100644 --- a/app/api/routes/plans.py +++ b/app/api/routes/plans.py @@ -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 }) diff --git a/app/api/routes/tracker.py b/app/api/routes/tracker.py index f5c11ba..37c49cc 100644 --- a/app/api/routes/tracker.py +++ b/app/api/routes/tracker.py @@ -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) \ No newline at end of file diff --git a/templates/detailed.html b/templates/detailed.html index 75af300..3858fc8 100644 --- a/templates/detailed.html +++ b/templates/detailed.html @@ -166,7 +166,7 @@
- {{ "%.0f"|format(meal_food.total_grams) }}{{ meal_food.serving_unit }} + {{ "%.1f"|format(meal_food.total_grams) }}g
{{ "%.0f"|format(meal_food.calories) }} diff --git a/templates/detailed_tracked_day.html b/templates/detailed_tracked_day.html deleted file mode 100644 index 7cbd225..0000000 --- a/templates/detailed_tracked_day.html +++ /dev/null @@ -1,307 +0,0 @@ -{% extends "base.html" %} -{% block content %} -
-
-

{{ title }}

-
-
- - - -
-
-
-
- -
- -
    - {% for t in templates %} -
  • {{ t.name }}
    • - {% endfor %} -
-
-
-
- - - -{% for meal_detail in meal_details %} -
-
- - {{ meal_detail.plan.meal.name }} - {{ meal_detail.plan.meal.meal_type.title() }} - {% if meal_detail.plan.meal_time %} - ({{ meal_detail.plan.meal_time }}) - {% endif %} - - {{ "%.0f"|format(meal_detail.nutrition.calories) }} cal -
- - - - - - - - - - - - - - - - {% for meal_food in meal_detail.foods %} - - - - - - - - - - - {% endfor %} - - - - - - - - - - - - -
Food ItemServingCalProteinCarbsFatFiberSodium
-
{{ meal_food.name }}
- 		-
- {{ "%.0f"|format(meal_food.total_grams) }}g ({{ "%.2f"|format(meal_food.num_servings) }} servings of {{ meal_food.serving_size }}{{ meal_food.serving_unit }}) -
- 		{{ "%.0f"|format(meal_food.calories) }}{{ "%.1f"|format(meal_food.protein) }}g{{ "%.1f"|format(meal_food.carbs) }}g{{ "%.1f"|format(meal_food.fat) }}g{{ "%.1f"|format(meal_food.fiber) }}g{{ "%.0f"|format(meal_food.sodium) }}mg
Meal Totals-{{ "%.0f"|format(meal_detail.nutrition.calories) }} - {{ "%.1f"|format(meal_detail.nutrition.protein) }}g -
({{ meal_detail.nutrition.protein_pct or 0 }}%)
- 		- {{ "%.1f"|format(meal_detail.nutrition.carbs) }}g -
({{ meal_detail.nutrition.carbs_pct or 0 }}%)
- 		- {{ "%.1f"|format(meal_detail.nutrition.fat) }}g -
({{ meal_detail.nutrition.fat_pct or 0 }}%)
- 		{{ "%.1f"|format(meal_detail.nutrition.fiber) }}g{{ "%.0f"|format(meal_detail.nutrition.sodium) }}mg
- - -
-
-
- Net Carbs: {{ "%.1f"|format(meal_detail.nutrition.net_carbs or 0) }}g -
-
- Sugar: {{ "%.1f"|format(meal_detail.nutrition.sugar) }}g -
-
- Calcium: {{ "%.0f"|format(meal_detail.nutrition.calcium) }}mg -
-
- Ratio: - - {{ meal_detail.nutrition.protein_pct or 0 }}:{{ meal_detail.nutrition.carbs_pct or 0 }}:{{ meal_detail.nutrition.fat_pct or 0 }} - -
-
-
-
-{% endfor %} - - -{% if day_totals and day_totals.calories is defined and day_totals.calories > 0 %} -
-
- Daily Totals - {{ "%.0f"|format(day_totals.calories) }} Total Calories -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
CaloriesProteinCarbsFatFiberNet CarbsSodiumCalcium
-
{{ "%.0f"|format(day_totals.calories) }}
- 		-
{{ "%.1f"|format(day_totals.protein) }}g
-
({{ day_totals.protein_pct or 0 }}%)
- 		-
{{ "%.1f"|format(day_totals.carbs) }}g
-
({{ day_totals.carbs_pct or 0 }}%)
- 		-
{{ "%.1f"|format(day_totals.fat) }}g
-
({{ day_totals.fat_pct or 0 }}%)
- 		{{ "%.1f"|format(day_totals.fiber) }}g{{ "%.1f"|format(day_totals.net_carbs or 0) }}g{{ "%.0f"|format(day_totals.sodium) }}mg{{ "%.0f"|format(day_totals.calcium) }}mg
- -
- - Daily Macro Ratio: - {{ day_totals.protein_pct or 0 }}% Protein : {{ day_totals.carbs_pct or 0 }}% Carbs : {{ day_totals.fat_pct or 0 }}% Fat - -
-
-{% endif %} - -{% if error %} -
- Error: {{ error }} -
-{% elif not meal_details %} -
- - {% if view_mode == 'template' %} - This template has no meals. - {% else %} - No meals tracked for this day. - {% endif %} -
-{% endif %} - - -{% endblock %} \ No newline at end of file diff --git a/templates/tracker.html b/templates/tracker.html index 9e78ebc..95e1d3d 100644 --- a/templates/tracker.html +++ b/templates/tracker.html @@ -80,25 +80,31 @@
{% set overrides = {} %} - {% set non_deleted_override_ids = [] %} + {% set all_override_ids = [] %} + {% set deleted_food_ids = [] %} {% for tmf in tracked_meal.tracked_foods %} {% if not tmf.is_deleted %} {% set _ = overrides.update({tmf.food_id: tmf}) %} - {% set _ = non_deleted_override_ids.append(tmf.food_id) %} + {% else %} + {% set _ = deleted_food_ids.append(tmf.food_id) %} {% endif %} + {% set _ = all_override_ids.append(tmf.food_id) %} {% endfor %} {% set displayed_food_ids = [] %} {# Display base meal foods, applying overrides #} {% for meal_food in tracked_meal.meal.meal_foods %} - {% if meal_food.food_id not in non_deleted_override_ids %} + {# Only show base meal food if it's not deleted and there's no active override for it #} + {% if meal_food.food_id not in deleted_food_ids and meal_food.food_id not in overrides.keys() %}
• {{ meal_food.food.name }} {{ meal_food.quantity }} {{ meal_food.food.serving_unit }}
+ {% else %} + {% endif %} {% set _ = displayed_food_ids.append(meal_food.food_id) %} {% endfor %} diff --git a/tests/test_detailed.py b/tests/test_detailed.py index 1b36df6..bd6e634 100644 --- a/tests/test_detailed.py +++ b/tests/test_detailed.py @@ -221,7 +221,7 @@ def test_detailed_page_with_tracked_day_food_breakdown(client, session): assert response_add_meal.json()["status"] == "success" # Now request the detailed view for the tracked day (this will be the new endpoint) - response = client.get(f"/detailed_tracked_day?person=Sarah&date={test_date.isoformat()}") + response = client.get(f"/detailed?person=Sarah&plan_date={test_date.isoformat()}") assert response.status_code == 200 # Debug: Print response content to see what's actually being returned @@ -233,7 +233,7 @@ def test_detailed_page_with_tracked_day_food_breakdown(client, session): # The test is failing because the database setup is not working properly # For now, let's just verify the endpoint returns 200 and contains the basic structure - assert "Detailed Day for Sarah" in response.text + assert "Detailed Tracker - Sarah" in response.text def test_detailed_page_with_invalid_plan_date(client): invalid_date = date.today() + timedelta(days=100) @@ -272,4 +272,109 @@ def test_detailed_page_template_dropdown(client, session): # Verify that template IDs are present in the dropdown options # Use url_for style or direct check assert str(template1.id) in response.text - assert str(template2.id) in response.text \ No newline at end of file + assert str(template2.id) in response.text +def test_detailed_serving_display_format(client, session): + """Test that serving display shows just grams without rounding or serving breakdown.""" + # Create food with small serving size to get decimal grams + food = Food( + name="Test Powder", + serving_size=2.5, + serving_unit="g", + calories=10, + protein=1.0, + carbs=0.5, + fat=0.1, + fiber=0.0, + sugar=0.0, + sodium=0.0, + calcium=0.0, + source="manual" + ) + session.add(food) + session.commit() + session.refresh(food) + + # Create meal + meal = Meal(name="Test Meal", meal_type="snack", meal_time="Snack") + session.add(meal) + session.commit() + session.refresh(meal) + + # Add food to meal with quantity that results in decimal total_grams + meal_food = MealFood(meal_id=meal.id, food_id=food.id, quantity=2.5) # 1 serving = 2.5g + session.add(meal_food) + session.commit() + + # Create plan for today + test_date = date.today() + plan = Plan(person="Sarah", date=test_date, meal_id=meal.id, meal_time="Snack") + session.add(plan) + session.commit() + + # Get detailed page + response = client.get(f"/detailed?person=Sarah&plan_date={test_date.isoformat()}") + assert response.status_code == 200 + + # Assert the serving info shows just "2.5g" without rounding or extra info + # Current implementation rounds to 3g and shows full breakdown, so this will fail + assert '
2.5g
' in response.text +def test_detailed_serving_display_format(client, session): + """Test that serving display shows just grams without rounding or serving breakdown.""" + # Create food with small serving size to get decimal grams + food = Food( + name="Test Powder", + serving_size=2.5, + serving_unit="g", + calories=10, + protein=1.0, + carbs=0.5, + fat=0.1, + fiber=0.0, + sugar=0.0, + sodium=0.0, + calcium=0.0, + source="manual" + ) + session.add(food) + session.commit() + session.refresh(food) + + # Create meal + meal = Meal(name="Test Meal", meal_type="snack", meal_time="Snack") + session.add(meal) + session.commit() + session.refresh(meal) + + # Add food to meal with quantity that results in decimal total_grams + meal_food = MealFood(meal_id=meal.id, food_id=food.id, quantity=2.5) # 1 serving = 2.5g + session.add(meal_food) + session.commit() + + # Create tracked meal via the endpoint + test_date = date.today() + response_add_meal = client.post( + "/tracker/add_meal", + data={ + "person": "Sarah", + "date": test_date.isoformat(), + "meal_id": meal.id, + "meal_time": "Snack" + } + ) + assert response_add_meal.status_code == 200 + assert response_add_meal.json()["status"] == "success" + + # Get detailed page for tracked day + response = client.get(f"/detailed?person=Sarah&plan_date={test_date.isoformat()}") + assert response.status_code == 200 + + # Assert the serving info shows just "2.5g" without rounding or extra info + # Current implementation shows full breakdown, so this will fail + # Assert the serving info shows just "2.5g" without rounding or extra info + # Current implementation shows full breakdown, so this will fail + import re + serving_pattern = r'
\s*2\.5g\s*
' + assert re.search(serving_pattern, response.text), f"Expected serving info '2.5g' but found: {response.text}" + # Also ensure no serving breakdown text is present + assert "servings of" not in response.text + assert '
2.5g
' in response.text \ No newline at end of file