diff --git a/cookbook/templates/meal_plan.html b/cookbook/templates/meal_plan.html index c2956916a..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,7 +72,8 @@ {% 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