chore: sync from nutritrace-dev (v1.0.0-rc.35)

Author: thebigjoe1

CHANGELOG.md

@@ -9,6 +9,24 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ---
 
+## [1.0.0-rc.35] — 2026-05-22
+
+### Added
+
+- **Scan Label**. On the Add/Edit Food screen, take a photo of a nutrition label and the AI Assistant fills in the values. Requires AI Assistant to be configured.
+
+### Changed
+
+- **Custom nutriment order is reflected in the food and meal editors.** Reordering nutrients in Settings now changes their display order everywhere.
+- **Vitamin D, Calcium, Iron, and Potassium are visible by default** on new installs, matching the FDA's mandatory Nutrition Facts label fields.
+
+### Fixed
+
+- **kcal/kJ inconsistencies when energy unit was set to kJ.** Food editor, diary footer, meal totals, statistics charts, goals, weekly summary email, and push notifications all respect the chosen unit now. Internal storage stays kcal; only the display converts. (Issue #38)
+- **Single-user mode: only the first food item added each day was visible** in the UI. A SQLite quirk meant NULL user_id rows never collided on upsert, so each save inserted a new row instead of updating. A one-time migration on first boot recovers items already in the database. (Issue #37)
+
+---
+
 ## [1.0.0-rc.34] — 2026-05-22
 
 ### Fixed

README.md

@@ -41,9 +41,12 @@ NutriTrace runs as a single Docker container on your own hardware, with a PWA fo
 ### Foods & Meals
 - Personal food database with photos, barcodes, categories, and custom labels
 - Favorite foods and meals (star them) with a configurable sort order — favorites first, alphabetical, recently used, or most used
-- Barcode scanner (camera) for quick food lookup via Open Food Facts
+- Barcode scanner (camera) for quick food lookup via Open Food Facts. Barcodes not in OFF open the food editor with the barcode prefilled so you can enter the food manually and contribute back.
+- **Scan Label** — when AI Assistant is enabled, a button in the Nutrition card sends a photo of the actual nutrition label to your configured AI provider, which extracts every value (calories, macros, micros, serving size) and fills the form in one tap. Works with cloud providers (Claude, OpenAI, Gemini) or a local model with vision support
+- **Share to Open Food Facts** — contribute foods you've added (with their picture) to the OFF community database. The button flips to "View on OFF" when the product already exists, opening the wiki page where edits properly track history and moderation
 - Meal and recipe builder with drag-to-reorder ingredients
 - Proportional nutrition scaling when editing serving size
+- Configurable nutrient order — drag to reorder in Settings → Nutrients; the food and meal editors honor your custom order
 - Import foods from Open Food Facts, USDA FoodData Central, or Mealie (recipe manager); Open Food Facts barcode imports let you pick per-serving or per-100g when both are published
 - **Bulk import** custom foods from JSON or CSV (Settings → Import & Export → Bulk Import)
 - **Mass-aware unit conversion** when scaling nutrition: switching g ↔ oz ↔ lb, ml ↔ cup, tsp ↔ tbsp (or any custom unit you define) actually converts the macros, not just relabels the unit

android/app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "com.nutritrace.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 103
-        versionName "1.0.0-rc.34"
+        versionCode 104
+        versionName "1.0.0-rc.35"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nutritrace",
-  "version": "1.0.0-rc.34",
+  "version": "1.0.0-rc.35",
   "private": true,
   "type": "module",
   "scripts": {

server/db.js

@@ -485,6 +485,54 @@ if (!columnExists('user_settings', 'deleted_at')) {
   db.exec(`ALTER TABLE user_settings ADD COLUMN deleted_at TEXT DEFAULT NULL`);
 }
 
+// Issue #37: single-user mode (user_id IS NULL) accumulated duplicate diary
+// rows because SQLite UNIQUE(date, user_id) treats NULL as distinct, so the
+// PUT handler's UPSERT never fired. Each save inserted a new row and GET
+// returned the oldest, so the client's currentEntry never advanced past
+// [item1]. Subsequent saves sent [item1, itemN] (not the full cumulative
+// list), so no single row holds the user's full day — items are scattered.
+// Recovery: per date, union items across all rows (dedup by addedAt),
+// keep the latest-id row, replace its items with the merged set, delete
+// the older duplicates. Idempotent.
+try {
+  const dupDates = db.prepare(
+    `SELECT date FROM diary WHERE user_id IS NULL GROUP BY date HAVING COUNT(*) > 1`
+  ).all();
+  if (dupDates.length) {
+    let totalDeleted = 0;
+    const tx = db.transaction(() => {
+      for (const { date } of dupDates) {
+        const rows = db.prepare(
+          `SELECT id, items FROM diary WHERE user_id IS NULL AND date = ? ORDER BY id ASC`
+        ).all(date);
+        const merged = [];
+        const seen = new Set();
+        for (const r of rows) {
+          let items = [];
+          try { items = JSON.parse(r.items || '[]'); } catch {}
+          if (!Array.isArray(items)) continue;
+          for (const it of items) {
+            const key = it && it.addedAt ? `t:${it.addedAt}` : `f:${JSON.stringify(it)}`;
+            if (seen.has(key)) continue;
+            seen.add(key);
+            merged.push(it);
+          }
+        }
+        merged.sort((a, b) => String(a?.addedAt || '').localeCompare(String(b?.addedAt || '')));
+        const keepId = rows[rows.length - 1].id;
+        db.prepare(`UPDATE diary SET items=?, updated_at=datetime('now') WHERE id=?`)
+          .run(JSON.stringify(merged), keepId);
+        const r = db.prepare(`DELETE FROM diary WHERE user_id IS NULL AND date = ? AND id != ?`).run(date, keepId);
+        totalDeleted += r.changes;
+      }
+    });
+    tx();
+    console.log(`[db] #37: merged single-user diary items across ${dupDates.length} dates, removed ${totalDeleted} duplicate rows`);
+  }
+} catch (e) {
+  console.warn(`[db] #37 diary consolidation failed:`, e.message || e);
+}
+
 // ── Favorites + usage tracking (foods + meals) ─────────────────────────────
 // `favorite` pins items to the top of the picker; `usage_count` and
 // `last_used_at` drive the Most Used / Recently Used sort modes.

server/email.js

@@ -293,6 +293,14 @@ export async function sendWeeklySummaryEmail(userId, origin) {
       calGoal = g.calories?.max ?? g.calories?.min ?? null;
     } catch {}
 
+    // Energy unit preference (display only; storage stays kcal)
+    const euRow = db.prepare(`SELECT value FROM user_settings WHERE user_id=? AND key='energyUnit'`).get(userId);
+    let energyUnit = 'kcal';
+    try { energyUnit = JSON.parse(euRow?.value || '"kcal"') || 'kcal'; } catch {}
+    const _isKj = energyUnit === 'kJ';
+    const _eUnit = _isKj ? 'kJ' : 'kcal';
+    const _toE = (kcal) => kcal == null ? null : (_isKj ? Math.round(kcal * 4.184) : Math.round(kcal));
+
     for (const row of diaryRows) {
       try {
         const entry = JSON.parse(row.data);
@@ -362,11 +370,14 @@ export async function sendWeeklySummaryEmail(userId, origin) {
     const fmtDate = (d) => `${DAYS[d.getDay()]} ${d.toLocaleDateString('en-US', { month:'short', day:'numeric' })}`;
     const weekRange = `${fmtDate(fromDate)} – ${fmtDate(toDate)}`;
 
+    const _dispAvgCal = _toE(avgCal);
+    const _dispDiff = (avgCal != null && calGoal != null) ? _toE(avgCal - calGoal) : null;
+    const _dispDiffSigned = _dispDiff != null ? `${_dispDiff >= 0 ? '+' : ''}${_dispDiff}` : null;
     const nutritionSection = daysLogged > 0 ? `
       ${_sectionHeader(`Nutrition (${daysLogged}/7 days logged)`)}
       <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
-        ${_statRow('Avg Daily Calories', avgCal, 'kcal')}
-        ${calGoal != null ? _statRow('vs Goal', `${avgCal >= calGoal ? '+' : ''}${avgCal - calGoal}`, 'kcal') : ''}
+        ${_statRow(_isKj ? 'Avg Daily Energy' : 'Avg Daily Calories', _dispAvgCal, _eUnit)}
+        ${_dispDiffSigned != null ? _statRow('vs Goal', _dispDiffSigned, _eUnit) : ''}
         ${goalHitPct != null ? _statRow('Goal Hit Rate', goalHitPct, '%') : ''}
         ${_statRow('Avg Protein', avgProt, 'g')}
         ${_statRow('Avg Carbs', avgCarb, 'g')}
@@ -380,7 +391,7 @@ export async function sendWeeklySummaryEmail(userId, origin) {
       ${_sectionHeader('Activity & Wellness')}
       <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
         ${_statRow('Avg Daily Steps', avgSteps)}
-        ${w.calories_out ? _statRow('Avg Calories Burned', Math.round(w.calories_out), 'kcal') : ''}
+        ${w.calories_out ? _statRow(_isKj ? 'Avg Energy Burned' : 'Avg Calories Burned', _toE(w.calories_out), _eUnit) : ''}
         ${_statRow('Avg Sleep', avgSleep)}
         ${w.resting_hr ? _statRow('Avg Resting HR', Math.round(w.resting_hr), 'bpm') : ''}
         ${w.readiness_score ? _statRow('Avg Readiness', Math.round(w.readiness_score), '/ 100') : ''}
@@ -411,9 +422,9 @@ export async function sendWeeklySummaryEmail(userId, origin) {
     await sendMail({
       to: toEmail,
       subject: `NutriTrace Weekly Summary — ${weekRange}`,
-      html: emailWrapper(origin, body, 'To stop receiving these emails, turn off Weekly Summary in Settings &rarr; Notifications.', `Your NutriTrace week: ${avgCal ? avgCal + ' avg kcal' : ''}${avgSteps ? ', ' + avgSteps + ' avg steps' : ''}`),
+      html: emailWrapper(origin, body, 'To stop receiving these emails, turn off Weekly Summary in Settings &rarr; Notifications.', `Your NutriTrace week: ${_dispAvgCal != null ? _dispAvgCal + ' avg ' + _eUnit : ''}${avgSteps ? ', ' + avgSteps + ' avg steps' : ''}`),
       text: `Weekly Summary (${weekRange})\n\n` +
-        (avgCal   ? `Avg calories: ${avgCal} kcal\n` : '') +
+        (_dispAvgCal != null ? `Avg ${_isKj ? 'energy' : 'calories'}: ${_dispAvgCal} ${_eUnit}\n` : '') +
         (avgProt  ? `Avg protein: ${avgProt}g\n` : '') +
         (avgSteps ? `Avg steps: ${avgSteps}\n` : '') +
         (avgSleep ? `Avg sleep: ${avgSleep}\n` : '') +

server/lib/push-notify.js

@@ -186,9 +186,19 @@ export async function sendWeeklySummary(userId) {
   const m = {};
   for (const r of rows) m[r.metric_type] = r.avg;
 
+  let energyUnit = 'kcal';
+  try {
+    const euRow = db.prepare(`SELECT value FROM user_settings WHERE user_id=? AND key='energyUnit'`).get(userId);
+    energyUnit = JSON.parse(euRow?.value || '"kcal"') || 'kcal';
+  } catch {}
+  const _isKj = energyUnit === 'kJ';
+
   const parts = [];
   if (m.steps) parts.push(`Avg steps: ${Math.round(m.steps).toLocaleString()}`);
-  if (m.calories_out) parts.push(`Avg cal burned: ${Math.round(m.calories_out).toLocaleString()}`);
+  if (m.calories_out) {
+    const v = _isKj ? Math.round(m.calories_out * 4.184) : Math.round(m.calories_out);
+    parts.push(`Avg ${_isKj ? 'energy' : 'cal'} burned: ${v.toLocaleString()} ${_isKj ? 'kJ' : 'kcal'}`);
+  }
   if (m.sleep_duration_min) {
     const h = Math.floor(m.sleep_duration_min / 60);
     const min = Math.round(m.sleep_duration_min % 60);

server/routes/diary.js

@@ -33,16 +33,22 @@ router.put('/:date', wrap((req, res) => {
   const { items, body_stats, water, notes } = req.body;
   const notesVal = (typeof notes === 'string' && notes.trim()) ? notes : null;
   const u = uid(req);
+  const itemsJson = JSON.stringify(items || []);
+  const bsJson = JSON.stringify(body_stats || {});
+  const waterJson = JSON.stringify(water || []);
   if (u == null) {
-    db.prepare(
-      `INSERT INTO diary (date, items, body_stats, water, notes, updated_at)
-       VALUES (?, ?, ?, ?, ?, datetime('now'))
-       ON CONFLICT(date, user_id) DO UPDATE SET
-         items=excluded.items, body_stats=excluded.body_stats,
-         water=excluded.water, notes=excluded.notes,
-         updated_at=excluded.updated_at,
-         deleted_at=NULL`
-    ).run(req.params.date, JSON.stringify(items || []), JSON.stringify(body_stats || {}), JSON.stringify(water || []), notesVal);
+    // Single-user mode: SQLite UNIQUE(date, user_id) treats NULL user_id as
+    // distinct per row, so the standard UPSERT never collides — each PUT
+    // would insert a new row and GET would return the oldest (issue #37,
+    // "only the first food item added each day saves"). Manual upsert:
+    const existing = db.prepare(`SELECT id FROM diary WHERE date = ? AND user_id IS NULL`).get(req.params.date);
+    if (existing) {
+      db.prepare(`UPDATE diary SET items=?, body_stats=?, water=?, notes=?, updated_at=datetime('now'), deleted_at=NULL WHERE id=?`)
+        .run(itemsJson, bsJson, waterJson, notesVal, existing.id);
+    } else {
+      db.prepare(`INSERT INTO diary (date, items, body_stats, water, notes, updated_at) VALUES (?, ?, ?, ?, ?, datetime('now'))`)
+        .run(req.params.date, itemsJson, bsJson, waterJson, notesVal);
+    }
   } else {
     db.prepare(
       `INSERT INTO diary (user_id, date, items, body_stats, water, notes, updated_at)
@@ -52,7 +58,7 @@ router.put('/:date', wrap((req, res) => {
          water=excluded.water, notes=excluded.notes,
          updated_at=excluded.updated_at,
          deleted_at=NULL`
-    ).run(u, req.params.date, JSON.stringify(items || []), JSON.stringify(body_stats || {}), JSON.stringify(water || []), notesVal);
+    ).run(u, req.params.date, itemsJson, bsJson, waterJson, notesVal);
   }
   const row = u == null
     ? db.prepare('SELECT * FROM diary WHERE date = ? AND user_id IS NULL AND deleted_at IS NULL').get(req.params.date)

server/routes/fitbit.js

@@ -876,12 +876,18 @@ async function _syncWorkouts(userId, from, to) {
   if (synced > 0) {
     try {
       const { notifyWorkout } = await import('../lib/push-notify.js');
+      let _isKj = false;
+      try {
+        const euRow = db.prepare(`SELECT value FROM user_settings WHERE user_id=? AND key='energyUnit'`).get(u);
+        _isKj = (JSON.parse(euRow?.value || '"kcal"') || 'kcal') === 'kJ';
+      } catch {}
       for (const a of activities.slice(-3)) { // last 3 max
         const dur = Math.round((a.activeDuration || 0) / 60000);
         const dist = a.distance != null ? `${(a.distance * (a.distanceUnit === 'Mile' ? 1.60934 : 1)).toFixed(1)} km` : '';
         const cal = a.calories || 0;
+        const calStr = cal ? `${_isKj ? Math.round(cal * 4.184) : cal} ${_isKj ? 'kJ' : 'kcal'}` : '';
         const name = a.activityName || 'Workout';
-        notifyWorkout(u, `${name}: ${dur} min${dist ? ', ' + dist : ''}${cal ? ', ' + cal + ' kcal' : ''}`);
+        notifyWorkout(u, `${name}: ${dur} min${dist ? ', ' + dist : ''}${calStr ? ', ' + calStr : ''}`);
       }
     } catch {}
   }

server/routes/sync.js

@@ -211,14 +211,30 @@ router.post('/push', wrap((req, res) => {
           .run(d.date, ...(u != null ? [u] : []));
       } else {
         const dNotes = (typeof d.notes === 'string' && d.notes.trim()) ? d.notes : null;
-        db.prepare(
-          `INSERT INTO diary (user_id, date, items, body_stats, water, notes, updated_at)
-           VALUES (?, ?, ?, ?, ?, ?, datetime('now'))
-           ON CONFLICT(date, user_id) DO UPDATE SET
-             items = excluded.items, body_stats = excluded.body_stats, water = excluded.water,
-             notes = excluded.notes,
-             updated_at = datetime('now'), deleted_at = NULL`
-        ).run(u, d.date, JSON.stringify(d.items || []), JSON.stringify(d.body_stats || {}), JSON.stringify(d.water || []), dNotes);
+        const itemsJson = JSON.stringify(d.items || []);
+        const bsJson = JSON.stringify(d.body_stats || {});
+        const waterJson = JSON.stringify(d.water || []);
+        if (u == null) {
+          // Single-user mode: NULL user_id never collides under SQLite UNIQUE
+          // (see diary.js PUT for the same workaround, issue #37).
+          const existing = db.prepare(`SELECT id FROM diary WHERE date = ? AND user_id IS NULL`).get(d.date);
+          if (existing) {
+            db.prepare(`UPDATE diary SET items=?, body_stats=?, water=?, notes=?, updated_at=datetime('now'), deleted_at=NULL WHERE id=?`)
+              .run(itemsJson, bsJson, waterJson, dNotes, existing.id);
+          } else {
+            db.prepare(`INSERT INTO diary (date, items, body_stats, water, notes, updated_at) VALUES (?, ?, ?, ?, ?, datetime('now'))`)
+              .run(d.date, itemsJson, bsJson, waterJson, dNotes);
+          }
+        } else {
+          db.prepare(
+            `INSERT INTO diary (user_id, date, items, body_stats, water, notes, updated_at)
+             VALUES (?, ?, ?, ?, ?, ?, datetime('now'))
+             ON CONFLICT(date, user_id) DO UPDATE SET
+               items = excluded.items, body_stats = excluded.body_stats, water = excluded.water,
+               notes = excluded.notes,
+               updated_at = datetime('now'), deleted_at = NULL`
+          ).run(u, d.date, itemsJson, bsJson, waterJson, dNotes);
+        }
       }
       const row = db.prepare(`SELECT id FROM diary WHERE date = ? AND user_id ${u != null ? '= ?' : 'IS NULL'}`)
         .get(d.date, ...(u != null ? [u] : []));