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

Merge branch 'develop' into remove_facets

Browse Source
This commit is contained in:
vabene1111
2023-09-12 15:36:14 +02:00
committed by GitHub
parent 5d3f44ffee ce29283a52
commit 3f63eab68c
23 changed files with 437 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cookbook/views/api.py
View File

@ -666,11 +666,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
@ -707,7 +707,7 @@ class AutoPlanViewSet(viewsets.ViewSet):
args = {'recipe_id': recipe['id'], 'servings': servings,
'created_by': request.user,
'meal_type_id': serializer.validated_data['meal_type_id'],
'note': '', 'date': day, 'space': request.space}
'note': '', 'from_date': day, 'to_date': day, 'space': request.space}
m = MealPlan(**args)
meal_plans.append(m)
@ -1633,8 +1633,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)