fix: Zuordnungen zuverlässig speichern und Mengen-Varianten zusammenfassen
Mapping bleibt erhalten, auch wenn der Nährwert-Rebuild länger dauert. Offene Liste führt 1 ml/2 ml Olivenöl als ein Lebensmittel. Dazu JSON-Sicherung, eigener Katalogeintrag und Gramm-pro-Einheit. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
86f15e6957
commit
c1873a47b1
17 files changed
+875
-54
No files matched your search
@@ -84,31 +84,43 @@ export default function NutritionFoodMap({ onChanged }) {
|
||||
const [searchFor, setSearchFor] = useState(null)
|
||||
const [recipeFor, setRecipeFor] = useState(null)
|
||||
const [importing, setImporting] = useState(false)
|
||||
const [busy, setBusy] = useState(false)
|
||||
const listRef = useRef(null)
|
||||
const bundleRef = useRef(null)
|
||||
const loadGen = useRef(0)
|
||||
|
||||
const load = async () => {
|
||||
const gen = ++loadGen.current
|
||||
try {
|
||||
const [u, m, r] = await Promise.all([
|
||||
api.listUnmappedFoods(),
|
||||
api.listMyFoodMappings(),
|
||||
api.listNutritionRecipes().catch(() => []),
|
||||
])
|
||||
if (gen !== loadGen.current) return
|
||||
setUnmapped(u)
|
||||
setLearned(m)
|
||||
setRecipes(Array.isArray(r) ? r : [])
|
||||
} catch (e) {
|
||||
if (gen !== loadGen.current) return
|
||||
setError(e.message)
|
||||
}
|
||||
}
|
||||
|
||||
useEffect(() => { load() }, [])
|
||||
|
||||
const assign = async (sourceName, foodId) => {
|
||||
const assign = async (sourceName, foodId, extras = {}) => {
|
||||
setSaving(sourceName)
|
||||
setError(null)
|
||||
try {
|
||||
await api.upsertMyFoodMapping({ source_name: sourceName, food_id: foodId })
|
||||
await api.upsertMyFoodMapping({
|
||||
source_name: sourceName,
|
||||
food_id: foodId,
|
||||
grams_per_unit: extras.grams_per_unit || null,
|
||||
source_unit: extras.source_unit || null,
|
||||
})
|
||||
setSearchFor(null)
|
||||
setNotice(`Zuordnung gespeichert: ${sourceName}`)
|
||||
await load()
|
||||
onChanged?.()
|
||||
} catch (e) {
|
||||
@@ -144,6 +156,39 @@ export default function NutritionFoodMap({ onChanged }) {
|
||||
}
|
||||
}
|
||||
|
||||
const exportBundle = async () => {
|
||||
setBusy(true)
|
||||
setError(null)
|
||||
setNotice(null)
|
||||
try {
|
||||
await api.exportFoodKnowledge()
|
||||
setNotice('Zuordnungen und Listen als JSON heruntergeladen.')
|
||||
} catch (e) {
|
||||
setError(e.message)
|
||||
} finally {
|
||||
setBusy(false)
|
||||
}
|
||||
}
|
||||
|
||||
const importBundle = async (file) => {
|
||||
if (!file) return
|
||||
setBusy(true)
|
||||
setError(null)
|
||||
setNotice(null)
|
||||
try {
|
||||
const res = await api.importFoodKnowledge(file)
|
||||
await load()
|
||||
onChanged?.()
|
||||
const skip = res.mappings_skipped ? `, ${res.mappings_skipped} ohne Katalogtreffer` : ''
|
||||
const lists = (res.inserted || 0) + (res.updated || 0)
|
||||
setNotice(`${res.mappings || 0} Zuordnungen und ${lists} Listen übernommen${skip}.`)
|
||||
} catch (e) {
|
||||
setError(e.message)
|
||||
} finally {
|
||||
setBusy(false)
|
||||
}
|
||||
}
|
||||
|
||||
const importLists = async (file) => {
|
||||
if (!file) return
|
||||
setImporting(true)
|
||||
@@ -167,6 +212,7 @@ export default function NutritionFoodMap({ onChanged }) {
|
||||
<p style={{ fontSize: 13, color: 'var(--text2)', lineHeight: 1.6, marginBottom: 12 }}>
|
||||
Tippe auf „Im Katalog suchen“ — du suchst nach dem Namen, nicht nach einem Code.
|
||||
Eigene FDDB-Listen zuerst importieren, dann wird die Tagebuchzeile in Zutaten aufgelöst.
|
||||
Für den Umzug nach Prod: Zuordnungen und Listen als JSON exportieren und dort wieder importieren.
|
||||
</p>
|
||||
{error && <div style={{ color: 'var(--danger)', fontSize: 13, marginBottom: 10 }}>{error}</div>}
|
||||
{notice && <div style={{ fontSize: 13, color: 'var(--accent-dark)', marginBottom: 10 }}>{notice}</div>}
|
||||
@@ -193,6 +239,25 @@ export default function NutritionFoodMap({ onChanged }) {
|
||||
{recipes.length > 0 && (
|
||||
<p style={{ fontSize: 12, color: 'var(--text3)', marginTop: 8 }}>{recipes.length} eigene Listen geladen</p>
|
||||
)}
|
||||
<input
|
||||
ref={bundleRef}
|
||||
type="file"
|
||||
accept=".json,application/json"
|
||||
style={{ display: 'none' }}
|
||||
onChange={(e) => {
|
||||
const f = e.target.files?.[0]
|
||||
e.target.value = ''
|
||||
if (f) importBundle(f)
|
||||
}}
|
||||
/>
|
||||
<div style={{ display: 'flex', flexWrap: 'wrap', gap: 8, marginTop: 8 }}>
|
||||
<button type="button" className="btn btn-secondary" disabled={busy} onClick={exportBundle}>
|
||||
Zuordnungen & Listen exportieren
|
||||
</button>
|
||||
<button type="button" className="btn btn-secondary" disabled={busy} onClick={() => bundleRef.current?.click()}>
|
||||
Zuordnungen & Listen importieren
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<h3 style={{ fontSize: 14, margin: '16px 0 8px' }}>Offen ({unmapped.length})</h3>
|
||||
{unmapped.length === 0 && <p className="muted">Keine offenen Bezeichner.</p>}
|
||||
@@ -200,9 +265,10 @@ export default function NutritionFoodMap({ onChanged }) {
|
||||
const key = `${u.kind || 'diary'}-${u.source_name_normalized}`
|
||||
return (
|
||||
<div key={key} style={{ borderTop: '1px solid var(--border)', padding: '10px 0' }}>
|
||||
<div style={{ fontWeight: 600 }}>{u.source_name_raw}</div>
|
||||
<div style={{ fontWeight: 600 }}>{suggestQuery(u.source_name_raw) || u.source_name_raw}</div>
|
||||
<div style={{ fontSize: 12, color: 'var(--text3)' }}>
|
||||
{u.kind === 'recipe_ingredient' ? 'Rezeptzutat' : `${u.count}×`}
|
||||
{u.variant_count > 1 ? ` · ${u.variant_count} Mengen-Varianten` : ''}
|
||||
{u.first_date ? ` · ${u.first_date} – ${u.last_date}` : ''}
|
||||
</div>
|
||||
<div style={{ display: 'flex', flexWrap: 'wrap', gap: 8, marginTop: 8 }}>
|
||||
@@ -247,6 +313,7 @@ export default function NutritionFoodMap({ onChanged }) {
|
||||
<div style={{ fontSize: 12, color: 'var(--text3)' }}>
|
||||
→ {m.food_name_de}{m.bls_code ? ` · ${m.bls_code}` : ''}
|
||||
{m.catalog_kind !== 'official_bls' ? ' (manuell)' : ''}
|
||||
{m.grams_per_unit ? ` · 1 ${m.source_unit || 'Einheit'} = ${m.grams_per_unit} g` : ''}
|
||||
</div>
|
||||
</div>
|
||||
<button type="button" className="btn btn-secondary" onClick={() => remove(m.id)}>Löschen</button>
|
||||
@@ -257,8 +324,9 @@ export default function NutritionFoodMap({ onChanged }) {
|
||||
<FoodSearchModal
|
||||
title={`Suchen: ${searchFor.source_name_raw}`}
|
||||
initialQuery={suggestQuery(searchFor.source_name_raw)}
|
||||
quantityHint={searchFor.sample_quantity_raw || searchFor.source_name_raw}
|
||||
onClose={() => setSearchFor(null)}
|
||||
onSelect={(food) => assign(searchFor.source_name_raw, food.id)}
|
||||
onSelect={(food, extras) => assign(searchFor.source_name_raw, food.id, extras)}
|
||||
/>
|
||||
)}
|
||||
{recipeFor && (
|
||||
|
||||
Reference in new issue
Block a user