${t('move.question').replace('{thing}', openedId ? t('move.thing_opened') : t('move.thing_rest')).replace('{name}', `${escapeHtml(product.name)}`)}
@@ -10175,6 +10228,7 @@ async function confirmShoppingItemFound() { try { const r = await api('shopping_remove', {}, 'POST', { name, rawName, listUUID: shoppingListUUID }); if (r.success) { + _markBringPurchased([name]); // prevent background sync from re-adding before barcode scan const idx = shoppingItems.findIndex(i => i.name.toLowerCase() === name.toLowerCase()); if (idx >= 0) shoppingItems.splice(idx, 1); showToast(t('shopping.item_removed').replace('{name}', name), 'success'); @@ -10283,8 +10337,9 @@ async function autoAddCriticalItems() { if (i.on_bring) return false; // For imminent items, do not honor local "purchased" blocklist too aggressively. // If they are predicted to finish within a week, keep Bring aligned automatically. - // Bypass blocklist for depleted items (current_qty=0) — they ran out and must be re-added - if (!imminentWeek && (i.current_qty ?? 0) > 0 && _isBringPurchased(i.name, i.urgency)) return false; + // Always honour the purchased blocklist so that items the user just removed from Bring! + // (i.e. bought them at the store) are not immediately re-added before they are scanned. + if (!imminentWeek && _isBringPurchased(i.name, i.urgency)) return false; if (i.urgency === 'critical') return true; if (i.urgency === 'high') return true; if (i.urgency === 'medium' && (i.days_left ?? 999) <= 7 && (i.uses_per_month || 0) >= 3) return true; @@ -10591,20 +10646,13 @@ async function cleanupObsoleteBringItems() { localStorage.setItem('_bringCleanupTs', String(Date.now())); if (!shoppingItems.length || !smartShoppingItems.length) return; - // Detect items added by the app vs manually by the user. - // Items added by the app always have urgency markers in their spec (⚡ / 🟠 / 🛒). - // This detection works across ALL clients — no localStorage dependency. - const APP_SPEC_MARKERS = ['⚡', '🟠', '🛒']; - const isAppAdded = (item) => { - const spec = item.specification || ''; - // Also trust the legacy localStorage list as secondary signal - const autoAdded = _getAutoAddedBring(); - const nameLow = item.name.toLowerCase(); - const hasMarker = APP_SPEC_MARKERS.some(m => spec.includes(m)); - const inLegacyMap = !!(autoAdded[nameLow] || - Object.keys(autoAdded).some(k => _nameTokens(k)[0] === (_nameTokens(item.name)[0] || ''))); - return hasMarker || inLegacyMap; - }; + // Detect items added automatically by the app (via autoAddCriticalItems). + // We rely ONLY on the explicit _autoAddedBring registry (exact name match). + // Do NOT use spec markers: autoSyncUrgencySpecs stamps urgency markers (⚡/🟠/🛒) + // on ALL matched items regardless of who added them, making marker-based detection + // unreliable and causing accidental removal of user-added items. + const _autoAdded = _getAutoAddedBring(); + const isAppAdded = (item) => !!(_autoAdded[item.name.toLowerCase()]); // Build shopping_name family → total stock from smart_shopping (server already computed this) // If smart says a family is NOT needed, it already excluded them. @@ -10649,11 +10697,15 @@ async function cleanupObsoleteBringItems() { } const toRemove = []; + const _pinned = _pinnedBringCache || {}; for (const item of shoppingItems) { const nameLower = item.name.toLowerCase(); const itemToks = _nameTokens(item.name); const itemFirst = itemToks[0]; + // Never remove items explicitly pinned by the user + if (_pinned[nameLower]) continue; + // Only remove items the app put there if (!isAppAdded(item)) continue; @@ -11587,6 +11639,7 @@ async function removeBringItem(idx) { listUUID: shoppingListUUID }); if (data.success) { + _markBringPurchased([item.name]); // prevent background sync from re-adding before barcode scan shoppingItems.splice(idx, 1); renderShoppingItems(); showToast(t('toast.removed_from_list_short'), 'success'); @@ -14646,6 +14699,29 @@ function saveChatHistory() { // ===== SCREENSAVER & INACTIVITY AUTO-REFRESH ===== let _inactivityTimer = null; let _screensaverActive = false; + +// ── Auto-home: always-on 2-minute idle return to dashboard ── +let _autoHomeTimer = null; +const AUTO_HOME_MS = 2 * 60 * 1000; // 2 minutes + +function _resetAutoHomeTimer() { + clearTimeout(_autoHomeTimer); + _autoHomeTimer = setTimeout(_triggerAutoHome, AUTO_HOME_MS); +} + +function _cancelAutoHomeTimer() { + clearTimeout(_autoHomeTimer); + _autoHomeTimer = null; +} + +function _triggerAutoHome() { + if (_screensaverActive) return; + if (document.body.classList.contains('cooking-mode-active')) return; + if (_currentPageId === 'dashboard') return; + const modal = document.getElementById('modal-overlay'); + if (modal && modal.style.display === 'flex') return; + showPage('dashboard'); +} let _screensaverClockInterval = null; let _screensaverFactInterval = null; let _screensaverData = null; // cached data for fact generation @@ -14665,6 +14741,7 @@ function resetInactivityTimer() { function activateScreensaver() { if (_screensaverActive) return; if (document.body.classList.contains('cooking-mode-active')) return; + _cancelAutoHomeTimer(); _screensaverActive = true; const overlay = document.getElementById('screensaver'); overlay.style.display = 'flex'; @@ -14756,6 +14833,7 @@ function dismissScreensaver(targetPage) { refreshCurrentPage(); } resetInactivityTimer(); + _resetAutoHomeTimer(); }, 400); } @@ -15347,16 +15425,22 @@ function initInactivityWatcher() { const events = ['pointerdown', 'pointermove', 'keydown', 'scroll', 'touchstart']; events.forEach(evt => { document.addEventListener(evt, () => { - if (!getSettings().screensaver_enabled) return; if (_screensaverActive) { dismissScreensaver(); - } else { + return; + } + // Auto-home: always reset regardless of screensaver setting + _resetAutoHomeTimer(); + // Screensaver: only if enabled + if (getSettings().screensaver_enabled) { resetInactivityTimer(); } }, { passive: true }); }); _inactivityListenersAttached = true; } + // Always start auto-home timer; screensaver only if enabled + _resetAutoHomeTimer(); if (getSettings().screensaver_enabled) { resetInactivityTimer(); } diff --git a/index.html b/index.html index 5737beb..efa8a91 100644 --- a/index.html +++ b/index.html @@ -333,6 +333,7 @@ +