Nothing logged yet. Tap "Add Food" to get started.
{:else} + {#if !selecting} +Loading meal…
+ {:else if mealLoadError} +{mealLoadError}
+ {:else if meal} + + {#if meal.computed_nutrition_per_meal} ++ Per meal: {formatKcal(Math.round(meal.computed_nutrition_per_meal.calories ?? 0))} + · P {formatGrams(meal.computed_nutrition_per_meal.protein_g ?? 0)} + · C {formatGrams(meal.computed_nutrition_per_meal.carbs_g ?? 0)} + · F {formatGrams(meal.computed_nutrition_per_meal.fat_g ?? 0)} +
+ {/if} + +{compSearchError}
{/if} + {#if compResults.length > 0} +{compSaveError}
{/if} + +{unpackError}
+ {/if} + + + {#if isMeal && expanded} +MealBuilder (placeholder)
+ + + \ No newline at end of file diff --git a/frontend/src/lib/api.js b/frontend/src/lib/api.js index f3c212e..13be5a3 100644 --- a/frontend/src/lib/api.js +++ b/frontend/src/lib/api.js @@ -47,4 +47,17 @@ export const api = { offProduct: (barcode) => request(`/api/off/product/${barcode}`), offSearch: (q) => request(`/api/off/search?q=${encodeURIComponent(q)}`), offRefresh: (foodId) => request(`/api/off/refresh/${foodId}`, { method: 'POST' }), -} + // Meals (spec §3.2, TICKET-007) + createMealFromLog: (name, date, entryIds) => request('/api/meals/from-log', { + method: 'POST', + body: JSON.stringify({ name, date, entry_ids: entryIds }), + }), + unpackMeal: (mealId, date, entryId) => request(`/api/meals/${mealId}/unpack`, { + method: 'POST', + body: JSON.stringify({ date, entry_id: entryId }), + }), + updateMealComponents: (mealId, components) => request(`/api/meals/${mealId}/components`, { + method: 'PUT', + body: JSON.stringify({ components }), + }), +} \ No newline at end of file diff --git a/frontend/src/lib/format.js b/frontend/src/lib/format.js index 84991ef..613b146 100644 --- a/frontend/src/lib/format.js +++ b/frontend/src/lib/format.js @@ -25,11 +25,18 @@ export function formatDate(yyyyMmDd) { /** * Compute the calories contributed by a single log entry. - * This is the permitted simple linear scaling for display only (spec §8.2 rule 2). + * The server is the source of truth for nutrition (spec §8.2 rule 2). + * For entries with computed_nutrition from the backend (meals, or any entry + * where the backend has computed the values), use that directly. + * For simple foods, fall back to linear scaling (quantity × per_unit). * - weight-type: (quantity / 100) × calories_per_unit * - count-type: quantity × calories_per_unit */ export function caloriesForEntry(entry) { + // If the backend sent computed_nutrition, use it (spec §8.2 rule 2) + if (entry.computed_nutrition?.calories != null) { + return entry.computed_nutrition.calories + } const food = entry.food if (!food || food.calories_per_unit == null) return 0 if (food.unit_type === 'count') { @@ -89,4 +96,4 @@ export function shiftDate(yyyyMmDd, days) { const d = new Date(yyyyMmDd + 'T00:00:00Z') d.setUTCDate(d.getUTCDate() + days) return d.toISOString().slice(0, 10) -} +} \ No newline at end of file diff --git a/frontend/src/lib/format.test.js b/frontend/src/lib/format.test.js index 47f842a..1014b60 100644 --- a/frontend/src/lib/format.test.js +++ b/frontend/src/lib/format.test.js @@ -1,9 +1,8 @@ /** - * Example test suite — scaffold for future logic tests (spec §8.4: - * Vitest only for stores/format logic, no component tests in v1). + * Test suite for format.js logic (spec §8.4: Vitest only for stores/format logic). */ import { describe, it, expect } from 'vitest' -import { formatKcal, formatGrams, formatDate, shiftDate } from './format.js' +import { formatKcal, formatGrams, formatDate, shiftDate, caloriesForEntry } from './format.js' describe('formatKcal', () => { it('rounds to whole numbers', () => { @@ -64,3 +63,45 @@ describe('shiftDate', () => { expect(shiftDate('2026-08-01', -7)).toBe('2026-07-25') }) }) + +describe('caloriesForEntry', () => { + it('uses computed_nutrition when available (meal entries)', () => { + const entry = { + quantity: 1, + computed_nutrition: { calories: 420, protein_g: 25 }, + food: { calories_per_unit: null, unit_type: 'weight', is_meal: true }, + } + expect(caloriesForEntry(entry)).toBe(420) + }) + + it('falls back to weight-type scaling for non-meal foods', () => { + const entry = { + quantity: 200, + computed_nutrition: null, + food: { calories_per_unit: 350, unit_type: 'weight' }, + } + expect(caloriesForEntry(entry)).toBe(700) // (200/100) * 350 + }) + + it('falls back to count-type scaling for count foods', () => { + const entry = { + quantity: 3, + computed_nutrition: null, + food: { calories_per_unit: 80, unit_type: 'count' }, + } + expect(caloriesForEntry(entry)).toBe(240) // 3 * 80 + }) + + it('returns 0 when food has null calories_per_unit and no computed_nutrition', () => { + const entry = { + quantity: 1, + computed_nutrition: null, + food: { calories_per_unit: null, unit_type: 'weight', is_meal: true }, + } + expect(caloriesForEntry(entry)).toBe(0) + }) + + it('returns 0 when food is null', () => { + expect(caloriesForEntry({ quantity: 1, food: null })).toBe(0) + }) +}) \ No newline at end of file diff --git a/frontend/src/lib/stores.svelte.js b/frontend/src/lib/stores.svelte.js index 284921d..964dccc 100644 --- a/frontend/src/lib/stores.svelte.js +++ b/frontend/src/lib/stores.svelte.js @@ -32,6 +32,16 @@ export function goNextDay() { export const appView = $state({ current: 'dashboard' }) +// ── Meal editor ─────────────────────────────────────────────────────────── + +/** Which meal food is open in the component editor (spec §4.7, TICKET-007). */ +export const mealEdit = $state({ foodId: null }) + +export function openMealEditor(foodId) { + mealEdit.foodId = foodId + appView.current = 'editMeal' +} + /** Simple navigation requests from child components (e.g., "Set a target"). */ export const navigateTo = (view) => { appView.current = view } @@ -88,3 +98,19 @@ export async function removeLogEntryFromStore(id) { dayData.log = dayData.log.filter(e => e.id !== id) await refreshSummary() } + +/** + * Replace entries from a "save as meal" operation: + * removes the source entry IDs and inserts the replacement meal entry. + */ +export async function replaceEntriesForMeal(entryIds, replacement) { + const ids = new Set(entryIds) + dayData.log = [...dayData.log.filter(e => !ids.has(e.id)), replacement] + await refreshSummary() +} + +/** Replace entries from an "unpack" operation. */ +export async function replaceEntryForUnpack(oldEntryId, newEntries) { + dayData.log = [...dayData.log.filter(e => e.id !== oldEntryId), ...newEntries] + await refreshSummary() +} \ No newline at end of file