diff --git a/app/api/routes/plans.py b/app/api/routes/plans.py index 4ec50d7..a570ab2 100644 --- a/app/api/routes/plans.py +++ b/app/api/routes/plans.py @@ -290,7 +290,7 @@ async def detailed(request: Request, person: str = "Sarah", plan_date: str = Non context = { "request": request, - "title": f"{person}'s Detailed Plan for {plan_date_obj.strftime('%B %d, %Y')}", + "title": f"Detailed Plan for {person} on {plan_date_obj.strftime('%B %d, %Y')}" if person else "Detailed View", "meal_details": meal_details, "day_totals": day_totals, "person": person, diff --git a/app/api/routes/tracker.py b/app/api/routes/tracker.py index 8cb5ca2..59ee08e 100644 --- a/app/api/routes/tracker.py +++ b/app/api/routes/tracker.py @@ -87,7 +87,7 @@ async def tracker_add_meal(request: Request, db: Session = Depends(get_db)): date_str = form_data.get("date") meal_id = form_data.get("meal_id") meal_time = form_data.get("meal_time") - quantity = float(form_data.get("quantity", 1.0)) + quantity = 1.0 # Default quantity to 1.0 as the field is removed from the UI logging.info(f"DEBUG: Adding meal to tracker - person={person}, date={date_str}, meal_id={meal_id}, meal_time={meal_time}, quantity={quantity}") diff --git a/templates/tracker.html b/templates/tracker.html index a22c8c2..26a25bf 100644 --- a/templates/tracker.html +++ b/templates/tracker.html @@ -37,9 +37,6 @@ - @@ -69,10 +66,10 @@ {% endif %}
- -
@@ -101,9 +98,14 @@ - +
+ + +
{% endfor %} @@ -193,10 +195,6 @@ {% endfor %} -
- - -
- +
@@ -637,12 +635,13 @@ }).catch(error => console.error('Error updating quantity:', error)); } }); - - // Show add single food modal - function addSingleFood() { + // Show add single food modal and pre-select meal time + function addSingleFoodToTime(mealTime) { + document.querySelector('#addSingleFoodModal select[name="meal_time"]').value = mealTime; new bootstrap.Modal(document.getElementById('addSingleFoodModal')).show(); } + // Submit add single food form async function submitAddSingleFood() { const form = document.getElementById('addSingleFoodForm'); diff --git a/tests/test_detailed.py b/tests/test_detailed.py index 8294540..6a91ae5 100644 --- a/tests/test_detailed.py +++ b/tests/test_detailed.py @@ -43,7 +43,7 @@ def client_fixture(session): def test_detailed_page_no_params(client): response = client.get("/detailed") assert response.status_code == 200 - assert "Detailed View for" in response.text + assert "Detailed Plan for Sarah" in response.text def test_detailed_page_default_date(client, session):