From 68dd7810f0ba0bbbc93370546875a48ff722d420 Mon Sep 17 00:00:00 2001 From: dadaloop82 Date: Sun, 15 Mar 2026 19:15:22 +0000 Subject: [PATCH] Fix ricalcolo scadenza per freezer e sotto vuoto MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - selectPurchaseType: non usa più date hardcoded, ricalcola sempre in base alla posizione e stato sotto vuoto corrente - Edit inventario: cambiare posizione o toggle sotto vuoto ricalcola la scadenza - Spostamento prodotto: ricalcola scadenza per la nuova posizione - Fix DB: fusi di pollo freezer 120gg, Bel Paese vacuum 21gg, Speck vacuum 75gg - Versione: 20260315j --- assets/js/app.js | 49 +++++++++++++++++++++++++++++++++++++++-------- data/dispensa.db | Bin 172032 -> 172032 bytes index.html | 2 +- 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/assets/js/app.js b/assets/js/app.js index 6c34d4c..89a7032 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -1367,6 +1367,18 @@ async function deleteInventoryItem(id) { } } +function recalcEditExpiry(locInputId, vacuumInputId, expiryInputId) { + const product = window._editingProduct; + if (!product) return; + const loc = document.getElementById(locInputId)?.value || ''; + const isVacuum = document.getElementById(vacuumInputId)?.checked; + let days = estimateExpiryDays(product, loc); + if (isVacuum) days = getVacuumExpiryDays(days); + const newDate = addDays(days); + const expiryInput = document.getElementById(expiryInputId); + if (expiryInput) expiryInput.value = newDate; +} + function editInventoryItem(id) { const item = currentInventory.find(i => i.id === id); if (!item) { @@ -1379,6 +1391,8 @@ function editInventoryItem(id) { const confSizeVal = (isConf && item.default_quantity > 0) ? item.default_quantity : ''; const confUnitVal = (isConf && item.package_unit) ? item.package_unit : 'g'; + window._editingProduct = { name: item.name, category: item.category || '' }; + // Rebuild modal content for editing (don't close and reopen - just replace content) document.getElementById('modal-content').innerHTML = `
@@ -1414,7 +1428,7 @@ function editInventoryItem(id) {
${Object.entries(LOCATIONS).map(([k, v]) => ` + onclick="this.parentElement.querySelectorAll('.loc-btn').forEach(b=>b.classList.remove('active'));this.classList.add('active');document.getElementById('edit-loc').value='${k}';recalcEditExpiry('edit-loc','edit-vacuum','edit-expiry')">${v.icon} ${v.label} `).join('')}
@@ -1427,7 +1441,7 @@ function editInventoryItem(id) { @@ -2578,6 +2592,8 @@ function editActionInventoryItem(inventoryId) { const confSizeVal = (isConf && item.default_quantity > 0) ? item.default_quantity : ''; const confUnitVal = (isConf && item.package_unit) ? item.package_unit : 'g'; + window._editingProduct = { name: item.name || currentProduct.name, category: item.category || currentProduct.category || '' }; + document.getElementById('modal-content').innerHTML = `

Modifica ${escapeHtml(item.name || currentProduct.name)}

@@ -2612,7 +2628,7 @@ function editActionInventoryItem(inventoryId) {
${Object.entries(LOCATIONS).map(([k, v]) => ` + onclick="this.parentElement.querySelectorAll('.loc-btn').forEach(b=>b.classList.remove('active'));this.classList.add('active');document.getElementById('action-edit-loc').value='${k}';recalcEditExpiry('action-edit-loc','action-edit-vacuum','action-edit-expiry')">${v.icon} ${v.label} `).join('')}
@@ -2625,7 +2641,7 @@ function editActionInventoryItem(inventoryId) { @@ -2937,10 +2953,10 @@ function showAddForm() { expirySection.innerHTML = `
- -
@@ -3085,7 +3101,7 @@ function adjustAddQty(delta) { qtyInput.value = val; } -function selectPurchaseType(btn, type, estimatedDate, estimateLabel) { +function selectPurchaseType(btn, type) { btn.parentElement.querySelectorAll('.purchase-type-btn').forEach(b => b.classList.remove('active')); btn.classList.add('active'); @@ -3095,9 +3111,21 @@ function selectPurchaseType(btn, type, estimatedDate, estimateLabel) { const currentQty = document.getElementById('add-quantity').value; if (type === 'new') { + // Recalculate fresh expiry based on current location/vacuum + const loc = document.getElementById('add-location')?.value || ''; + const isVacuum = document.getElementById('add-vacuum-sealed')?.checked; + let days = estimateExpiryDays(currentProduct, loc); + if (isVacuum) days = getVacuumExpiryDays(days); + const estimatedDate = addDays(days); + const estimateLabel = formatEstimatedExpiry(days); + let suffix = ''; + if (loc === 'freezer' && isVacuum) suffix = ' (freezer + sotto vuoto)'; + else if (loc === 'freezer') suffix = ' (freezer)'; + else if (isVacuum) suffix = ' (sotto vuoto)'; + detailDiv.innerHTML = `
- Scadenza stimata: ${estimateLabel} + Scadenza stimata: ${estimateLabel}${suffix} ${formatDate(estimatedDate)}
@@ -3418,9 +3446,14 @@ async function moveInventoryLocation(productId, fromLoc, toLoc) { 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) return; + // Recalculate expiry for new location + const product = { name: item.name || '', category: item.category || '' }; + let days = estimateExpiryDays(product, toLoc); + if (item.vacuum_sealed) days = getVacuumExpiryDays(days); await api('inventory_update', {}, 'POST', { id: item.id, location: toLoc, + expiry_date: addDays(days), product_id: productId, }); } catch (e) { diff --git a/data/dispensa.db b/data/dispensa.db index 6e8ab5eef43917fc247cab97f4ca5cce8dd72fed..d8c1daba699eddba7ce09f709d73460db51ce8ee 100644 GIT binary patch delta 117 zcmZoTz|{amTNv3sFvd@3|G=ot#1_BZ1W20(Ds<`j9QE=TrvzU6DK-sKlOt# Vh>?YVAA{?}iH_S7e=*Kq3IKeaCm#R+ delta 113 zcmZoTz|{amTNv3sFfN_W{((`OiA!d?36N%+xWH}t(r=6jEGD{!Cet~;GdfPc_?=OB zd+c{cO-2^}eGD!WCpv6D^@A~pQQoPMg@b`fno-f%n4vGNC^fYzwTR8gz{pJ3z*yJN RVtV~IMvd*szZmB(1pv|9CWQb1 diff --git a/index.html b/index.html index 9109f2b..3dd86e8 100644 --- a/index.html +++ b/index.html @@ -904,6 +904,6 @@
- +