From 4e7c5f9495ec1416549d63be238e01dafc81494d Mon Sep 17 00:00:00 2001 From: tourn Date: Mon, 30 Mar 2020 22:06:17 +0200 Subject: [PATCH 1/2] Add buttons to add a meal plan to a specific point in time --- cookbook/templates/meal_plan.html | 1 + cookbook/views/new.py | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/cookbook/templates/meal_plan.html b/cookbook/templates/meal_plan.html index c2956916a..0d14d5b19 100644 --- a/cookbook/templates/meal_plan.html +++ b/cookbook/templates/meal_plan.html @@ -54,6 +54,7 @@ {% for day_key, days_value in plan_value.days.items %} +
{% for mp in days_value %} {{ mp.recipe.name }}
diff --git a/cookbook/views/new.py b/cookbook/views/new.py index 7f4412539..198aefc8f 100644 --- a/cookbook/views/new.py +++ b/cookbook/views/new.py @@ -1,4 +1,5 @@ import re +from datetime import datetime from django.contrib import messages from django.contrib.auth.decorators import login_required @@ -120,6 +121,12 @@ class MealPlanCreate(LoginRequiredMixin, CreateView): form_class = MealPlanForm success_url = reverse_lazy('view_plan') + def get_initial(self): + return dict( + meal=self.request.GET['meal'] if 'meal' in self.request.GET else None, + date=datetime.strptime(self.request.GET['date'], '%Y-%m-%d') if 'date' in self.request.GET else None + ) + def form_valid(self, form): obj = form.save(commit=False) obj.user = self.request.user From de145b6b180d8734bcfc4805d9b08ce3957c5cfd Mon Sep 17 00:00:00 2001 From: tourn Date: Sun, 5 Apr 2020 11:10:39 +0200 Subject: [PATCH 2/2] Add some styling --- cookbook/templates/meal_plan.html | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/cookbook/templates/meal_plan.html b/cookbook/templates/meal_plan.html index 0d14d5b19..0691e473b 100644 --- a/cookbook/templates/meal_plan.html +++ b/cookbook/templates/meal_plan.html @@ -8,6 +8,25 @@ {% endblock %} {% block content %} +

{% trans 'Meal-Plan' %} @@ -53,8 +72,8 @@ {% for day_key, days_value in plan_value.days.items %} - -
+ + {% for mp in days_value %} {{ mp.recipe.name }}