diff --git a/main/food/forms.py b/main/food/forms.py index 69e4067..4fd291c 100644 --- a/main/food/forms.py +++ b/main/food/forms.py @@ -1,6 +1,6 @@ from django import forms -from .models import FoodProduct, Unit +from .models import FoodLogEntry, FoodProduct, MealType class ManualFoodForm(forms.ModelForm): @@ -18,3 +18,23 @@ class ManualFoodForm(forms.ModelForm): super().__init__(*args, **kwargs) for field in ('energy_kcal_100', 'carbohydrates_100', 'protein_100', 'fat_100'): self.fields[field].required = True + + +class FoodLogForm(forms.ModelForm): + class Meta: + model = FoodLogEntry + fields = ('meal', 'amount', 'unit', 'portion_label_snapshot') + labels = {'portion_label_snapshot': 'Portion label (optional)'} + widgets = {'amount': forms.NumberInput(attrs={'min': '0.001', 'step': '0.001'})} + + def __init__(self, *args, product=None, **kwargs): + super().__init__(*args, **kwargs) + self.product = product or getattr(self.instance, 'product', None) + if self.product and self.product.pk: + self.fields['unit'].initial = self.product.base_unit + + def clean_unit(self): + unit = self.cleaned_data['unit'] + if self.product and unit != self.product.base_unit: + raise forms.ValidationError('Use the same unit as the product nutrition basis.') + return unit diff --git a/main/food/services/diary.py b/main/food/services/diary.py new file mode 100644 index 0000000..1bfdab9 --- /dev/null +++ b/main/food/services/diary.py @@ -0,0 +1,49 @@ +from datetime import timedelta +from decimal import Decimal + +from django.utils import timezone +from django.utils.dateparse import parse_date + +from food.models import FoodLogEntry, MealType +from planner.models import UserSettings +from planner.timezones import localdate_for_user + + +ZERO = Decimal('0') + + +def selected_date(request): + value = request.GET.get('date') or request.POST.get('date') + if not value: + return localdate_for_user(request.user) + day = parse_date(value) + if day is None or day.isoformat() != value: + raise ValueError('Enter a valid date in YYYY-MM-DD format.') + return day + + +def diary_context(user, day): + goals, _ = UserSettings.objects.get_or_create(user=user) + entries = list(FoodLogEntry.objects.filter(user=user, date=day).select_related('product')) + totals = {name: sum((getattr(entry, name) or ZERO for entry in entries), ZERO) for name in + ('calories_kcal', 'carbohydrates_g', 'protein_g', 'fat_g')} + meals = [] + for key, label in MealType.choices: + items = [entry for entry in entries if entry.meal == key] + meals.append({'key': key, 'label': label, 'entries': items, + 'calories': sum((entry.calories_kcal or ZERO for entry in items), ZERO)}) + macros = [] + for label, name, goal, color in ( + ('Carbohydrates', 'carbohydrates_g', goals.carbohydrate_goal_g, 'pink'), + ('Protein', 'protein_g', goals.protein_goal_g, 'blue'), + ('Fat', 'fat_g', goals.fat_goal_g, 'orange'), + ): + eaten = totals[name] + macros.append({'label': label, 'eaten': eaten, 'goal': goal, 'remaining': goal - eaten if goal is not None else None, + 'percent': min(100, int(eaten * 100 / goal)) if goal else None, 'color': color}) + calorie_goal = goals.daily_calorie_goal + calories = totals['calories_kcal'] + return {'day': day, 'previous_day': day - timedelta(days=1), 'next_day': day + timedelta(days=1), + 'meals': meals, 'totals': totals, 'macros': macros, 'calorie_goal': calorie_goal, + 'calorie_remaining': Decimal(calorie_goal) - calories if calorie_goal is not None else None, + 'calorie_percent': min(100, int(calories * 100 / calorie_goal)) if calorie_goal else 0} diff --git a/main/food/static/food/food.css b/main/food/static/food/food.css new file mode 100644 index 0000000..63469b4 --- /dev/null +++ b/main/food/static/food/food.css @@ -0,0 +1,2 @@ +.food-page{max-width:1180px;margin:0 auto;padding:1.5rem 0 4rem}.food-heading,.food-meal-heading{display:flex;justify-content:space-between;align-items:center;gap:1rem}.food-heading nav{display:flex;gap:.5rem;align-items:center}.food-heading nav a,.food-add-meal{display:inline-flex;align-items:center;justify-content:center;min-width:44px;min-height:44px;border:1px solid currentColor;border-radius:50%;text-decoration:none}.food-layout{display:grid;grid-template-columns:minmax(0,1fr) minmax(290px,340px);gap:2rem;align-items:start}.food-sidebar{position:sticky;top:1rem}.food-card{background:var(--surface,#222);border:1px solid var(--border,#555);border-radius:1.2rem;padding:1.2rem;margin-bottom:1rem}.food-card h2,.food-card h3{margin:.1rem 0 .5rem}.food-remaining{font-size:1.45rem;font-weight:700}.food-progress{height:.65rem;background:#7776;border-radius:2rem;overflow:hidden}.food-progress span{display:block;height:100%;background:#62bd70;border-radius:inherit}.food-macros{display:grid;gap:.7rem}.food-macro{display:flex;align-items:center;gap:1rem}.food-macro p{margin:.15rem 0}.food-ring{--accent:#d45b8b;flex:none;width:74px;height:74px;border-radius:50%;display:grid;place-items:center;background:conic-gradient(var(--accent) var(--progress,0%),#7776 0)}.food-ring span{display:grid;place-items:center;width:60px;height:60px;background:var(--surface,#222);border-radius:50%;font-weight:700}.food-macro--blue{--accent:#53a9e7}.food-macro--orange{--accent:#e87952}.food-meal{margin-bottom:1.5rem}.food-meal-heading h2{margin:0}.food-meal-heading p{margin:.1rem 0;color:#62bd70}.food-add-meal{color:#62bd70;font-size:1.8rem}.food-entry-list,.food-product-list{list-style:none;margin:.8rem 0;padding:0}.food-entry,.food-product-list li{background:var(--surface,#222);border:1px solid var(--border,#555);padding:1rem;border-radius:1rem;margin:.4rem 0}.food-entry{display:flex;align-items:center;justify-content:space-between;gap:1rem}.food-entry-main{display:flex;align-items:center;gap:.8rem;min-width:0}.food-entry-main img{width:64px;height:64px;object-fit:contain;background:white;border-radius:.6rem}.food-entry-main strong,.food-entry-main span,.food-entry-main small{display:block}.food-entry-main small,.food-entry-main span,.food-empty{opacity:.75}.food-form-page{max-width:620px;margin:1.5rem auto 4rem}.food-form-page .food-card{margin-top:1rem}.food-search{display:flex;flex-wrap:wrap;gap:.6rem;align-items:center}.food-search input{min-width:180px;flex:1}.food-product-list a{display:block;min-height:44px;align-content:center}.food-form-page details dl{display:grid;grid-template-columns:1fr 1fr;gap:.4rem}.food-form-page details dd{margin:0;text-align:right}@media(max-width:760px){.food-layout{display:flex;flex-direction:column-reverse;gap:1rem}.food-sidebar{position:static;width:100%}.food-macros{grid-template-columns:repeat(3,minmax(0,1fr));gap:.4rem}.food-macro{display:block;padding:.65rem;text-align:center}.food-ring{margin:auto;width:58px;height:58px}.food-ring span{width:46px;height:46px;font-size:.8rem}.food-macro h3{font-size:.9rem;overflow-wrap:anywhere}.food-macro p{font-size:.8rem}.food-heading h1{font-size:1.5rem}.food-page{padding-top:.5rem}}@media(max-width:400px){.food-macros{grid-template-columns:1fr}.food-macro{display:flex;text-align:left}.food-ring{margin:0}}@media(prefers-reduced-motion:reduce){.food-page *{scroll-behavior:auto!important;animation:none!important;transition:none!important}} +.food-product-image{display:block;max-width:180px;max-height:180px;object-fit:contain;background:#fff;border-radius:1rem;margin:0 auto 1rem} diff --git a/main/food/templates/food/add.html b/main/food/templates/food/add.html new file mode 100644 index 0000000..72297b3 --- /dev/null +++ b/main/food/templates/food/add.html @@ -0,0 +1,3 @@ +{% extends 'planner/base.html' %}{% load static %} +{% block title %}Add food · Tasknest{% endblock %} +{% block content %}
← Back to diary

Add food

{% if product %}
{% if product.image_url %}{% endif %}

{{ product.product_name }}

{% if product.brand %}

{{ product.brand }}

{% endif %}

Per 100 {{ product.base_unit }}: {% if product.energy_kcal_100 is not None %}{{ product.energy_kcal_100|floatformat:0 }} kcal{% else %}— kcal{% endif %}

Nutrition information
Carbohydrates
{{ product.carbohydrates_100|default_if_none:'—' }} g
Protein
{{ product.protein_100|default_if_none:'—' }} g
Fat
{{ product.fat_100|default_if_none:'—' }} g
Sugars
{{ product.sugars_100|default_if_none:'—' }} g
Fibre
{{ product.fibre_100|default_if_none:'—' }} g
Salt
{{ product.salt_100|default_if_none:'—' }} g
{% csrf_token %}{% for field in form %}
{{ field.label_tag }}{{ field }}{{ field.errors }}
{% endfor %}
{% else %}Create a food manually{% endif %}
{% endblock %} diff --git a/main/food/templates/food/diary.html b/main/food/templates/food/diary.html index ebcf304..3eb413f 100644 --- a/main/food/templates/food/diary.html +++ b/main/food/templates/food/diary.html @@ -1,13 +1,7 @@ {% extends 'planner/base.html' %} - +{% load static %} {% block title %}Food · Tasknest{% endblock %} - {% block content %} -
-
-

Food

-

Food diary

-

Food logging is coming soon.

-
-
+ +{% include 'food/partials/diary_content.html' %} {% endblock %} diff --git a/main/food/templates/food/edit.html b/main/food/templates/food/edit.html new file mode 100644 index 0000000..5c564eb --- /dev/null +++ b/main/food/templates/food/edit.html @@ -0,0 +1,3 @@ +{% extends 'planner/base.html' %}{% load static %} +{% block title %}Edit food log · Tasknest{% endblock %} +{% block content %}
← Back to diary

{{ entry.product_name_snapshot }}

{% if entry.brand_snapshot %}

{{ entry.brand_snapshot }}

{% endif %}

{% if entry.calories_kcal is not None %}{{ entry.calories_kcal|floatformat:0 }} kcal{% else %}— kcal{% endif %} · {{ entry.carbohydrates_g|default_if_none:'—' }} g carbs · {{ entry.protein_g|default_if_none:'—' }} g protein · {{ entry.fat_g|default_if_none:'—' }} g fat

Nutrition information
Fibre
{{ entry.fibre_g|default_if_none:'—' }} g
Sugars
{{ entry.sugars_g|default_if_none:'—' }} g
Salt
{{ entry.salt_g|default_if_none:'—' }} g
{% csrf_token %}{% for field in form %}
{{ field.label_tag }}{{ field }}{{ field.errors }}
{% endfor %}
{% csrf_token %}
{% endblock %} diff --git a/main/food/templates/food/manual.html b/main/food/templates/food/manual.html new file mode 100644 index 0000000..2f197ca --- /dev/null +++ b/main/food/templates/food/manual.html @@ -0,0 +1,3 @@ +{% extends 'planner/base.html' %}{% load static %} +{% block title %}Create food · Tasknest{% endblock %} +{% block content %}
← Back to foods

Create a food

Enter nutrition per 100 g or 100 ml. Missing optional values stay unknown.

{% csrf_token %}{% for field in form %}
{{ field.label_tag }}{{ field }}{{ field.errors }}
{% endfor %}
{% endblock %} diff --git a/main/food/templates/food/partials/diary_content.html b/main/food/templates/food/partials/diary_content.html new file mode 100644 index 0000000..5dc1cc5 --- /dev/null +++ b/main/food/templates/food/partials/diary_content.html @@ -0,0 +1,19 @@ +
+

Food diary

{{ day|date:"l j F Y" }}

+
+
+ {% for meal in meals %} +
+

{{ meal.label }}

{{ meal.calories|floatformat:0 }} kcal

+
+ {% if meal.entries %}
    {% for entry in meal.entries %}
  • {% if entry.product and entry.product.image_url %}{% endif %}
    {{ entry.product_name_snapshot }}{% if entry.brand_snapshot %}{{ entry.brand_snapshot }}{% endif %}{% if entry.calories_kcal is not None %}{{ entry.calories_kcal|floatformat:0 }} kcal{% else %}— kcal{% endif %} · {% if entry.portion_label_snapshot %}{{ entry.portion_label_snapshot }} {% endif %}({{ entry.amount|floatformat:-3 }} {{ entry.unit }})
    Edit
  • {% endfor %}
{% else %}

Nothing logged yet.

{% endif %} +
+ {% endfor %} + Add food +
+ +
+
+
diff --git a/main/food/tests.py b/main/food/tests.py index 37cad29..8eb07a2 100644 --- a/main/food/tests.py +++ b/main/food/tests.py @@ -6,6 +6,9 @@ from django.core.exceptions import ValidationError from django.db import IntegrityError, transaction from django.test import TestCase from django.urls import reverse +from planner.models import UserSettings + +from .services.diary import diary_context from .models import FoodFavourite, FoodLogEntry, FoodPortion, FoodProduct, MealType, Unit @@ -64,3 +67,65 @@ class FoodFoundationTests(TestCase): form = FoodGoalForm(data={'daily_calorie_goal': '-1', 'carbohydrate_goal_g': '-1', 'protein_goal_g': '10', 'fat_goal_g': '0'}) self.assertFalse(form.is_valid()) + + def test_diary_totals_and_over_goal(self): + goals = UserSettings.objects.create(user=self.user, daily_calorie_goal=100, protein_goal_g=Decimal('10')) + FoodLogEntry.objects.create(user=self.user, date=date(2026, 10, 3), meal=MealType.BREAKFAST, + product=self.product, product_name_snapshot='Yoghurt', amount=Decimal('100'), unit=Unit.GRAM, + calories_kcal=Decimal('80'), protein_g=Decimal('4')) + FoodLogEntry.objects.create(user=self.user, date=date(2026, 10, 3), meal=MealType.DINNER, + product_name_snapshot='Soup', amount=Decimal('100'), unit=Unit.GRAM, + calories_kcal=Decimal('55'), protein_g=Decimal('3')) + context = diary_context(self.user, date(2026, 10, 3)) + self.assertEqual(context['totals']['calories_kcal'], Decimal('135')) + self.assertEqual(context['totals']['protein_g'], Decimal('7')) + self.assertEqual(context['calorie_remaining'], Decimal('-35')) + self.assertEqual(context['meals'][0]['calories'], Decimal('80')) + self.assertEqual(context['meals'][2]['calories'], Decimal('55')) + self.assertEqual(context['macros'][0]['percent'], None) + self.client.force_login(self.user) + response = self.client.get(reverse('food:diary'), {'date': '2026-10-03'}) + self.assertContains(response, '35 kcal over goal') + self.assertContains(response, 'No target') + self.assertContains(response, 'date=2026-10-02') + self.assertContains(response, 'date=2026-10-04') + + def test_bad_date_and_user_isolation(self): + FoodLogEntry.objects.create(user=self.other, date=date(2026, 10, 3), meal=MealType.LUNCH, + product_name_snapshot='Private food', amount=Decimal('100'), unit=Unit.GRAM, + calories_kcal=Decimal('999')) + self.client.force_login(self.user) + self.assertEqual(self.client.get(reverse('food:diary'), {'date': 'not-a-date'}).status_code, 400) + response = self.client.get(reverse('food:diary'), {'date': '2026-10-03'}) + self.assertNotContains(response, 'Private food') + self.assertEqual(diary_context(self.user, date(2026, 10, 3))['totals']['calories_kcal'], 0) + + def test_add_edit_delete_and_htmx_fragment(self): + self.product.energy_kcal_100 = Decimal('60') + self.product.protein_100 = Decimal('4') + self.product.save() + self.client.force_login(self.user) + add_url = reverse('food:add') + response = self.client.post(add_url, {'date': '2026-10-03', 'product': self.product.pk, + 'meal': MealType.BREAKFAST, 'amount': '200', 'unit': 'g'}, HTTP_HX_REQUEST='true') + self.assertEqual(response.status_code, 200) + self.assertContains(response, 'id="food-workspace"') + self.assertContains(response, '120 kcal eaten') + entry = FoodLogEntry.objects.get(user=self.user) + self.assertEqual(entry.protein_g, Decimal('8')) + response = self.client.post(reverse('food:edit', args=[entry.pk]), {'meal': MealType.DINNER, + 'amount': '100', 'unit': 'g'}, HTTP_HX_REQUEST='true') + self.assertContains(response, '60 kcal eaten') + entry.refresh_from_db() + self.assertEqual(entry.meal, MealType.DINNER) + self.assertEqual(entry.protein_g, Decimal('4')) + response = self.client.post(reverse('food:delete', args=[entry.pk]), HTTP_HX_REQUEST='true') + self.assertContains(response, '0 kcal eaten') + self.assertFalse(FoodLogEntry.objects.filter(pk=entry.pk).exists()) + + def test_cannot_edit_or_delete_another_users_entry(self): + entry = FoodLogEntry.objects.create(user=self.other, date=date(2026, 10, 3), meal=MealType.LUNCH, + product_name_snapshot='Private food', amount=Decimal('100'), unit=Unit.GRAM) + self.client.force_login(self.user) + self.assertEqual(self.client.get(reverse('food:edit', args=[entry.pk])).status_code, 404) + self.assertEqual(self.client.post(reverse('food:delete', args=[entry.pk])).status_code, 404) diff --git a/main/food/urls.py b/main/food/urls.py index b8a56ff..b30265c 100644 --- a/main/food/urls.py +++ b/main/food/urls.py @@ -6,4 +6,8 @@ app_name = 'food' urlpatterns = [ path('', views.diary, name='diary'), + path('add/', views.add_food, name='add'), + path('manual/', views.manual_food, name='manual'), + path('log//', views.edit_entry, name='edit'), + path('log//delete/', views.delete_entry, name='delete'), ] diff --git a/main/food/views.py b/main/food/views.py index 498c7f8..47137de 100644 --- a/main/food/views.py +++ b/main/food/views.py @@ -1,7 +1,127 @@ +from decimal import Decimal + from django.contrib.auth.decorators import login_required -from django.shortcuts import render +from django.http import HttpResponseBadRequest +from django.shortcuts import get_object_or_404, redirect, render +from django.urls import reverse +from django.views.decorators.http import require_http_methods, require_POST + +from .forms import FoodLogForm, ManualFoodForm +from .models import FoodLogEntry, FoodProduct, MealType +from .services.diary import diary_context, selected_date + + +def _day(request): + try: + return selected_date(request), None + except ValueError as error: + return None, HttpResponseBadRequest(str(error)) + + +def _save_entry(form, user, day, product): + entry = form.save(commit=False) + entry.user = user + entry.date = day + entry.product = product + entry.product_name_snapshot = product.product_name + entry.brand_snapshot = product.brand + entry.barcode_snapshot = product.barcode + entry.source = product.source + factor = entry.amount / Decimal('100') + for source, target in ( + ('energy_kcal_100', 'calories_kcal'), ('carbohydrates_100', 'carbohydrates_g'), + ('protein_100', 'protein_g'), ('fat_100', 'fat_g'), ('fibre_100', 'fibre_g'), + ('sugars_100', 'sugars_g'), ('salt_100', 'salt_g'), + ): + value = getattr(product, source) + setattr(entry, target, (value * factor).quantize(Decimal('0.001')) if value is not None else None) + entry.full_clean() + entry.save() + return entry + + +def _diary_response(request, day): + if request.headers.get('HX-Request') == 'true': + return render(request, 'food/partials/diary_content.html', diary_context(request.user, day)) + return redirect(f"{reverse('food:diary')}?date={day.isoformat()}") @login_required def diary(request): - return render(request, 'food/diary.html') + day, error = _day(request) + if error: + return error + return render(request, 'food/diary.html', diary_context(request.user, day)) + + +@login_required +@require_http_methods(['GET', 'POST']) +def add_food(request): + day, error = _day(request) + if error: + return error + meal = request.GET.get('meal') or request.POST.get('meal') or MealType.BREAKFAST + if meal not in MealType.values: + return HttpResponseBadRequest('Invalid meal.') + product_id = request.GET.get('product') or request.POST.get('product') + product = get_object_or_404(FoodProduct, pk=product_id, owner=request.user) if product_id else None + query = request.GET.get('q', '').strip()[:100] + products = FoodProduct.objects.filter(owner=request.user).order_by('product_name') + if query: + products = products.filter(product_name__icontains=query) + form = FoodLogForm(request.POST or None, product=product, initial={'meal': meal, 'unit': product.base_unit if product else 'g'}) if product else None + if request.method == 'POST': + if not product: + return HttpResponseBadRequest('Choose a product.') + if form.is_valid(): + _save_entry(form, request.user, day, product) + return _diary_response(request, day) + return render(request, 'food/add.html', {'day': day, 'meal': meal, 'products': products[:40], + 'product': product, 'form': form, 'query': query}) + + +@login_required +@require_http_methods(['GET', 'POST']) +def manual_food(request): + day, error = _day(request) + if error: + return error + meal = request.GET.get('meal') or request.POST.get('meal') or MealType.BREAKFAST + if meal not in MealType.values: + return HttpResponseBadRequest('Invalid meal.') + form = ManualFoodForm(request.POST or None) + if request.method == 'POST' and form.is_valid(): + product = form.save(commit=False) + product.owner = request.user + product.save() + return redirect(f"{reverse('food:add')}?date={day}&meal={meal}&product={product.pk}") + return render(request, 'food/manual.html', {'form': form, 'day': day, 'meal': meal}) + + +@login_required +@require_http_methods(['GET', 'POST']) +def edit_entry(request, pk): + entry = get_object_or_404(FoodLogEntry, pk=pk, user=request.user) + product = entry.product + original_amount = entry.amount + original_nutrients = {field: getattr(entry, field) for field in + ('calories_kcal', 'carbohydrates_g', 'protein_g', 'fat_g', 'fibre_g', 'sugars_g', 'salt_g')} + form = FoodLogForm(request.POST or None, instance=entry, product=product) + if request.method == 'POST' and form.is_valid(): + updated = form.save(commit=False) + factor = updated.amount / original_amount + for field, original in original_nutrients.items(): + setattr(updated, field, (original * factor).quantize(Decimal('0.001')) if original is not None else None) + updated.full_clean() + updated.save() + return _diary_response(request, entry.date) + return render(request, 'food/edit.html', {'entry': entry, 'form': form}) + + +@login_required +@require_POST +def delete_entry(request, pk): + entry = get_object_or_404(FoodLogEntry, pk=pk, user=request.user) + day = entry.date + entry.delete() + return _diary_response(request, day)