diff --git a/ofu_app/apps/food/views.py b/ofu_app/apps/food/views.py index 1de16d7..78d7ae5 100644 --- a/ofu_app/apps/food/views.py +++ b/ofu_app/apps/food/views.py @@ -17,14 +17,16 @@ from apps.food.models import Menu, HappyHour, SingleFood, UserRating, UserFoodIm # Create your views here. def daily_food(request): today = datetime.datetime.now() - lastday = today + datetime.timedelta(7) + start_week = today - datetime.timedelta(today.weekday()) + end_week = start_week + datetime.timedelta(7) + feki_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Feldkirchenstraße").last() austr_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Austraße").last() erba_cafete = Menu.objects.filter(date__exact=today).filter(location__contains="Erba").last() markus_cafete = Menu.objects.filter(date__exact=today).filter(location__contains="markus").last() happy_hours = HappyHour.objects.filter(date__exact=today) - weekly_menus = Menu.objects.filter(date__gte=today, date__lte=lastday) + weekly_menus = Menu.objects.filter(date__gte=start_week, date__lte=end_week) weekly_feki_menu = weekly_menus.filter(location__contains="Feldkirchenstraße") weekly_austr_menu = weekly_menus.filter(location__contains="Austraße") weekly_erba_cafete = weekly_menus.filter(location__contains="Erba") diff --git a/ofu_app/templates/macros/food_macros.jinja b/ofu_app/templates/macros/food_macros.jinja index e1db850..9b1c991 100644 --- a/ofu_app/templates/macros/food_macros.jinja +++ b/ofu_app/templates/macros/food_macros.jinja @@ -43,7 +43,7 @@ {% if location_menus %} {% for menu in location_menus %}
{% endfor %}