From 6e6ef070c29bf25cf6379db2140ea607151e1805 Mon Sep 17 00:00:00 2001 From: SEREGA4332 <148464615+SEREGA4332@users.noreply.github.com> Date: Fri, 15 Mar 2024 12:06:29 +0300 Subject: [PATCH 1/4] Create home --- 1.2-requests-templates/recipes/home | 1 + 1 file changed, 1 insertion(+) create mode 100644 1.2-requests-templates/recipes/home diff --git a/1.2-requests-templates/recipes/home b/1.2-requests-templates/recipes/home new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/1.2-requests-templates/recipes/home @@ -0,0 +1 @@ + From 0158aa086c2d0826e21572b84b2c7107e3a12541 Mon Sep 17 00:00:00 2001 From: SEREGA4332 <148464615+SEREGA4332@users.noreply.github.com> Date: Fri, 15 Mar 2024 12:08:59 +0300 Subject: [PATCH 2/4] Delete 1.2-requests-templates/recipes/home --- 1.2-requests-templates/recipes/home | 1 - 1 file changed, 1 deletion(-) delete mode 100644 1.2-requests-templates/recipes/home diff --git a/1.2-requests-templates/recipes/home b/1.2-requests-templates/recipes/home deleted file mode 100644 index 8b1378917..000000000 --- a/1.2-requests-templates/recipes/home +++ /dev/null @@ -1 +0,0 @@ - From 72081973f105703ff9d977c6bf2d5672c20a1023 Mon Sep 17 00:00:00 2001 From: SEREGA4332 <148464615+SEREGA4332@users.noreply.github.com> Date: Fri, 15 Mar 2024 12:12:09 +0300 Subject: [PATCH 3/4] Update urls.py --- 1.2-requests-templates/recipes/recipes/urls.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/1.2-requests-templates/recipes/recipes/urls.py b/1.2-requests-templates/recipes/recipes/urls.py index 2d6f1024f..7b37286be 100644 --- a/1.2-requests-templates/recipes/recipes/urls.py +++ b/1.2-requests-templates/recipes/recipes/urls.py @@ -15,7 +15,9 @@ """ from django.urls import path +from calculator.views import dish_calculator urlpatterns = [ + path('/', dish_calculator, name='calculator') # здесь зарегистрируйте вашу view-функцию ] From 8009d46f7f9f8c93415c00ecff8ed535ba9a5de7 Mon Sep 17 00:00:00 2001 From: SEREGA4332 <148464615+SEREGA4332@users.noreply.github.com> Date: Fri, 15 Mar 2024 12:14:31 +0300 Subject: [PATCH 4/4] Update views.py --- .../recipes/calculator/views.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/1.2-requests-templates/recipes/calculator/views.py b/1.2-requests-templates/recipes/calculator/views.py index 0337130fb..9d3a26ced 100644 --- a/1.2-requests-templates/recipes/calculator/views.py +++ b/1.2-requests-templates/recipes/calculator/views.py @@ -19,8 +19,9 @@ # можете добавить свои рецепты ;) } + # Напишите ваш обработчик. Используйте DATA как источник данных -# Результат - render(request, 'calculator/index.html', context) +# Результат - render(request, ) # В качестве контекста должен быть передан словарь с рецептом: # context = { # 'recipe': { @@ -28,3 +29,16 @@ # 'ингредиент2': количество2, # } # } +def dish_calculator(requests, dish_name): + servings = int(requests.GET.get('servings', 1)) + ordered_dish = {} + for dish, ingredients in DATA.items(): + if dish_name == dish: + for ing, amount in ingredients.items(): + ordered_dish[ing] = amount * servings + + context = { + 'recipe': ordered_dish + } + + return render(requests, 'calculator/index.html', context)