cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

group ingredients in shopping list

Browse Source
This commit is contained in:
vabene1111
2020-02-18 22:33:31 +01:00
parent 8ba34414a1
commit 43d03ed17d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cookbook/views/views.py
View File

@ -137,8 +137,16 @@ def shopping_list(request):
ingredients = [] ingredients = []
for r in recipes: for r in recipes:
for i in RecipeIngredient.objects.filter(recipe=r).all(): for ri in RecipeIngredient.objects.filter(recipe=r).all():
ingredients.append(i) index = None
for x, ig in enumerate(ingredients):
if ri.ingredient == ig.ingredient and ri.unit == ig.unit:
index = x
if index:
ingredients[index].amount = ingredients[index].amount + ri.amount
else:
ingredients.append(ri)
return render(request, 'shopping_list.html', {'ingredients': ingredients, 'recipes': recipes, 'form': form}) return render(request, 'shopping_list.html', {'ingredients': ingredients, 'recipes': recipes, 'form': form})