diff --git a/frontend/js/db.js b/frontend/js/db.js index 7e8daea..f82eae3 100644 --- a/frontend/js/db.js +++ b/frontend/js/db.js @@ -545,6 +545,8 @@ async function getSupplementTotalsForDate(date) { SUM(COALESCE(sl.dose_g,1) * s.phosphorus_mg) as phosphorus_mg, SUM(COALESCE(sl.dose_g,1) * s.carotene_mcg) as carotene_mcg, SUM(COALESCE(sl.dose_g,1) * s.omega3_mg) as omega3_mg, + SUM(COALESCE(sl.dose_g,1) * s.epa_mg) as epa_mg, + SUM(COALESCE(sl.dose_g,1) * s.dha_mg) as dha_mg, SUM(COALESCE(sl.dose_g,1) * s.omega6_mg) as omega6_mg, SUM(COALESCE(sl.dose_g,1) * s.omega9_mg) as omega9_mg FROM supplement_log sl @@ -1126,7 +1128,9 @@ async function runMigrations() { await addSuppCol("lutein_mg", "REAL"); // лютеин — no RDI await addSuppCol("lycopene_mg", "REAL"); // ликопин — no RDI await addSuppCol("carotene_mcg", "REAL"); // бета-каротин - await addSuppCol("omega3_mg", "REAL"); // омега-3 + await addSuppCol("omega3_mg", "REAL"); // омега-3 общая + await addSuppCol("epa_mg", "REAL"); // EPA (эйкозапентаеновая) + await addSuppCol("dha_mg", "REAL"); // DHA (докозагексаеновая) await addSuppCol("omega6_mg", "REAL"); // омега-6 await addSuppCol("omega9_mg", "REAL"); // омега-9 diff --git a/frontend/js/main.js b/frontend/js/main.js index f74981c..663258f 100644 --- a/frontend/js/main.js +++ b/frontend/js/main.js @@ -3308,7 +3308,9 @@ const MICRO_FIELDS = [ { key: "manganese_mg", label: "Марганец (мг)" }, { key: "molybdenum_mcg", label: "Молибден (мкг)" }, { key: "carotene_mcg", label: "Бета-каротин (мкг)" }, - { key: "omega3_mg", label: "Омега-3 (мг)" }, + { key: "omega3_mg", label: "Омега-3 общая (мг)" }, + { key: "epa_mg", label: "EPA (мг)" }, + { key: "dha_mg", label: "DHA (мг)" }, { key: "omega6_mg", label: "Омега-6 (мг)" }, { key: "omega9_mg", label: "Омега-9 (мг)" }, { key: "silicon_mg", label: "Кремний (мг)" },