feat: add manual nutrition entry form with auto-detect
Features:
- Manual entry form above data list
- Date picker with auto-load existing entries
- Upsert logic: creates new or updates existing entry
- Smart button text: "Hinzufügen" vs "Aktualisieren"
- Prevents duplicate entries per day
- Feature enforcement for nutrition_entries
Backend:
- POST /nutrition - Create or update entry (upsert)
- GET /nutrition/by-date/{date} - Load entry by date
- Auto-detects existing entry and switches to UPDATE mode
- Increments usage counter only on INSERT
Frontend:
- EntryForm component with date picker + macros inputs
- Auto-loads data when date changes
- Shows info message when entry exists
- Success/error feedback
- Disabled state while loading/saving
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
1 parent
873f08042e
commit
02ca9772d6
3 files changed
+245
-1
No files matched your search
@@ -18,6 +18,179 @@ function rollingAvg(arr, key, window=7) {
|
||||
})
|
||||
}
|
||||
|
||||
// ── Entry Form (Create/Update) ───────────────────────────────────────────────
|
||||
function EntryForm({ onSaved }) {
|
||||
const [date, setDate] = useState(dayjs().format('YYYY-MM-DD'))
|
||||
const [values, setValues] = useState({ kcal: '', protein_g: '', fat_g: '', carbs_g: '' })
|
||||
const [existingId, setExistingId] = useState(null)
|
||||
const [loading, setLoading] = useState(false)
|
||||
const [saving, setSaving] = useState(false)
|
||||
const [error, setError] = useState(null)
|
||||
const [success, setSuccess] = useState(null)
|
||||
|
||||
// Load data for selected date
|
||||
useEffect(() => {
|
||||
const load = async () => {
|
||||
if (!date) return
|
||||
setLoading(true)
|
||||
setError(null)
|
||||
try {
|
||||
const data = await nutritionApi.getNutritionByDate(date)
|
||||
if (data) {
|
||||
setValues({
|
||||
kcal: data.kcal || '',
|
||||
protein_g: data.protein_g || '',
|
||||
fat_g: data.fat_g || '',
|
||||
carbs_g: data.carbs_g || ''
|
||||
})
|
||||
setExistingId(data.id)
|
||||
} else {
|
||||
setValues({ kcal: '', protein_g: '', fat_g: '', carbs_g: '' })
|
||||
setExistingId(null)
|
||||
}
|
||||
} catch(e) {
|
||||
console.error('Failed to load entry:', e)
|
||||
} finally {
|
||||
setLoading(false)
|
||||
}
|
||||
}
|
||||
load()
|
||||
}, [date])
|
||||
|
||||
const handleSave = async () => {
|
||||
if (!date || !values.kcal) {
|
||||
setError('Datum und Kalorien sind Pflichtfelder')
|
||||
return
|
||||
}
|
||||
|
||||
setSaving(true)
|
||||
setError(null)
|
||||
setSuccess(null)
|
||||
try {
|
||||
const result = await nutritionApi.createNutrition(
|
||||
date,
|
||||
parseFloat(values.kcal) || 0,
|
||||
parseFloat(values.protein_g) || 0,
|
||||
parseFloat(values.fat_g) || 0,
|
||||
parseFloat(values.carbs_g) || 0
|
||||
)
|
||||
setSuccess(result.mode === 'created' ? 'Eintrag hinzugefügt' : 'Eintrag aktualisiert')
|
||||
setTimeout(() => setSuccess(null), 3000)
|
||||
onSaved()
|
||||
} catch(e) {
|
||||
if (e.message.includes('Limit erreicht')) {
|
||||
setError(e.message)
|
||||
} else {
|
||||
setError('Speichern fehlgeschlagen: ' + e.message)
|
||||
}
|
||||
setTimeout(() => setError(null), 5000)
|
||||
} finally {
|
||||
setSaving(false)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="card section-gap">
|
||||
<div className="card-title">Eintrag hinzufügen / bearbeiten</div>
|
||||
|
||||
{error && (
|
||||
<div style={{padding:'8px 12px',background:'#FCEBEB',borderRadius:8,fontSize:13,color:'#D85A30',marginBottom:12}}>
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
{success && (
|
||||
<div style={{padding:'8px 12px',background:'var(--accent-light)',borderRadius:8,fontSize:13,color:'var(--accent-dark)',marginBottom:12}}>
|
||||
✓ {success}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div style={{display:'grid',gridTemplateColumns:'1fr 1fr',gap:12,marginBottom:12}}>
|
||||
<div style={{gridColumn:'1 / -1'}}>
|
||||
<label className="form-label">Datum</label>
|
||||
<input
|
||||
type="date"
|
||||
className="form-input"
|
||||
value={date}
|
||||
onChange={e => setDate(e.target.value)}
|
||||
max={dayjs().format('YYYY-MM-DD')}
|
||||
style={{width:'100%'}}
|
||||
/>
|
||||
{existingId && !loading && (
|
||||
<div style={{fontSize:11,color:'var(--accent)',marginTop:4}}>
|
||||
ℹ️ Eintrag existiert bereits – wird beim Speichern aktualisiert
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="form-label">Kalorien *</label>
|
||||
<input
|
||||
type="number"
|
||||
className="form-input"
|
||||
value={values.kcal}
|
||||
onChange={e => setValues({...values, kcal: e.target.value})}
|
||||
placeholder="z.B. 2000"
|
||||
disabled={loading}
|
||||
style={{width:'100%'}}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="form-label">Protein (g)</label>
|
||||
<input
|
||||
type="number"
|
||||
className="form-input"
|
||||
value={values.protein_g}
|
||||
onChange={e => setValues({...values, protein_g: e.target.value})}
|
||||
placeholder="z.B. 150"
|
||||
disabled={loading}
|
||||
style={{width:'100%'}}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="form-label">Fett (g)</label>
|
||||
<input
|
||||
type="number"
|
||||
className="form-input"
|
||||
value={values.fat_g}
|
||||
onChange={e => setValues({...values, fat_g: e.target.value})}
|
||||
placeholder="z.B. 80"
|
||||
disabled={loading}
|
||||
style={{width:'100%'}}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="form-label">Kohlenhydrate (g)</label>
|
||||
<input
|
||||
type="number"
|
||||
className="form-input"
|
||||
value={values.carbs_g}
|
||||
onChange={e => setValues({...values, carbs_g: e.target.value})}
|
||||
placeholder="z.B. 200"
|
||||
disabled={loading}
|
||||
style={{width:'100%'}}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button
|
||||
className="btn btn-primary btn-full"
|
||||
onClick={handleSave}
|
||||
disabled={saving || loading || !date || !values.kcal}>
|
||||
{saving ? (
|
||||
<><div className="spinner" style={{width:14,height:14}}/> Speichere…</>
|
||||
) : existingId ? (
|
||||
'📝 Eintrag aktualisieren'
|
||||
) : (
|
||||
'➕ Eintrag hinzufügen'
|
||||
)}
|
||||
</button>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
// ── Data Tab (Editable Entry List) ───────────────────────────────────────────
|
||||
function DataTab({ entries, onUpdate }) {
|
||||
const [editId, setEditId] = useState(null)
|
||||
@@ -619,7 +792,10 @@ export default function NutritionPage() {
|
||||
</div>
|
||||
|
||||
{tab==='data' && (
|
||||
<DataTab entries={entries} onUpdate={load}/>
|
||||
<>
|
||||
<EntryForm onSaved={load}/>
|
||||
<DataTab entries={entries} onUpdate={load}/>
|
||||
</>
|
||||
)}
|
||||
|
||||
{tab==='overview' && (
|
||||
|
||||
@@ -83,6 +83,8 @@ export const api = {
|
||||
nutritionCorrelations: () => req('/nutrition/correlations'),
|
||||
nutritionWeekly: (w=16) => req(`/nutrition/weekly?weeks=${w}`),
|
||||
nutritionImportHistory: () => req('/nutrition/import-history'),
|
||||
getNutritionByDate: (date) => req(`/nutrition/by-date/${date}`),
|
||||
createNutrition: (date,kcal,protein,fat,carbs) => req(`/nutrition?date=${date}&kcal=${kcal}&protein_g=${protein}&fat_g=${fat}&carbs_g=${carbs}`,{method:'POST'}),
|
||||
updateNutrition: (id,kcal,protein,fat,carbs) => req(`/nutrition/${id}?kcal=${kcal}&protein_g=${protein}&fat_g=${fat}&carbs_g=${carbs}`,{method:'PUT'}),
|
||||
deleteNutrition: (id) => req(`/nutrition/${id}`,{method:'DELETE'}),
|
||||
|
||||
|
||||
Reference in new issue
Block a user