From eb5ee60dd7025080c564c294b9f5b888462f8f51 Mon Sep 17 00:00:00 2001
From: dadaloop82 <dadaloop82@users.noreply.github.com>
Date: Mon, 16 Mar 2026 06:48:48 +0000
Subject: [PATCH] Sposta prodotto dopo l'uso + fix prodotti aperti
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Dopo aver usato un prodotto, se rimane quantità mostra modal con opzione
  di spostarlo in un'altra posizione (es. dispensa→frigo dopo apertura)
- La scadenza viene ricalcolata per la nuova posizione
- Fix marmellata: default_quantity era 0 → non appariva tra prodotti aperti
- Auto-set default_quantity al primo add per prodotti g/ml/kg/l senza pkg size
- Versione: 20260316b
---
 api/index.php    |   9 ++++++++
 assets/js/app.js |  53 ++++++++++++++++++++++++++++++++++++++++++++++-
 data/dispensa.db | Bin 176128 -> 180224 bytes
 index.html       |   2 +-
 4 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/api/index.php b/api/index.php
index c2cddf9..fe2a62c 100644
--- a/api/index.php
+++ b/api/index.php
@@ -501,6 +501,15 @@ function addToInventory(PDO $db): void {
     if ($unit) {
         $stmt = $db->prepare("UPDATE products SET unit = ?, default_quantity = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?");
         $stmt->execute([$unit, $quantity, $productId]);
+    } else {
+        // Auto-set default_quantity if product has none (first add sets package size)
+        $stmt = $db->prepare("SELECT default_quantity, unit FROM products WHERE id = ?");
+        $stmt->execute([$productId]);
+        $prod = $stmt->fetch();
+        if ($prod && (float)($prod['default_quantity'] ?? 0) == 0 && !in_array($prod['unit'], ['pz', 'conf'])) {
+            $stmt = $db->prepare("UPDATE products SET default_quantity = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?");
+            $stmt->execute([$quantity, $productId]);
+        }
     }
     
     // Update package info if conf
diff --git a/assets/js/app.js b/assets/js/app.js
index a8d1188..008d56d 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -3410,6 +3410,51 @@ function selectUseLocation(btn, loc) {
     document.getElementById('use-location').value = loc;
 }
 
+function showMoveAfterUseModal(product, fromLoc, remaining) {
+    const otherLocs = Object.entries(LOCATIONS).filter(([k]) => k !== fromLoc);
+    const locButtons = otherLocs.map(([k, v]) =>
+        `<button type="button" class="loc-btn" onclick="confirmMoveAfterUse(${product.id}, '${fromLoc}', '${k}')">${v.icon} ${v.label}</button>`
+    ).join('');
+    
+    document.getElementById('modal-content').innerHTML = `
+        <div class="modal-header">
+            <h3>📦 Spostare il resto?</h3>
+            <button class="modal-close" onclick="closeModal();showPage('dashboard')">✕</button>
+        </div>
+        <div style="padding:0 16px 16px">
+            <p style="margin-bottom:12px">Vuoi spostare il resto di <strong>${escapeHtml(product.name)}</strong> in un'altra posizione?</p>
+            <div class="location-selector">${locButtons}</div>
+            <button type="button" class="btn btn-secondary full-width" style="margin-top:12px" onclick="closeModal();showPage('dashboard')">No, resta in ${LOCATIONS[fromLoc]?.label || fromLoc}</button>
+        </div>
+    `;
+    document.getElementById('modal-overlay').style.display = 'flex';
+}
+
+async function confirmMoveAfterUse(productId, fromLoc, toLoc) {
+    closeModal();
+    showLoading(true);
+    try {
+        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) {
+            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,
+            });
+            showToast(`📦 Spostato in ${LOCATIONS[toLoc]?.label || toLoc}`, 'success');
+        }
+    } catch (e) {
+        console.error('Move error:', e);
+    }
+    showLoading(false);
+    showPage('dashboard');
+}
+
 async function submitUseAll() {
     showLoading(true);
     try {
@@ -3462,7 +3507,13 @@ async function submitUse(e) {
             if (result.added_to_bring) {
                 setTimeout(() => showToast('🛒 Prodotto finito → aggiunto a Bring!', 'info'), 1500);
             }
-            showPage('dashboard');
+            // If there's remaining quantity, offer to move to another location
+            const usedFrom = document.getElementById('use-location').value;
+            if (result.remaining > 0) {
+                showMoveAfterUseModal(currentProduct, usedFrom, result.remaining);
+            } else {
+                showPage('dashboard');
+            }
         } else {
             showToast(result.error || 'Errore', 'error');
         }
diff --git a/data/dispensa.db b/data/dispensa.db
index 3a22ba3e5a67aef6f4aa0299c7688b022fdab294..78bcfb0a93c1db01fc14ecb003751cfc74032bc2 100644
GIT binary patch
delta 1915
zcmZ`)U2IfE6uvWe+ikb)4%#2Ah)zrT11xphrGHCw3q+6@<5o}-HG%2f*~`G)JInnc
zu?AXvFvMtN)0ja>L|+J16v(3cA}0KV^hK?j_(lYL@P!y85fg~UbGPlbCi=8<XXc#m
zobUV2?BtEe<Ye8^6;)Kzv{-?r5Iw*9<y3UGE~KwO4mU)eyV2s+)W|aZyU4|2IBg&d
zzk5eVYs1w#!iTik;?-9+cc8|pn#qr+KAqf(BR>@HPTr_(sMVLFtRqb6L+;|wZ+HCB
z5+>JSt;NU#a*zB@Zj)chEpom1(8x7{*EXnI@1gdl8nRu3lgs2M@;*634iiDP7u%L?
zAT7<IwpP>^?;BVbPps=5$UDp)mr*57q7x8xM1zdC$dBYI`GTAxiX4HcJW=W_YQO{0
z68!ERX|8!oqt&~r!VkznG8DZRJs-8gUa92{(yK#ZPuo%`Y%1-#hnmsmjef0$mgBZW
zqUKP!4HN?G!8z<o75%h#FxfYlObk}G255XBxjvqZ_m@h4B924RF725@VPlEiN7wWa
z`Fifl`Wqb^)hF~B6;9*7us#FjUdFAD=n4GqREgnae_Wd_-Q138ePf-_h&F?x-!^>T
zkgflv?xr@Qns(z0O6<dSWC`{N!>c19VEaI!;FWIf!>gL~rur)?Jc+w-{S`o)s$biE
zI9;QmMzpdaaY*{!mW*)o+;-W2R8acu9sKaBNCRX<`n0A`Lxz)j=GcyCSZixN#}bP%
zbIQEY?g`K0?aB7Ew7BgtnrE&j3_~zj8`7p(>ExJc3Q4oRD`OO}jeXQ`q+u}I<CN3a
zrRh7Ky5E7)YYdr#01u*MrajhvfLqewuy9#kI>M8%1jG7y?x?49{OA_uNh+)*Ae*>F
z(~P@8VoT1W37fhG%W!*~#b6%-T%MDbu;Bvi`%|gYE7g~sC|XOq(~igqwpzXL0Zyr^
zF7&kCH`uQ(9mCD))h^Uo1z*%u`$M=xeY62rsdHT@s^Zi5F|~gP4XHP$@r7pEz0IPg
z??Q1vfyXj{v|63*Mk(cgf-k9^FCtn^yPp>pQ%~05$JOi_)PZ}4)Q89Mu)e-OuFjtZ
zyxt`4Y=kdrLfd072^ruSg4E#<oTg6TMs*xWP^X4rb#w#jP`7n_QGHc~6R1z!sls<v
zEP_W={~7$8dN+oWJ7d)MgeAtuAs5sp9D~uJxJfgD=I8Zufpd_K)4q5-X9Xt~^E}=|
zH-d=1Z3^n!G!H3+A%jzwSzJB44s}j=%(MjiKRLh+{uuW>u~ZmFE#Z31;g-dzE8)}<
zJ<x2Lxvr#%B;95MTwtmUTwxR(BVg%((|C+#nV^nzr3DG7HL;*}Hqez(xCA%B0~N3J
z&>a#=q!||ETFA+1u3T0o*m9uL3jX>e9reph1=r{KdCiZ<`4G)Jfv_=pfIGkdbZt+}
z5d&n&C1i<8+rZW0EG)HYj=Ki*K*zYvDHLz)DPs&%8^*^4h7BPtQ$kaQ!^`D>0z8|A
zs>@qBpa2jj7W83|fd|DHzG3VU3`Q@|X~FR@JCtQ$7~C>#+%&n93kY3oygx~|`pmHf
zK!g01-h+9r3{{0z5HtWwFGZW1X<)_Uj+}E4w8m{H^d)!`1Z2r{!2||E8IB*AQRea%
z2j{_b=Hd15q#8YoTc*DGJVJasFdNI~nHjtpN~UnD`s^f*OvC~qJT8DaPE7}FBYG$d
z-y+jXo&nelS}HTiEMOI47Q$oT0^19GB<CL_8oXLy_;Pn1JXd8Jvks`Whr<K~!B04H
VOh|a|z_kY#-^TKv!%(t!;2(}wZ_EGy

delta 410
zcmZo@;BI)pH9?wHo`Hcud!m9pqx{B%Fnhl9+$_w}j76!*nFXoEyqk~MI|wkJ<2tgL
zJs_EJb539&=fnWc%}1h~RT%{)b2Kbuyfk@5gU9Ai4G%bZd6;DxQ!<MSQuB%vOE=%|
zQvE8z#{URtJcBm>Z~kxmANk+#Kj(k6S<vAu|MaK*jPgS4{Fw|u!9)Dl_^0x(;cw*6
z+^i@N%s)MIKI3el<a7q0o=5zb`H%2#<zL1>9VpqzKfPl;Bk%Sl>ltGmMA=Ii6xiZf
z*njia@>}qI<J-uW!>7Jo>;oe++r$NK+vC46iZZfrv@y6$oanH9$9KjQCKmpE46YL=
zI&M$=#dwTa-no>6fl-!8(b%{S=5j_aBLgFIT?1oXL(}OKzcb2ApY@%QYkST=#u<Uk
zb<7W^vj;H!1-j%e)ASR;OuXCQ1v3fr2m?LI&*;FwcaHZWZyL{I?uXo&(?t@PwoF`5
zvE3n&Nt0{(i3FxRE>i_Vb1NfrD`VsB53`w+MVN(o-c4t3U{VJfcz|d7yB;PXWdKI>
Bhrj>;

diff --git a/index.html b/index.html
index 3811bef..79655cb 100644
--- a/index.html
+++ b/index.html
@@ -895,6 +895,6 @@
     </div>
 </div>
 
-<script src="assets/js/app.js?v=20260316a"></script>
+<script src="assets/js/app.js?v=20260316b"></script>
 </body>
 </html>