From 3789747729158ae607dd986b7567665e82e80403 Mon Sep 17 00:00:00 2001
From: 4aiman <konsorumaniakku@ya.ru>
Date: Fri, 29 May 2026 22:01:52 +0300
Subject: [PATCH] Edit product from search card, fix Ayutinskiy bread kcal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Product editing:
- "Ред." button on expanded product card
- showEditProductModal: edit name, KBJU, all micronutrients
- Updates product in DB directly, refreshes search

Bread fix:
- "Хлеб Тостовый пшеничный Аютинский 280г" was 268 in Magnit data
- Package says 243 kcal/100g — corrected in seed DB
- Seed version 7

Users can now fix any wrong KBJU directly from the product card
without re-importing or editing the seed DB manually.
---
 frontend/data/products_seed.db | Bin 8249344 -> 8249344 bytes
 frontend/js/main.js            |  77 ++++++++++++++++++++++++++++++++-
 2 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/frontend/data/products_seed.db b/frontend/data/products_seed.db
index 032b3ffcbd5afb295c0de9232906d88fec480393..f93970bd0f0a7f09fb11e2aeb974a000dc879cfe 100644
GIT binary patch
delta 762
zcmbW#xlfaE9LMqB(-xl63T-I}SfD@df}oUgSGiOK#d3ObSPr>Q#S1YM5}vY<$Rddj
z4h{?s!~}d+X2SZcI`$7>aOJ%b6Bqp?ujIRa^7%%New!os;BlP@q5c%-aqpA{l#}n_
zFJ496keXC9Y0{)wlNL?JX)^wYRO2Jo7Gc}6epL<KxtLX<6bP~H*sS)h_X?A$D&nIj
zBZvFXSa%mvLZc>ey1W0`{Y_s>4Ta;P#-0i*5@3TJ7m$b~IN*c}$#5eDskn$Vq$2~D
z;6Wy`kPR;+a*&HW<fA}0_6q&Ae{1r|_diWyg;66`1Rsh~g3BmH8Lr?e%Hc-^0;oh4
zs!@Yl)S(_hT*GxVpb<@IMhkA>CT^h>x6y`n+`(OR=tk_G-=}tnM4RoG<<MmhDth^m
z-D1w$b{tgxOV=o?p%Y!`Mh|+?hx>Sdhj@g?c!GWmU=TxiiZF&Tf>Dg&8OAYzNlalH
jGnmC3=COc9Ea5p`U>Ps*3a{}7Z?S@RSmop1uOFWQ-Q6z$

delta 712
zcmajdIa5<{6vp9uv)vGgl1+^f@()S~8Z{vp*@U2g3nUr>D8wbo=8g-S+Zdej#)cVf
z%#0Kk7O5zlVZ1GE=x-}@`3SW9IxEIA^UR#`J@cOY=B_c1uRcdvl9a#Fzj1yG$K>+w
z+)ux3`6N^!tHPiPqbf|QFss7yM<|wjRa&xrvHntYx#);^6Ix`)Xpr5j(&u>XN=7m$
ziY$Hic?0alId^KZxW49E*FJhuIdefTDX^jnHdLbqb{xP#)WQKLTyVpKLpY2h@Zu<Z
zIEFgZ!w-P~8gLvZ(5UI9V6<(&>_0;P&t3@@^hy&#XvRsLLKvrU24@jL6fKCM73UDg
zd9<M&9q2?CE}$DdNT3%NaS46s#{e$l3a;WB1~H`Rm1Hzz%}REgZQGR90-M!I6OC-N
z?tfK*MsOWBkj5}F7{MsUa1*yMjtOLO8+ULQ_mIPVJisKTFpU|^;vpX4F`nQlp5Zy>
c@B%OK3a>Gb1uS9-%Xovgc!&3V(}$I<J)5pB9{>OV

diff --git a/frontend/js/main.js b/frontend/js/main.js
index 34a5328..093b7c7 100644
--- a/frontend/js/main.js
+++ b/frontend/js/main.js
@@ -1290,7 +1290,10 @@ async function renderProducts(container) {
         </div>
         ${microChips.length ? `<div class="nutrient-strip" style="padding:4px 0">${microChips.map(c => c.html).join("")}</div>` : ""}
         ${p.composition ? `<div class="prod-composition">${esc(p.composition)}</div>` : ""}
-        <button class="btn-primary prod-add-btn" data-pid="${p.id}">Добавить в дневник</button>
+        <div style="display:flex;gap:8px;margin-top:8px">
+          <button class="btn-primary prod-add-btn" data-pid="${p.id}" style="flex:1">Добавить в дневник</button>
+          <button class="btn-secondary prod-edit-btn" data-pid="${p.id}" style="flex:0">Ред.</button>
+        </div>
       </div>`;
   }
 
@@ -1309,6 +1312,13 @@ async function renderProducts(container) {
         showAddFoodFromProduct(parseInt(btn.dataset.pid));
       };
     });
+    el.querySelectorAll(".prod-edit-btn").forEach(btn => {
+      btn.onclick = async e => {
+        e.stopPropagation();
+        const p = await DB.getProduct(parseInt(btn.dataset.pid));
+        if (p) showEditProductModal(p, () => doSearch(false));
+      };
+    });
   }
 
   function showAddFoodFromProduct(productId) {
@@ -1403,6 +1413,71 @@ function showAddProductModal(onSaved) {
   });
 }
 
