added multi day meal planning

cookbook/views/api.py

@@ -662,11 +662,11 @@ class MealPlanViewSet(viewsets.ModelViewSet):
 
         from_date = self.request.query_params.get('from_date', None)
         if from_date is not None:
-            queryset = queryset.filter(date__gte=from_date)
+            queryset = queryset.filter(to_date__gte=from_date)
 
         to_date = self.request.query_params.get('to_date', None)
         if to_date is not None:
-            queryset = queryset.filter(date__lte=to_date)
+            queryset = queryset.filter(to_date__lte=to_date)
         return queryset
 
 
@@ -1673,8 +1673,11 @@ def get_plan_ical(request, from_date, to_date):
     for p in queryset:
         event = Event()
         event['uid'] = p.id
-        event.add('dtstart', p.date)
-        event.add('dtend', p.date)
+        event.add('dtstart', p.from_date)
+        if p.to_date:
+            event.add('dtend', p.to_date)
+        else:
+            event.add('dtend', p.from_date)
         event['summary'] = f'{p.meal_type.name}: {p.get_label()}'
         event['description'] = p.note
         cal.add_component(event)

cookbook/views/edit.py

@@ -8,7 +8,7 @@ from django.utils.translation import gettext as _
 from django.views.generic import UpdateView
 from django.views.generic.edit import FormMixin
 
-from cookbook.forms import CommentForm, ExternalRecipeForm, MealPlanForm, StorageForm, SyncForm
+from cookbook.forms import CommentForm, ExternalRecipeForm, StorageForm, SyncForm
 from cookbook.helper.permission_helper import GroupRequiredMixin, OwnerRequiredMixin, group_required, above_space_limit
 from cookbook.models import (Comment, MealPlan, MealType, Recipe, RecipeImport, Storage, Sync,
                              UserPreference)
@@ -192,26 +192,6 @@ class ImportUpdate(GroupRequiredMixin, UpdateView):
         return context
 
 
-class MealPlanUpdate(OwnerRequiredMixin, UpdateView, SpaceFormMixing):
-    template_name = "generic/edit_template.html"
-    model = MealPlan
-    form_class = MealPlanForm
-
-    def get_success_url(self):
-        return reverse('view_plan_entry', kwargs={'pk': self.object.pk})
-
-    def get_form(self, form_class=None):
-        form = self.form_class(**self.get_form_kwargs())
-        form.fields['meal_type'].queryset = MealType.objects \
-            .filter(created_by=self.request.user).all()
-        return form
-
-    def get_context_data(self, **kwargs):
-        context = super(MealPlanUpdate, self).get_context_data(**kwargs)
-        context['title'] = _("Meal-Plan")
-        return context
-
-
 class ExternalRecipeUpdate(GroupRequiredMixin, UpdateView, SpaceFormMixing):
     groups_required = ['user']
     model = Recipe

cookbook/views/new.py

@@ -12,7 +12,7 @@ from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext as _
 from django.views.generic import CreateView
 
-from cookbook.forms import ImportRecipeForm, InviteLinkForm, MealPlanForm, Storage, StorageForm
+from cookbook.forms import ImportRecipeForm, InviteLinkForm,  Storage, StorageForm
 from cookbook.helper.permission_helper import GroupRequiredMixin, group_required, above_space_limit
 from cookbook.models import (InviteLink, MealPlan, MealType, Recipe, RecipeBook, RecipeImport,
                              ShareLink, Step, UserPreference, UserSpace)
@@ -135,55 +135,3 @@ def create_new_external_recipe(request, import_id):
     return render(request, 'forms/edit_import_recipe.html', {'form': form})
 
 
-class MealPlanCreate(GroupRequiredMixin, CreateView, SpaceFormMixing):
-    groups_required = ['user']
-    template_name = "generic/new_template.html"
-    model = MealPlan
-    form_class = MealPlanForm
-    success_url = reverse_lazy('view_plan')
-
-    def get_form(self, form_class=None):
-        form = self.form_class(**self.get_form_kwargs())
-        form.fields['meal_type'].queryset = MealType.objects.filter(created_by=self.request.user,
-                                                                    space=self.request.space).all()
-        return form
-
-    def get_initial(self):
-        return dict(
-            meal_type=(
-                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
-            ),
-            shared=(
-                self.request.user.userpreference.plan_share.all()
-                if self.request.user.userpreference.plan_share
-                else None
-            )
-        )
-
-    def form_valid(self, form):
-        obj = form.save(commit=False)
-        obj.created_by = self.request.user
-        obj.space = self.request.space
-        obj.save()
-        return HttpResponseRedirect(reverse('view_plan'))
-
-    def get_context_data(self, **kwargs):
-        context = super(MealPlanCreate, self).get_context_data(**kwargs)
-        context['title'] = _("Meal-Plan")
-
-        recipe = self.request.GET.get('recipe')
-        if recipe:
-            if re.match(r'^([0-9])+$', recipe):
-                if Recipe.objects.filter(pk=int(recipe), space=self.request.space).exists():
-                    context['default_recipe'] = Recipe.objects.get(pk=int(recipe), space=self.request.space)
-
-        return context
-
-