From 4d972b824e046296b292142aa06debab88fe7293 Mon Sep 17 00:00:00 2001 From: dadaloop82 Date: Wed, 15 Apr 2026 11:05:23 +0000 Subject: [PATCH] fix: vacuum state in move-after-use modal + show all recipe ingredients in cooking mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - showMoveAfterUseModal: add '🫙 Torna sotto vuoto' checkbox (default=previous state) only shown if item was vacuum sealed; confirmMoveAfterUse passes vacuum_sealed to API - showRecipeMoveModal: same vacuum checkbox with wasVacuum default passed from ingredient - confirmRecipeMove: passes vacuum_sealed to inventory_update - PHP API: add vacuum_sealed to recipe ingredient enrichment - renderCookingStep: remove step-text word filter; show ALL unused from_pantry ingredients at every cooking step (AI uses pronouns like 'tagliarla' instead of repeating the ingredient name, causing them to be invisible) --- api/index.php | 1 + assets/js/app.js | 45 ++++++++++++++++++++++++++++++++------------- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/api/index.php b/api/index.php index f1fcf0d..51bd69d 100644 --- a/api/index.php +++ b/api/index.php @@ -2013,6 +2013,7 @@ PROMPT; $ing['default_quantity'] = (float)($bestMatch['default_quantity'] ?? 0); $ing['package_unit'] = $bestMatch['package_unit'] ?? ''; $ing['available_qty'] = $bestMatch['quantity'] . ' ' . $bestMatch['unit']; + $ing['vacuum_sealed'] = !empty($bestMatch['vacuum_sealed']) ? 1 : 0; if (!empty($bestMatch['brand'])) { $ing['brand'] = $bestMatch['brand']; } diff --git a/assets/js/app.js b/assets/js/app.js index ebab010..32c63ad 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -4785,7 +4785,12 @@ function showMoveAfterUseModal(product, fromLoc, remaining, openedId) { const locButtons = otherLocs.map(([k, v]) => `` ).join(''); - + const wasVacuum = !!product.vacuum_sealed; + const vacuumRow = wasVacuum ? ` + ` : ''; document.getElementById('modal-content').innerHTML = `

📦 Spostare il resto?

@@ -4794,6 +4799,7 @@ function showMoveAfterUseModal(product, fromLoc, remaining, openedId) {

Vuoi spostare ${openedId ? 'la confezione aperta' : 'il resto'} di ${escapeHtml(product.name)} in un'altra posizione?

${locButtons}
+ ${vacuumRow}
`; @@ -4803,6 +4809,7 @@ function showMoveAfterUseModal(product, fromLoc, remaining, openedId) { async function confirmMoveAfterUse(productId, fromLoc, toLoc, openedId) { clearMoveModalTimer(); + const newVacuum = document.getElementById('move-vacuum-check')?.checked ? 1 : 0; closeModal(); showLoading(true); try { @@ -4815,6 +4822,7 @@ async function confirmMoveAfterUse(productId, fromLoc, toLoc, openedId) { location: toLoc, expiry_date: addDays(days), product_id: productId, + vacuum_sealed: newVacuum, }); showToast(`📦 Confezione aperta spostata in ${LOCATIONS[toLoc]?.label || toLoc}`, 'success'); } else { @@ -4824,12 +4832,13 @@ async function confirmMoveAfterUse(productId, fromLoc, toLoc, openedId) { if (item) { const product = { name: item.name || '', category: item.category || '' }; let days = estimateExpiryDays(product, toLoc); - if (item.vacuum_sealed) days = getVacuumExpiryDays(days); + if (newVacuum) days = getVacuumExpiryDays(days); await api('inventory_update', {}, 'POST', { id: item.id, location: toLoc, expiry_date: addDays(days), product_id: productId, + vacuum_sealed: newVacuum, }); showToast(`📦 Spostato in ${LOCATIONS[toLoc]?.label || toLoc}`, 'success'); } @@ -7524,7 +7533,11 @@ async function submitRecipeUse(useAll) { // Check low stock → Bring! prompt, then offer move const moveCallback = result.remaining > 0 - ? () => setTimeout(() => showRecipeMoveModal(productId, location, result.remaining, result.opened_id), 300) + ? () => setTimeout(() => { + const ingData = _cachedRecipe?.recipe?.ingredients?.[_recipeUseContext?.idx]; + const wasVacuum = !!(ingData?.vacuum_sealed); + showRecipeMoveModal(productId, location, result.remaining, result.opened_id, wasVacuum); + }, 300) : null; setTimeout(() => showLowStockBringPrompt(result, moveCallback), 300); } else { @@ -7541,12 +7554,16 @@ async function submitRecipeUse(useAll) { _recipeUseContext = null; } -function showRecipeMoveModal(productId, fromLoc, remaining, openedId) { +function showRecipeMoveModal(productId, fromLoc, remaining, openedId, wasVacuum) { const otherLocs = Object.entries(LOCATIONS).filter(([k]) => k !== fromLoc); const locButtons = otherLocs.map(([k, v]) => `` ).join(''); - + const vacuumRow = wasVacuum ? ` + ` : ''; document.getElementById('modal-content').innerHTML = `

📦 Spostare il resto?

@@ -7555,6 +7572,7 @@ function showRecipeMoveModal(productId, fromLoc, remaining, openedId) {

Vuoi spostare ${openedId ? 'la confezione aperta' : 'il resto'} in un'altra posizione?

${locButtons}
+ ${vacuumRow}
`; @@ -7564,27 +7582,31 @@ function showRecipeMoveModal(productId, fromLoc, remaining, openedId) { async function confirmRecipeMove(productId, fromLoc, toLoc, openedId) { clearMoveModalTimer(); + const newVacuum = document.getElementById('move-vacuum-check')?.checked ? 1 : 0; closeModal(); try { if (openedId) { let days = estimateExpiryDays({ name: '', category: '' }, toLoc); + if (newVacuum) days = getVacuumExpiryDays(days); await api('inventory_update', {}, 'POST', { id: openedId, location: toLoc, expiry_date: addDays(days), product_id: productId, + vacuum_sealed: newVacuum, }); } else { const data = await api('inventory_list'); const item = (data.inventory || []).find(i => i.product_id == productId && i.location === fromLoc && parseFloat(i.quantity) > 0); if (item) { let days = estimateExpiryDays({ name: item.name || '', category: item.category || '' }, toLoc); - if (item.vacuum_sealed) days = getVacuumExpiryDays(days); + if (newVacuum) days = getVacuumExpiryDays(days); await api('inventory_update', {}, 'POST', { id: item.id, location: toLoc, expiry_date: addDays(days), product_id: productId, + vacuum_sealed: newVacuum, }); } } @@ -7731,15 +7753,12 @@ function renderCookingStep() { }).join(''); } - // Find pantry ingredients that appear in this step's text and haven't been used yet - const stepLower = cleanStep.toLowerCase(); + // Show ALL unused from_pantry ingredients (not filtered by step text). + // The AI often uses pronouns ("tagliarla", "aggiungile") instead of the ingredient + // name, so text-matching would miss them. Better to always show what's available. const ings = (_cookingRecipe.ingredients || []) .map((ing, idx) => ({ ...ing, _idx: idx })) - .filter(ing => ing.from_pantry && ing.product_id && ing.used !== true) - .filter(ing => { - const name = (ing.name || '').toLowerCase(); - return name.split(' ').some(word => word.length > 2 && stepLower.includes(word)); - }); + .filter(ing => ing.from_pantry && ing.product_id && ing.used !== true); const ingsEl = document.getElementById('cooking-step-ings'); if (ings.length > 0) {