+function showEditProductModal(p, onSaved) {
+  const microHtml = MICRO_FIELDS.map(f => {
+    let val = p[f.key] ?? "";
+    if (val && f.mult) val = Math.round(val / f.mult * 1000) / 1000;
+    return `<div class="form-group micro-field">
+      <label>${f.label}</label>
+      <input id="ep-${f.key}" type="number" inputmode="decimal" step="any" value="${val}" placeholder="—" />
+    </div>`;
+  }).join("");
+
+  showModal(`
+    <h3>Редактирование продукта</h3>
+    <div class="form-group">
+      <label>Название</label>
+      <input id="ep-name" type="text" value="${esc(p.name)}" />
+    </div>
+    <div style="display:flex;gap:8px">
+      <div class="form-group" style="flex:1">
+        <label>ккал/100г</label>
+        <input id="ep-kcal" type="number" inputmode="decimal" value="${p.kcal_per_100g ?? ""}" />
+      </div>
+      <div class="form-group" style="flex:1">
+        <label>Б</label>
+        <input id="ep-protein" type="number" inputmode="decimal" step="0.1" value="${p.protein_per_100g ?? ""}" />
+      </div>
+      <div class="form-group" style="flex:1">
+        <label>Ж</label>
+        <input id="ep-fat" type="number" inputmode="decimal" step="0.1" value="${p.fat_per_100g ?? ""}" />
+      </div>
+      <div class="form-group" style="flex:1">
+        <label>У</label>
+        <input id="ep-carbs" type="number" inputmode="decimal" step="0.1" value="${p.carbs_per_100g ?? ""}" />
+      </div>
+    </div>
+    <p style="color:var(--muted);font-size:12px;margin:8px 0 4px">Нутриенты на 100г:</p>
+    <div class="micro-grid">${microHtml}</div>`,
+  async overlay => {
+    const name = overlay.querySelector("#ep-name").value.trim();
+    if (!name) return false;
+    const sets = ["name=?1", "kcal_per_100g=?2", "protein_per_100g=?3", "fat_per_100g=?4", "carbs_per_100g=?5"];
+    const vals = [
+      name,
+      parseFloat(overlay.querySelector("#ep-kcal").value) || null,
+      parseFloat(overlay.querySelector("#ep-protein").value) || null,
+      parseFloat(overlay.querySelector("#ep-fat").value) || null,
+      parseFloat(overlay.querySelector("#ep-carbs").value) || null,
+    ];
+    let idx = 6;
+    for (const f of MICRO_FIELDS) {
+      let val = parseFloat(overlay.querySelector(`#ep-${f.key}`).value) || null;
+      if (val && f.mult) val *= f.mult;
+      sets.push(`${f.key}=?${idx}`);
+      vals.push(val);
+      idx++;
+    }
+    vals.push(p.id);
+    await window.__TAURI__.core.invoke("plugin:sql|execute", {
+      db: "sqlite:baldav.db",
+      query: `UPDATE products SET ${sets.join(", ")} WHERE id=?${idx}`,
+      values: vals,
+    });
+    if (onSaved) onSaved();
+  });
+}
+
 // ---------------------------------------------------------------------------
 // RECIPES screen
 // ---------------------------------------------------------------------------