From 872397047b984b602701256fd96fa7715cfd48f1 Mon Sep 17 00:00:00 2001 From: Akbota Date: Wed, 9 Sep 2026 11:05:54 +0000 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BF=D1=83=D0=B1=D0=BB=D0=B8=D0=BA?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=BE=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7?= =?UTF-8?q?=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data.json | 16 ++++++++-------- index.html | 2 +- script.js | 12 ++++++++++-- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/data.json b/data.json index f25fa4b..002428b 100644 --- a/data.json +++ b/data.json @@ -10,14 +10,14 @@ "totalDaily": 5300 }, "menu": [ - {"day":"Пн","breakfast":"Овсянка на воде + 30 г орехов","breakfast_kcal":350,"lunch":"Салат из свежих овощей с говядиной","lunch_kcal":400,"dinner":"Говядина‑стейк 150 г, брокколи на пару, киноа 60 г","dinner_kcal":650}, - {"day":"Вт","breakfast":"Яйцо‑омлет с помидорами + цельнозерновой хлеб","breakfast_kcal":300,"lunch":"Говядина с овощным рагу","lunch_kcal":420,"dinner":"Тушёная говядина с морковью, гороховый салат","dinner_kcal":650}, - {"day":"Ср","breakfast":"Творог 150 г + ягоды","breakfast_kcal":300,"lunch":"Говяжий суп с овощами","lunch_kcal":380,"dinner":"Запеканка из кабачков с говяжьим фаром, гречка 60 г","dinner_kcal":650}, - {"day":"Чт","breakfast":"Смузи: шпинат, кефир, ягоды, семена льна","breakfast_kcal":300,"lunch":"Говядина‑строганина с бурым рисом и овощами","lunch_kcal":430,"dinner":"Говядина‑строганина в соевом соусе, салат из капусты, рис‑басмати 60 г","dinner_kcal":650}, - {"day":"Пт","breakfast":"Яйцо‑вкрутую, авокадо, цельнозерновой хлеб","breakfast_kcal":350,"lunch":"Говядина с грибным соусом и стручковой фасолью","lunch_kcal":420,"dinner":"Тушёная говядина с грибами, батат запечённый 150 г","dinner_kcal":650}, - {"day":"Сб","breakfast":"Творожные оладьи без сахара + творог","breakfast_kcal":350,"lunch":"Говядина‑котлета с запечёнными овощами","lunch_kcal":410,"dinner":"Говядина‑котлета, свежий салат из огурцов и помидоров, кускус 60 г","dinner_kcal":650}, - {"day":"Вс","breakfast":"Греческий йогурт + мёд (мало) + орехи","breakfast_kcal":300,"lunch":"Печёная говядина с квашеной капустой","lunch_kcal":420,"dinner":"Печёная говядина с брюссельской капустой, булгур 60 г","dinner_kcal":650} - ], + {"day":"Пн","breakfast":"Овсянка на воде + 30 г орехов","breakfast_kcal":350,"breakfast_weight":350,"lunch":"Салат из свежих овощей с говядиной","lunch_kcal":400,"lunch_weight":500,"dinner":"Говядина‑стейк 150 г, брокколи на пару, киноа 60 г","dinner_kcal":650,"dinner_weight":800,"snack":"Йогурт 150 г + горсть грецких орехов","snack_kcal":300,"snack_weight":200,"coffee":"чёрный кофе без сахара","coffee_kcal":5,"coffee_weight":250,"tea":"зелёный чай с мёдом","tea_kcal":15,"tea_weight":250,"grams":2450}, + {"day":"Вт","breakfast":"Яйцо‑омлет с помидорами + цельнозерновой хлеб","breakfast_kcal":300,"breakfast_weight":300,"lunch":"Говядина с овощным рагу","lunch_kcal":420,"lunch_weight":500,"dinner":"Тушёная говядина с морковью, гороховый салат","dinner_kcal":650,"dinner_weight":800,"snack":"Йогурт 150 г + горсть грецких орехов","snack_kcal":300,"snack_weight":200,"coffee":"чёрный кофе без сахара","coffee_kcal":5,"coffee_weight":250,"tea":"зелёный чай с мёдом","tea_kcal":15,"tea_weight":250,"grams":2450}, + {"day":"Ср","breakfast":"Творог 150 г + ягоды","breakfast_kcal":300,"breakfast_weight":300,"lunch":"Говяжий суп с овощами","lunch_kcal":380,"lunch_weight":500,"dinner":"Запеканка из кабачков с говяжьим фаром, гречка 60 г","dinner_kcal":650,"dinner_weight":800,"snack":"Йогурт 150 г + горсть грецких орехов","snack_kcal":300,"snack_weight":200,"coffee":"чёрный кофе без сахара","coffee_kcal":5,"coffee_weight":250,"tea":"зелёный чай с мёдом","tea_kcal":15,"tea_weight":250,"grams":2450}, + {"day":"Чт","breakfast":"Смузи: шпинат, кефир, ягоды, семена льна","breakfast_kcal":300,"breakfast_weight":300,"lunch":"Говядина‑строганина с бурым рисом и овощами","lunch_kcal":430,"lunch_weight":500,"dinner":"Говядина‑строганина в соевом соусе, салат из капусты, рис‑басмати 60 г","dinner_kcal":650,"dinner_weight":800,"snack":"Йогурт 150 г + горсть грецких орехов","snack_kcal":300,"snack_weight":200,"coffee":"чёрный кофе без сахара","coffee_kcal":5,"coffee_weight":250,"tea":"зелёный чай с мёдом","tea_kcal":15,"tea_weight":250,"grams":2450}, + {"day":"Пт","breakfast":"Яйцо‑вкрутую, авокадо, цельнозерновой хлеб","breakfast_kcal":350,"breakfast_weight":350,"lunch":"Говядина с грибным соусом и стручковой фасолью","lunch_kcal":420,"lunch_weight":500,"dinner":"Тушёная говядина с грибами, батат запечённый 150 г","dinner_kcal":650,"dinner_weight":800,"snack":"Йогурт 150 г + горсть грецких орехов","snack_kcal":300,"snack_weight":200,"coffee":"чёрный кофе без сахара","coffee_kcal":5,"coffee_weight":250,"tea":"зелёный чай с мёдом","tea_kcal":15,"tea_weight":250,"grams":2450}, + {"day":"Сб","breakfast":"Творожные оладьи без сахара + творог","breakfast_kcal":350,"breakfast_weight":350,"lunch":"Говядина‑котлета с запечёнными овощами","lunch_kcal":410,"lunch_weight":500,"dinner":"Говядина‑котлета, свежий салат из огурцов и помидоров, кускус 60 г","dinner_kcal":650,"dinner_weight":800,"snack":"Йогурт 150 г + горсть грецких орехов","snack_kcal":300,"snack_weight":200,"coffee":"чёрный кофе без сахара","coffee_kcal":5,"coffee_weight":250,"tea":"зелёный чай с мёдом","tea_kcal":15,"tea_weight":250,"grams":2450}, + {"day":"Вс","breakfast":"Греческий йогурт + мёд (мало) + орехи","breakfast_kcal":300,"breakfast_weight":300,"lunch":"Печёная говядина с квашеной капустой","lunch_kcal":420,"lunch_weight":500,"dinner":"Печёная говядина с брюссельской капустой, булгур 60 г","dinner_kcal":650,"dinner_weight":800,"snack":"Йогурт 150 г + горсть грецких орехов","snack_kcal":300,"snack_weight":200,"coffee":"чёрный кофе без сахара","coffee_kcal":5,"coffee_weight":250,"tea":"зелёный чай с мёдом","tea_kcal":15,"tea_weight":250,"grams":2450} + ], "shopping": [ {"week":1,"items":[ {"category":"Мясо","items":[{"name":"говяжий фарш","qty":"1 кг"},{"name":"стейк","qty":"1 кг"}]}, diff --git a/index.html b/index.html index 01e095b..834f8b1 100644 --- a/index.html +++ b/index.html @@ -15,7 +15,7 @@

Меню (завтрак + ужин) на одну неделю

- + diff --git a/script.js b/script.js index 127dfc3..3d70275 100644 --- a/script.js +++ b/script.js @@ -21,10 +21,18 @@ function renderMenu(menu) { tdLunch.textContent = `${item.lunch} (${item.lunch_kcal} ккал)`; const tdDinner = document.createElement('td'); tdDinner.textContent = `${item.dinner} (${item.dinner_kcal} ккал)`; + const tdSnack = document.createElement('td'); + tdSnack.textContent = `${item.snack || ''} (${item.snack_kcal || 0} ккал)`; + const tdCoffee = document.createElement('td'); + tdCoffee.textContent = `${item.coffee || ''} (${item.coffee_kcal || 0} ккал)`; + const tdTea = document.createElement('td'); + tdTea.textContent = `${item.tea || ''} (${item.tea_kcal || 0} ккал)`; const tdTotal = document.createElement('td'); - const totalKcal = (item.breakfast_kcal || 0) + (item.lunch_kcal || 0) + (item.dinner_kcal || 0); + const totalKcal = (item.breakfast_kcal || 0) + (item.lunch_kcal || 0) + (item.dinner_kcal || 0) + (item.snack_kcal || 0) + (item.coffee_kcal || 0) + (item.tea_kcal || 0); tdTotal.textContent = `${totalKcal} ккал`; - tr.append(tdDay, tdBreak, tdLunch, tdDinner, tdTotal); + const tdGrams = document.createElement('td'); + tdGrams.textContent = `${item.grams || ''} г`; + tr.append(tdDay, tdBreak, tdLunch, tdDinner, tdSnack, tdCoffee, tdTea, tdTotal, tdGrams); tbody.appendChild(tr); }); }