From 4239e0b20497fd9cf151c05d04a7e30d037fbf84 Mon Sep 17 00:00:00 2001 From: dadaloop82 Date: Sun, 15 Mar 2026 18:09:38 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=AB=99=20Sotto=20vuoto:=20flag=20per=20es?= =?UTF-8?q?tendere=20scadenza=20prodotti=20conservati=20sotto=20vuoto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/database.php | 7 ++++ api/index.php | 23 ++++++++----- assets/css/style.css | 54 ++++++++++++++++++++++++++++++ assets/js/app.js | 78 +++++++++++++++++++++++++++++++++++++++++-- data/dispensa.db | Bin 167936 -> 167936 bytes index.html | 14 ++++++-- 6 files changed, 163 insertions(+), 13 deletions(-) diff --git a/api/database.php b/api/database.php index 662d136..0c250be 100644 --- a/api/database.php +++ b/api/database.php @@ -140,4 +140,11 @@ function migrateDB(PDO $db): void { ); "); } + + // Add vacuum_sealed column to inventory if missing + $invCols = $db->query("PRAGMA table_info(inventory)")->fetchAll(); + $invColNames = array_column($invCols, 'name'); + if (!in_array('vacuum_sealed', $invColNames)) { + $db->exec("ALTER TABLE inventory ADD COLUMN vacuum_sealed INTEGER DEFAULT 0"); + } } diff --git a/api/index.php b/api/index.php index cf9ff8f..1fcd5db 100644 --- a/api/index.php +++ b/api/index.php @@ -467,7 +467,8 @@ function searchProducts(PDO $db): void { function listInventory(PDO $db): void { $location = $_GET['location'] ?? ''; $query = " - SELECT i.*, p.name, p.brand, p.category, p.image_url, p.unit, p.barcode, p.default_quantity, p.package_unit + SELECT i.*, p.name, p.brand, p.category, p.image_url, p.unit, p.barcode, p.default_quantity, p.package_unit, + COALESCE(i.vacuum_sealed, 0) as vacuum_sealed FROM inventory i JOIN products p ON i.product_id = p.id "; @@ -510,6 +511,8 @@ function addToInventory(PDO $db): void { $stmt->execute([$packageUnit, $packageSize ?: 0, $productId]); } + $vacuumSealed = (int)($input['vacuum_sealed'] ?? 0); + // Check if product already exists in this location $stmt = $db->prepare("SELECT id, quantity FROM inventory WHERE product_id = ? AND location = ?"); $stmt->execute([$productId, $location]); @@ -518,13 +521,13 @@ function addToInventory(PDO $db): void { if ($existing) { // Update quantity $newQty = $existing['quantity'] + $quantity; - $stmt = $db->prepare("UPDATE inventory SET quantity = ?, expiry_date = COALESCE(?, expiry_date), updated_at = CURRENT_TIMESTAMP WHERE id = ?"); - $stmt->execute([$newQty, $expiry, $existing['id']]); + $stmt = $db->prepare("UPDATE inventory SET quantity = ?, expiry_date = COALESCE(?, expiry_date), vacuum_sealed = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?"); + $stmt->execute([$newQty, $expiry, $vacuumSealed, $existing['id']]); } else { $newQty = $quantity; // Insert new inventory entry - $stmt = $db->prepare("INSERT INTO inventory (product_id, location, quantity, expiry_date) VALUES (?, ?, ?, ?)"); - $stmt->execute([$productId, $location, $quantity, $expiry]); + $stmt = $db->prepare("INSERT INTO inventory (product_id, location, quantity, expiry_date, vacuum_sealed) VALUES (?, ?, ?, ?, ?)"); + $stmt->execute([$productId, $location, $quantity, $expiry, $vacuumSealed]); } // Get total across all locations @@ -711,6 +714,7 @@ function updateInventory(PDO $db): void { if (isset($input['quantity'])) { $fields[] = "quantity = ?"; $params[] = $input['quantity']; } if (isset($input['location'])) { $fields[] = "location = ?"; $params[] = $input['location']; } if (isset($input['expiry_date'])) { $fields[] = "expiry_date = ?"; $params[] = $input['expiry_date']; } + if (isset($input['vacuum_sealed'])) { $fields[] = "vacuum_sealed = ?"; $params[] = (int)$input['vacuum_sealed']; } $fields[] = "updated_at = CURRENT_TIMESTAMP"; $params[] = $id; @@ -787,7 +791,8 @@ function getStats(PDO $db): void { // Expiring soonest (next 4 items to expire) $expiring = $db->query(" - SELECT i.*, p.name, p.brand, p.category, p.unit, p.default_quantity, p.package_unit + SELECT i.*, p.name, p.brand, p.category, p.unit, p.default_quantity, p.package_unit, + COALESCE(i.vacuum_sealed, 0) as vacuum_sealed FROM inventory i JOIN products p ON i.product_id = p.id WHERE i.expiry_date IS NOT NULL AND i.expiry_date >= date('now') AND i.quantity > 0 ORDER BY i.expiry_date ASC @@ -796,7 +801,8 @@ function getStats(PDO $db): void { // Expired $expired = $db->query(" - SELECT i.*, p.name, p.brand, p.category, p.unit, p.default_quantity, p.package_unit + SELECT i.*, p.name, p.brand, p.category, p.unit, p.default_quantity, p.package_unit, + COALESCE(i.vacuum_sealed, 0) as vacuum_sealed FROM inventory i JOIN products p ON i.product_id = p.id WHERE i.expiry_date IS NOT NULL AND i.expiry_date < date('now') ORDER BY i.expiry_date ASC @@ -804,7 +810,8 @@ function getStats(PDO $db): void { // Opened (partially used conf items with known package capacity) $opened = $db->query(" - SELECT i.*, p.name, p.brand, p.category, p.unit, p.default_quantity, p.package_unit, p.image_url + SELECT i.*, p.name, p.brand, p.category, p.unit, p.default_quantity, p.package_unit, p.image_url, + COALESCE(i.vacuum_sealed, 0) as vacuum_sealed FROM inventory i JOIN products p ON i.product_id = p.id WHERE p.unit = 'conf' AND p.default_quantity > 0 AND p.package_unit IS NOT NULL AND i.quantity > 0 AND CAST(i.quantity AS REAL) != CAST(CAST(i.quantity AS INTEGER) AS REAL) diff --git a/assets/css/style.css b/assets/css/style.css index 850fbea..e85d8c9 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -1998,6 +1998,60 @@ body { margin-top: 4px; } +/* ===== TOGGLE SWITCH ===== */ +.toggle-row { + display: flex; + justify-content: space-between; + align-items: center; + cursor: pointer; + -webkit-tap-highlight-color: transparent; +} +.toggle-switch { + position: relative; + display: inline-block; + width: 48px; + height: 28px; + flex-shrink: 0; +} +.toggle-switch input { + opacity: 0; + width: 0; + height: 0; +} +.toggle-slider { + position: absolute; + top: 0; left: 0; right: 0; bottom: 0; + background: #ccc; + border-radius: 28px; + transition: background 0.2s; +} +.toggle-slider::before { + content: ''; + position: absolute; + width: 22px; + height: 22px; + left: 3px; + bottom: 3px; + background: #fff; + border-radius: 50%; + transition: transform 0.2s; +} +.toggle-switch input:checked + .toggle-slider { + background: var(--primary, #3b82f6); +} +.toggle-switch input:checked + .toggle-slider::before { + transform: translateX(20px); +} +.vacuum-badge { + font-size: 0.7rem; + background: rgba(59, 130, 246, 0.12); + color: #2563eb; + padding: 1px 6px; + border-radius: 8px; + font-weight: 600; + white-space: nowrap; +} + /* ===== REMAINING QUANTITY OPTIONS ===== */ .remaining-options { display: grid; diff --git a/assets/js/app.js b/assets/js/app.js index aee7666..ae4513c 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -1172,6 +1172,8 @@ function renderInventoryItem(item) { expiryBadge = `${expiryText}`; } + const vacuumBadge = item.vacuum_sealed ? 'πŸ«™ Sotto vuoto' : ''; + return `
@@ -1183,6 +1185,7 @@ function renderInventoryItem(item) {
${locInfo.icon} ${locInfo.label} ${expiryBadge} + ${vacuumBadge}
@@ -1261,6 +1264,11 @@ function showItemDetail(inventoryId, productId) { πŸ“… Scadenza ${formatDate(item.expiry_date)}
` : ''} + ${item.vacuum_sealed ? ` +
+ πŸ«™ Conservazione + Sotto vuoto +
` : ''} ${item.barcode ? `
πŸ”– Barcode @@ -1383,6 +1391,15 @@ function editInventoryItem(id) {
+
+ +
`; @@ -1402,7 +1419,8 @@ async function submitEditInventory(e, id, productId) { const expiry = document.getElementById('edit-expiry').value || null; const unit = document.getElementById('edit-unit').value; - const payload = { id, quantity: qty, location: loc, expiry_date: expiry, unit, product_id: productId }; + const payload = { id, quantity: qty, location: loc, expiry_date: expiry, unit, product_id: productId, + vacuum_sealed: document.getElementById('edit-vacuum')?.checked ? 1 : 0 }; // Add package info if conf if (unit === 'conf') { @@ -2414,7 +2432,8 @@ function showProductAction() { else if (d <= 7) expiryStr = ` Β· 🟑 Scade tra ${d}g`; else expiryStr = ` Β· πŸ“… ${formatDate(inv.expiry_date)}`; } - return `
${locInfo.icon} ${locInfo.label}${expiryStr}${qtyStr}${pkgF ? ' ' + pkgF : ''} ✏️
`; + const vacuumIcon = inv.vacuum_sealed ? ' πŸ«™' : ''; + return `
${locInfo.icon} ${locInfo.label}${vacuumIcon}${expiryStr}${qtyStr}${pkgF ? ' ' + pkgF : ''} ✏️
`; }).join(''); const totalStr = formatQuantity(totalQty, unit, defQty, pkgUnit); @@ -2570,6 +2589,15 @@ function editActionInventoryItem(inventoryId) {
+
+ +
@@ -2592,7 +2620,8 @@ async function submitActionEditInventory(e, id, productId) { const expiry = document.getElementById('action-edit-expiry').value || null; const unit = document.getElementById('action-edit-unit').value; - const payload = { id, quantity: qty, location: loc, expiry_date: expiry, unit, product_id: productId }; + const payload = { id, quantity: qty, location: loc, expiry_date: expiry, unit, product_id: productId, + vacuum_sealed: document.getElementById('action-edit-vacuum')?.checked ? 1 : 0 }; if (unit === 'conf') { payload.package_unit = document.getElementById('action-edit-conf-unit')?.value || ''; @@ -2862,6 +2891,15 @@ function showAddForm() { const estimatedDate = addDays(estimatedDays); const estimateLabel = formatEstimatedExpiry(estimatedDays); + // Reset vacuum sealed toggle + const vacuumCb = document.getElementById('add-vacuum-sealed'); + if (vacuumCb) { + vacuumCb.checked = false; + document.getElementById('add-vacuum-hint').style.display = 'none'; + } + // Store base expiry for vacuum recalculation + window._addBaseExpiryDays = estimatedDays; + expirySection.innerHTML = `
@@ -2888,6 +2926,39 @@ function showAddForm() { showPage('add'); } +function toggleVacuumSealed() { + const cb = document.getElementById('add-vacuum-sealed'); + if (cb) cb.checked = !cb.checked; + onVacuumSealedChange(); +} + +function onVacuumSealedChange() { + const isVacuum = document.getElementById('add-vacuum-sealed')?.checked; + const hint = document.getElementById('add-vacuum-hint'); + if (hint) hint.style.display = isVacuum ? 'block' : 'none'; + + // Recalculate expiry based on vacuum sealed + const baseDays = window._addBaseExpiryDays || 180; + const days = isVacuum ? getVacuumExpiryDays(baseDays) : baseDays; + const newDate = addDays(days); + const newLabel = formatEstimatedExpiry(days); + + const expiryInput = document.getElementById('add-expiry'); + const estimateEl = document.querySelector('.expiry-estimate-label'); + const dateEl = document.querySelector('.expiry-estimate-date'); + if (expiryInput) expiryInput.value = newDate; + if (estimateEl) estimateEl.innerHTML = `Scadenza stimata: ${newLabel}${isVacuum ? ' (sotto vuoto)' : ''}`; + if (dateEl) dateEl.textContent = formatDate(newDate); +} + +function getVacuumExpiryDays(baseDays) { + // Vacuum sealing roughly triples fresh food shelf life, less effect on long-lasting items + if (baseDays <= 7) return Math.round(baseDays * 3); // fresh: 3x (e.g., 3β†’9, 7β†’21) + if (baseDays <= 30) return Math.round(baseDays * 2.5); // short: 2.5x (e.g., 14β†’35) + if (baseDays <= 90) return Math.round(baseDays * 2); // medium: 2x + return Math.round(baseDays * 1.5); // long-lasting: 1.5x +} + function onAddUnitChange() { updateAddQtyStep(); const unit = document.getElementById('add-unit').value; @@ -3061,6 +3132,7 @@ async function submitAdd(e) { unit: selectedUnit !== productUnit ? selectedUnit : null, package_unit: selectedUnit === 'conf' ? (document.getElementById('add-conf-unit')?.value || null) : null, package_size: selectedUnit === 'conf' ? (parseFloat(document.getElementById('add-conf-size')?.value) || null) : null, + vacuum_sealed: document.getElementById('add-vacuum-sealed')?.checked ? 1 : 0, }); showLoading(false); diff --git a/data/dispensa.db b/data/dispensa.db index 010997be58093b455f8d1bcfe6f65f95391bfcfe..89e6bc1eac90a5abdae76d4325591c542f10b03b 100644 GIT binary patch delta 509 zcmZozz}2vTYl5_(ECU0BCJ@7b@I)PBQCSAPWJX?g9|i$NQwH9vyi0h4xP3O3Fmf{9 z+T6%_jghN`nT1_kUY@Z%baOd(6QhDcSz>Z&X>NRRYGO`mih`$Kh^xD6kb;Y=n`5X? zh=Rf9A3Xbv7*9{$Zm-VRxB0%kssQsTu7{i118NzWfOJb>G$#i;GZPa-55wurFQcSI znHzX+Pi8N8$;5Me^M`_$+%Va`&5vsonVB0nmrrJI_|L?-e6ym!d=73dW^typqRjMs zhQ8)ao!d8cG6tnFE3lVLXaB%x&%|B=RHef%;@HT?!N4TWq-bo+&;wEaYdZfAMoDo? zD?>9Q10yqC17lr7Qw2kFD^rlr_8s3DeIl5vSX`&G2QYnRVsQl;| zF)%bXG<7O1D#~|BRR~DT&&gEqDa}mJR7h1w%S_M7oW47Q$!c=kKDOyq)l9vtAg35@ zUsuQ!!^zCRz&M@Jf+=P41kTypd1{z`Ff;S>PMpr(z$DAWI}zx*Y+gaNMsJ`u1)0Qo Yf!@r_WB4`wLm!g}3)n-udYRmq0OM(m+W-In delta 338 zcmZozz}2vTYl5_(3GT%*X$T+g{_GJC^+py_Kknm2WB z-_*$%l*TO2zGFK32S$6Ka1s0V9p4#!BA6>#;-<3)FntD!r7%x-4Pg@AUKqjz^a;=h z0*vbz_?`Khc&GC4aC1!;Dqxzjc>*T~^nu?94{7j9i#>TuB z1||lE#)hW8iN!gI$xfw3MfnOTsR{*&`8k=>bIO>kC&%q$n=Vtx)XQpOYGq=wou`KB a2QxDt@2=_W4NS5?M@-}0zN?qXjR^p;_GJG6 diff --git a/index.html b/index.html index 0190537..9454dcd 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,7 @@ Dispensa Manager - + @@ -218,6 +218,16 @@
+
+ + +
@@ -884,6 +894,6 @@ - +