From bf2e1375027c6299dc491cdf24d912e37de60fa1 Mon Sep 17 00:00:00 2001 From: dadaloop82 Date: Wed, 11 Mar 2026 15:43:44 +0000 Subject: [PATCH] feat: confezioni (conf) chiede dimensione singola confezione - Nuovo campo package_unit in DB (migrazione automatica) - Form aggiungi/modifica: quando si seleziona 'conf', appare campo per specificare il contenuto della singola confezione (es. 300g, 2L) - Visualizzazione: '3 conf (da 300g)' in inventario, dettaglio, butta - formatQuantity aggiornato con supporto package_unit - API: salva/restituisce package_unit in tutti gli endpoint - Ricette e chat: contesto arricchito con info confezione - CSS: stili per il nuovo campo conf-size --- api/database.php | 13 +++++ api/index.php | 41 ++++++++++---- assets/css/style.css | 39 ++++++++++++++ assets/js/app.js | 125 +++++++++++++++++++++++++++++++++++-------- data/dispensa.db | Bin 81920 -> 86016 bytes index.html | 26 ++++++++- 6 files changed, 210 insertions(+), 34 deletions(-) diff --git a/api/database.php b/api/database.php index 12e0eef..f8d5a82 100644 --- a/api/database.php +++ b/api/database.php @@ -16,6 +16,10 @@ function getDB(): PDO { if ($isNew) { initializeDB($db); } + + // Run migrations + migrateDB($db); + return $db; } @@ -64,3 +68,12 @@ function initializeDB(PDO $db): void { CREATE INDEX IF NOT EXISTS idx_transactions_date ON transactions(created_at); "); } + +function migrateDB(PDO $db): void { + // Add package_unit column if missing + $cols = $db->query("PRAGMA table_info(products)")->fetchAll(); + $colNames = array_column($cols, 'name'); + if (!in_array('package_unit', $colNames)) { + $db->exec("ALTER TABLE products ADD COLUMN package_unit TEXT DEFAULT ''"); + } +} diff --git a/api/index.php b/api/index.php index efd55dc..7c5412a 100644 --- a/api/index.php +++ b/api/index.php @@ -303,28 +303,28 @@ function saveProduct(PDO $db): void { // Update existing $stmt = $db->prepare(" UPDATE products SET name=?, brand=?, category=?, image_url=?, unit=?, - default_quantity=?, notes=?, barcode=?, updated_at=CURRENT_TIMESTAMP + default_quantity=?, notes=?, barcode=?, package_unit=?, updated_at=CURRENT_TIMESTAMP WHERE id=? "); $stmt->execute([ $input['name'], $input['brand'] ?? '', $input['category'] ?? '', $input['image_url'] ?? '', $input['unit'] ?? 'pz', $input['default_quantity'] ?? 1, $input['notes'] ?? '', - $input['barcode'] ?? null, $input['id'] + $input['barcode'] ?? null, $input['package_unit'] ?? '', $input['id'] ]); echo json_encode(['success' => true, 'id' => $input['id']]); } else { // Insert new $stmt = $db->prepare(" - INSERT INTO products (barcode, name, brand, category, image_url, unit, default_quantity, notes) - VALUES (?, ?, ?, ?, ?, ?, ?, ?) + INSERT INTO products (barcode, name, brand, category, image_url, unit, default_quantity, notes, package_unit) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) "); $barcode = !empty($input['barcode']) ? $input['barcode'] : null; $stmt->execute([ $barcode, $input['name'], $input['brand'] ?? '', $input['category'] ?? '', $input['image_url'] ?? '', $input['unit'] ?? 'pz', $input['default_quantity'] ?? 1, - $input['notes'] ?? '' + $input['notes'] ?? '', $input['package_unit'] ?? '' ]); echo json_encode(['success' => true, 'id' => $db->lastInsertId()]); } @@ -369,7 +369,7 @@ 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 + SELECT i.*, p.name, p.brand, p.category, p.image_url, p.unit, p.barcode, p.default_quantity, p.package_unit FROM inventory i JOIN products p ON i.product_id = p.id "; @@ -404,6 +404,14 @@ function addToInventory(PDO $db): void { $stmt->execute([$unit, $quantity, $productId]); } + // Update package info if conf + $packageUnit = $input['package_unit'] ?? null; + $packageSize = $input['package_size'] ?? null; + if ($packageUnit !== null) { + $stmt = $db->prepare("UPDATE products SET package_unit = ?, default_quantity = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?"); + $stmt->execute([$packageUnit, $packageSize ?: 0, $productId]); + } + // 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]); @@ -553,6 +561,12 @@ function updateInventory(PDO $db): void { $stmt->execute([$input['unit'], $input['product_id']]); } + // Update package info if provided + if (isset($input['package_unit']) && isset($input['product_id'])) { + $stmt = $db->prepare("UPDATE products SET package_unit = ?, default_quantity = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?"); + $stmt->execute([$input['package_unit'], $input['package_size'] ?? 0, $input['product_id']]); + } + echo json_encode(['success' => true]); } @@ -611,7 +625,7 @@ 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 + SELECT i.*, p.name, p.brand, p.category, p.unit, p.default_quantity, p.package_unit 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 @@ -620,7 +634,7 @@ function getStats(PDO $db): void { // Expired $expired = $db->query(" - SELECT i.*, p.name, p.brand, p.category, p.unit + SELECT i.*, p.name, p.brand, p.category, p.unit, p.default_quantity, p.package_unit 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 @@ -847,7 +861,7 @@ function geminiChat(PDO $db): void { // Fetch inventory context $stmt = $db->query(" - SELECT p.name, p.brand, p.category, i.quantity, p.unit, i.location, i.expiry_date, + SELECT p.name, p.brand, p.category, i.quantity, p.unit, p.default_quantity, p.package_unit, i.location, i.expiry_date, CASE WHEN i.expiry_date IS NOT NULL THEN julianday(i.expiry_date) - julianday('now') ELSE 999 END AS days_left FROM inventory i JOIN products p ON p.id = i.product_id @@ -861,6 +875,9 @@ function geminiChat(PDO $db): void { $line = "- {$item['name']}"; if ($item['brand']) $line .= " ({$item['brand']})"; $line .= ": {$item['quantity']} {$item['unit']}"; + if ($item['unit'] === 'conf' && !empty($item['package_unit']) && $item['default_quantity'] > 0) { + $line .= " (da {$item['default_quantity']} {$item['package_unit']} ciascuna)"; + } if ($item['expiry_date']) { $daysLeft = intval($item['days_left']); if ($daysLeft < 0) { @@ -1004,7 +1021,7 @@ function generateRecipe(PDO $db): void { // Fetch all inventory items with expiry info $stmt = $db->query(" - SELECT p.id AS product_id, p.name, p.brand, p.category, i.quantity, p.unit, i.location, i.expiry_date, + SELECT p.id AS product_id, p.name, p.brand, p.category, i.quantity, p.unit, p.default_quantity, p.package_unit, i.location, i.expiry_date, CASE WHEN i.expiry_date IS NOT NULL THEN julianday(i.expiry_date) - julianday('now') ELSE 999 END AS days_left FROM inventory i JOIN products p ON p.id = i.product_id @@ -1024,6 +1041,9 @@ function generateRecipe(PDO $db): void { $line = "- {$item['name']}"; if ($item['brand']) $line .= " ({$item['brand']})"; $line .= ": {$item['quantity']} {$item['unit']}"; + if ($item['unit'] === 'conf' && !empty($item['package_unit']) && $item['default_quantity'] > 0) { + $line .= " (da {$item['default_quantity']} {$item['package_unit']} ciascuna, totale: " . ($item['quantity'] * $item['default_quantity']) . " {$item['package_unit']})"; + } if ($item['expiry_date']) { $daysLeft = intval($item['days_left']); if ($daysLeft < 0) { @@ -1210,6 +1230,7 @@ PROMPT; $ing['inventory_unit'] = $bestMatch['unit']; $ing['inventory_qty'] = (float)$bestMatch['quantity']; $ing['default_quantity'] = (float)($bestMatch['default_quantity'] ?? 0); + $ing['package_unit'] = $bestMatch['package_unit'] ?? ''; $ing['available_qty'] = $bestMatch['quantity'] . ' ' . $bestMatch['unit']; if (!empty($bestMatch['brand'])) { $ing['brand'] = $bestMatch['brand']; diff --git a/assets/css/style.css b/assets/css/style.css index 6afbc81..7f846f5 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -1919,6 +1919,45 @@ body { border-radius: var(--radius-sm); } +/* ===== CONF PACKAGE SIZE ROW ===== */ +.conf-size-row { + margin-top: 8px; + padding: 10px 12px; + background: #f0f9ff; + border: 1.5px solid #bae6fd; + border-radius: var(--radius-sm); +} + +.conf-size-label { + display: block; + font-size: 0.85rem; + font-weight: 600; + margin-bottom: 6px; + color: #0369a1; +} + +.conf-size-inputs { + display: flex; + gap: 8px; + align-items: center; +} + +.conf-size-input { + flex: 1; + max-width: 120px; +} + +.conf-size-unit { + width: 65px; + min-width: 65px; +} + +.conf-size-info { + font-size: 0.75em; + color: var(--text-light); + font-weight: 500; +} + /* ===== EXPIRY INPUT + CAMERA ROW ===== */ .expiry-input-row { display: flex; diff --git a/assets/js/app.js b/assets/js/app.js index 59a928b..2a2736f 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -572,7 +572,7 @@ async function loadDashboard() { else if (days <= 7) { badgeText = `${days} giorni`; badgeClass = 'expiring'; } else if (days <= 30) { badgeText = `${days}g`; badgeClass = 'expiring-soon'; } else { const m = Math.round(days/30); badgeText = m <= 1 ? `${days}g` : `~${m} mesi`; badgeClass = 'expiring-later'; } - const qtyDisplay = formatQuantity(item.quantity, item.unit); + const qtyDisplay = formatQuantity(item.quantity, item.unit, item.default_quantity, item.package_unit); return `
@@ -602,7 +602,7 @@ async function loadDashboard() { else daysText = `Da ${days}g`; const safety = getExpiredSafety(item, days); const locIcon = item.location === 'freezer' ? '❄️' : item.location === 'frigo' ? '🧊' : ''; - const qtyDisplayExp = formatQuantity(item.quantity, item.unit); + const qtyDisplayExp = formatQuantity(item.quantity, item.unit, item.default_quantity, item.package_unit); return `
@@ -676,7 +676,7 @@ async function loadReviewItems() { section.style.display = 'block'; list.innerHTML = suspicious.map(item => { const catIcon = CATEGORY_ICONS[mapToLocalCategory(item.category, item.name)] || '📦'; - const qtyDisplay = formatQuantity(item.quantity, item.unit); + const qtyDisplay = formatQuantity(item.quantity, item.unit, item.default_quantity, item.package_unit); const locInfo = LOCATIONS[item.location] || { icon: '📦', label: item.location }; const t = QTY_THRESHOLDS[item.unit] || QTY_THRESHOLDS['pz']; const isTooSmall = parseFloat(item.quantity) < t.min; @@ -763,7 +763,7 @@ function renderDashItem(item) { const days = daysUntilExpiry(item.expiry_date); const isExpired = days < 0; const isExpiring = !isExpired && days <= 7; - const qtyDisplay = formatQuantity(item.quantity, item.unit); + const qtyDisplay = formatQuantity(item.quantity, item.unit, item.default_quantity, item.package_unit); let expiryLabel = ''; if (item.expiry_date) { @@ -806,15 +806,21 @@ function showAlertItemDetail(inventoryId, productId) { }); } -function formatQuantity(qty, unit) { +function formatQuantity(qty, unit, defaultQty, packageUnit) { if (!qty && qty !== 0) return ''; const n = parseFloat(qty); const unitLabels = { 'pz': 'pz', 'kg': 'kg', 'g': 'g', 'l': 'L', 'ml': 'ml', 'conf': 'conf' }; const label = unitLabels[unit] || unit || 'pz'; - if (n === Math.floor(n)) return `${Math.floor(n)} ${label}`; - // For pz/conf show whole number - if (unit === 'pz' || unit === 'conf') return `${Math.round(n)} ${label}`; - return `${n.toFixed(1)} ${label}`; + let result; + if (n === Math.floor(n)) result = `${Math.floor(n)} ${label}`; + else if (unit === 'pz' || unit === 'conf') result = `${Math.round(n)} ${label}`; + else result = `${n.toFixed(1)} ${label}`; + // Add package info for conf + if (unit === 'conf' && packageUnit && defaultQty > 0) { + const pkgLabel = unitLabels[packageUnit] || packageUnit; + result += ` (da ${defaultQty}${pkgLabel})`; + } + return result; } // Show package fraction: only ¼, ½, ¾ when there's a partial package. @@ -856,7 +862,7 @@ function renderInventoryItem(item) { const days = daysUntilExpiry(item.expiry_date); const isExpired = days < 0; const isExpiring = !isExpired && days <= 7; - const qtyDisplay = formatQuantity(item.quantity, item.unit); + const qtyDisplay = formatQuantity(item.quantity, item.unit, item.default_quantity, item.package_unit); const pkgFrac = formatPackageFraction(item.quantity, item.default_quantity); let expiryBadge = ''; @@ -951,7 +957,7 @@ function showItemDetail(inventoryId, productId) {
📦 Quantità - ${item.quantity} ${item.unit} + ${formatQuantity(item.quantity, item.unit, item.default_quantity, item.package_unit)}
${item.expiry_date ? `
@@ -1032,6 +1038,10 @@ function editInventoryItem(id) { return; } + const isConf = (item.unit || 'pz') === 'conf'; + const confSizeVal = (isConf && item.default_quantity > 0) ? item.default_quantity : ''; + const confUnitVal = (isConf && item.package_unit) ? item.package_unit : 'g'; + // Rebuild modal content for editing (don't close and reopen - just replace content) document.getElementById('modal-content').innerHTML = `
@@ -1049,10 +1059,19 @@ function editInventoryItem(id) {
- ${['pz','g','kg','ml','l','conf'].map(u => ``).join('')}
+
+ +
+ + +
+
@@ -1073,6 +1092,12 @@ function editInventoryItem(id) { document.getElementById('modal-overlay').style.display = 'flex'; } +function onEditUnitChange() { + const unit = document.getElementById('edit-unit').value; + const confGroup = document.getElementById('edit-conf-size-group'); + if (confGroup) confGroup.style.display = unit === 'conf' ? 'block' : 'none'; +} + async function submitEditInventory(e, id, productId) { e.preventDefault(); const qty = parseFloat(document.getElementById('edit-qty').value); @@ -1080,7 +1105,19 @@ async function submitEditInventory(e, id, productId) { const expiry = document.getElementById('edit-expiry').value || null; const unit = document.getElementById('edit-unit').value; - await api('inventory_update', {}, 'POST', { 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 }; + + // Add package info if conf + if (unit === 'conf') { + payload.package_unit = document.getElementById('edit-conf-unit')?.value || ''; + payload.package_size = parseFloat(document.getElementById('edit-conf-size')?.value) || 0; + } else { + // Clear package info if not conf + payload.package_unit = ''; + payload.package_size = 0; + } + + await api('inventory_update', {}, 'POST', payload); closeModal(); showToast('Aggiornato!', 'success'); refreshCurrentPage(); @@ -1608,17 +1645,25 @@ function onCategoryChange(fromAutoDetect = false) { } } +function onPfUnitChange() { + const unit = document.getElementById('pf-unit').value; + const confRow = document.getElementById('pf-conf-size-row'); + if (confRow) confRow.style.display = unit === 'conf' ? 'block' : 'none'; +} + async function submitProduct(e) { e.preventDefault(); showLoading(true); + const pfUnit = document.getElementById('pf-unit').value; const productData = { id: document.getElementById('pf-id').value || null, name: document.getElementById('pf-name').value, brand: document.getElementById('pf-brand').value, category: document.getElementById('pf-category').value, - unit: document.getElementById('pf-unit').value, - default_quantity: parseFloat(document.getElementById('pf-defqty').value) || 1, + unit: pfUnit, + default_quantity: pfUnit === 'conf' ? (parseFloat(document.getElementById('pf-conf-size')?.value) || 1) : (parseFloat(document.getElementById('pf-defqty').value) || 1), + package_unit: pfUnit === 'conf' ? (document.getElementById('pf-conf-unit')?.value || '') : '', notes: document.getElementById('pf-notes').value, barcode: document.getElementById('pf-barcode').value || null, image_url: document.getElementById('pf-image').value || '', @@ -1811,9 +1856,10 @@ function showProductAction() { let totalQty = 0; const unit = inventoryItems[0].unit || 'pz'; const defQty = inventoryItems[0].default_quantity || 0; + const pkgUnit = inventoryItems[0].package_unit || ''; const invHtml = inventoryItems.map(inv => { const locInfo = LOCATIONS[inv.location] || { icon: '📦', label: inv.location }; - const qtyStr = formatQuantity(inv.quantity, inv.unit); + const qtyStr = formatQuantity(inv.quantity, inv.unit, inv.default_quantity, inv.package_unit); const pkgF = formatPackageFraction(inv.quantity, inv.default_quantity); totalQty += parseFloat(inv.quantity); let expiryStr = ''; @@ -1827,7 +1873,7 @@ function showProductAction() { return `
${locInfo.icon} ${locInfo.label}${expiryStr}${qtyStr}${pkgF ? ' ' + pkgF : ''}
`; }).join(''); - const totalStr = formatQuantity(totalQty, unit); + const totalStr = formatQuantity(totalQty, unit, defQty, pkgUnit); const totalFrac = formatPackageFraction(totalQty, defQty); statusBar.innerHTML = ` @@ -1894,11 +1940,13 @@ function showThrowForm() { const totalQty = items.reduce((sum, i) => sum + parseFloat(i.quantity), 0); const unit = items[0].unit || 'pz'; - const qtyDisplay = formatQuantity(totalQty, unit); + const defQty = items[0].default_quantity || 0; + const pkgUnit = items[0].package_unit || ''; + const qtyDisplay = formatQuantity(totalQty, unit, defQty, pkgUnit); let locOptionsHtml = items.map(inv => { const locInfo = LOCATIONS[inv.location] || { icon: '📦', label: inv.location }; - return `
${locInfo.icon} ${locInfo.label}${formatQuantity(inv.quantity, inv.unit)}
`; + return `
${locInfo.icon} ${locInfo.label}${formatQuantity(inv.quantity, inv.unit, inv.default_quantity, inv.package_unit)}
`; }).join(''); document.getElementById('modal-content').innerHTML = ` @@ -1929,7 +1977,7 @@ function showThrowForm() {
${items.map((inv, idx) => { const locInfo = LOCATIONS[inv.location] || { icon: '📦', label: inv.location }; - return ``; + return ``; }).join('')}
@@ -2066,9 +2114,22 @@ function showAddForm() { const unitSelect = document.getElementById('add-unit'); unitSelect.value = unit; - document.getElementById('add-quantity').value = currentProduct.default_quantity || 1; + document.getElementById('add-quantity').value = unit === 'conf' ? (currentProduct.last_qty || 1) : (currentProduct.default_quantity || 1); document.getElementById('add-quantity').dataset.manuallySet = 'false'; + // Show/hide conf size row and pre-fill + const confRow = document.getElementById('add-conf-size-row'); + if (confRow) { + confRow.style.display = unit === 'conf' ? 'block' : 'none'; + if (unit === 'conf' && currentProduct.package_unit && currentProduct.default_quantity > 0) { + document.getElementById('add-conf-size').value = currentProduct.default_quantity; + document.getElementById('add-conf-unit').value = currentProduct.package_unit; + } else if (unit === 'conf') { + document.getElementById('add-conf-size').value = ''; + document.getElementById('add-conf-unit').value = 'g'; + } + } + // Track manual edits to quantity in add form const addQtyInput = document.getElementById('add-quantity'); addQtyInput.removeEventListener('input', markAddQtyManuallySet); @@ -2131,10 +2192,26 @@ function showAddForm() { function onAddUnitChange() { updateAddQtyStep(); - // If switching units, suggest a sensible quantity - // BUT only if the user hasn't manually changed the quantity in this form const unit = document.getElementById('add-unit').value; const qtyInput = document.getElementById('add-quantity'); + + // Show/hide conf size row + const confRow = document.getElementById('add-conf-size-row'); + if (confRow) { + confRow.style.display = unit === 'conf' ? 'block' : 'none'; + // Pre-fill from currentProduct if available + if (unit === 'conf' && currentProduct) { + const sizeInput = document.getElementById('add-conf-size'); + const unitSelect = document.getElementById('add-conf-unit'); + if (currentProduct.package_unit && currentProduct.default_quantity > 1) { + sizeInput.value = currentProduct.default_quantity; + unitSelect.value = currentProduct.package_unit; + } + } + } + + // If switching units, suggest a sensible quantity + // BUT only if the user hasn't manually changed the quantity in this form if (qtyInput.dataset.manuallySet === 'true') return; // User already edited qty, don't overwrite const currentQty = parseFloat(qtyInput.value) || 1; @@ -2267,6 +2344,8 @@ async function submitAdd(e) { location: document.getElementById('add-location').value, expiry_date: document.getElementById('add-expiry').value || null, 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, }); showLoading(false); diff --git a/data/dispensa.db b/data/dispensa.db index 990c444d6223cba38db7a83bed63f93f13532721..3795ad05e4dc8a173fd4218180a1e678983c7c15 100644 GIT binary patch delta 5252 zcmeHLeQX=$8Nc&qeCPAUZPTPc=!K6uY2*0L=a1N3KaxNLY70r5Z-*uq`{G<<-#NBZ zL8Q%b#LA~cyVI6c;&YlhP5c3=h1ez#tWmC%)%>?z!iE-rw(i-sct<&5MtkPh9CFFbr#eul})}Z0BhL>xkkM^(%}pk7DN0 z75RM=ac3)TZESAF@4mKhjxrdCb|xi6XN9;pp}ynTXmGU^?z9FhCi)8lwUW0P)bsSN z4QBd1yX-icy%o*WPX4WjBx)$(PCV8K8tp0a0BIwxBQKMWJ5G{UQakNS#2xg<)Exb` zBS-|OkEw&iuZf3!NvF|;`&fU#*BJ_i z0zsCWK$=dL^|CC_vwl7lI#SZ`ET{tBAnU))Zfph{j^q8EzVYHP*minZuaEO_k*d)_E-+Ad zcl(E%IwFu>N?$vy-e|lY&!z=ABSf>3B4_68IE0)^E3x@#HZyrsU~{6qr=haxW;jnW3!{)K{!m*f2c30PYW&eVXE6~#PP`pk`rS{9vMY) zd<4nJFp^_KNRAF7IWmCc@L?o}4k0<%ulm0Cxdr_k=u_F;>&6lCC#rQ(X`)}TUuSQ$ z6Xd^v3x6TsATN;5kWawivBmB1?7tK0TMyWC5rn;%lu3yIiLvqv4VC)HNcqTc`NdHA z#bEixK>5Yt@{2>O7bbXWe}TLIcB28q)W;vVhFTqhkv<4*|4v3X1(4U3VYdjQNN*l#@=Aq=bKg^JH5H^$mzK4 z>f;9deeAg5xAbXi+~TF)w11bFwJnlAtGmPWj`5R|`N>VVv@~U)F;{# zsi&SiXGkX0=*saX$RZo|d-Kz{19LUE^yh;Oh7hvZ@!XFrQAM7{KU2>==Ov2?XTw|& zD_maLL7jQt!kVr%ny)Pom$#T3dhj|7Z#J~>yg>)F=}Gm~uiLDp2NY)hai7gZKZEt0 z%JP2>{w8`iEd4Iim!_voX_L!%$@s8w)YxEnbtOM- z$n`|@XH4qPz)t`of<;7BVFO{NhN^oEIl&>&3EfFdGvhcn8>+ei;cHcuTfs2<4? z-HGAeqM_f-`BrZ!-ht3qL)AT^M>4KEp*1szWStK{Zq8ff1fjWSSdS#4JHh@4c90Xl z+q)LL7Kw)QN++7?<{{+73OO0mo$NiZZ5n-w0kLiCrH(OSa&k4J28V)$$wjU1rZp zo;K%(Cc$j0tA(Ns6jZW(083e5SoRh%!AuEhA)8ea3Y4~(loaKx6xWJK`LTizSCd;i zfh_HwfI>RAvma=I=Z)aHqI)Sl=b%N9rK~cg(&rksNzAsnc_q7(E&e+o#S%>G!TE#) zwCS0Vgk!?Og3zWqKRT>F@}A8a40%u=1Weh4$5h9KD>SaOytP@qeAYHwtR`OA^()s| zgKPe#BT&E(ZfQZBMbob6qe`(!a#oC|g(8392Skw-WihQBlEjplUdxGk@il)A+At6F zVII_od8X5foSm3XcXW1uzT;>r9yk82Dh@8pt}k?4XldtdkT-X)Cm(d$@`J_L);hWa zl6VXfhPIR`DV-K>NOv%|irLxg#B@8;BP2zoo#_)~QIO+eLW138T2W$d0l1r$j;Y*7 z{^e(#xYfl6Jg7e`1uA7byu2Q1YN1ceC}D;LUSi{wyWK4S5k^;iAxGnrY|ieB|%7J(@I=B0|2CR z`cWD7n04hEsh0MR!PS z8s;}%YRK(l&OXiDn3bY4Vm2#=nGE#Q?s#GzAlnW_C!7)G1wm6tvRIY5K-dqj5z3Fw zJW`F1!q%{>rIB*l&^mUdm88HVA!;R^5E!5U6H^jVNn6F7hBqyrsf8+E{&h%)&6W!+ zwT;kN^ZrIo%jSM9n+PevppKMFiw`2_OiYX?B&G=ION$R_FxRrE%t~_HJtHPkYS-Jo ze*F5N@4w{L`+zK0CTx9x``83lj zWJO{A_S*9(O=BjTO=ZIBo3DA6pL60CC+9)F)}jxokG$(u`!3q1i{%Q4TooAZQwlU*0o4De)&x&?opqA SyJ1^py1dZhR-Lsq)qeqUyDc*S delta 793 zcmchU-%FEW6vv>r-bK=X(1F7_9KPqrhZ9MOk%$;C zG#dZ_xw`M0AyMI?24MF>LU(~8j{x!@9rz@q(-B3DVuhyvw&iv^DLXkL-yU>RGX z9+N;fvLg=ApLBK7|{w2Xkl*t)dmQj2@wR6r3EwrE}P$8+oF}g|4(GRMdY?2mb9T!j^J+FMH)1*x8S98>R>I%DP ztd0oU60rVvPRZ) z?KPx1Cx>~CzF-SeN3yX0fZ4k#8}BD`OpZU-r7y8Ice|70{n8aCr?QnLk@ej%X|wbF z#-edZ3&A+tQlCgMu?2rcGsaQFEoE80!SC@n5%rm4eoh6YZS@_|V|iS(!{uT#i%%tQ zFwiY5veW5N*;QTXtacpNUT4aQDS8GHP--b|i@GUyLKp9)Z}L6h2b;+pRUB5Qu5?#B z-I>RdL+It{LrvK#5EJo6t#^CEDCis~6VX~$^=mY@0U7|bz+#t+^Yw*8e*J$!vQ30J ztZDn8`gbW&QlLa!ot9w}r=)bYVR30ygh3;$PeeV*3lvW9d9Wran_xvcW`IjIX85eg ZBvB0LTbiMhw3~V;)*E-#B(8L
+
@@ -380,7 +392,7 @@
- @@ -394,6 +406,18 @@
+