mgoetz/basta-server
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change Date View in the weekly view

Browse Source
This commit is contained in:
michigg 2017-12-05 00:44:28 +01:00
parent 80375597f5
commit a1c5a7788b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ofu_app/apps/food/views.py
View File

@ -17,14 +17,16 @@ from apps.food.models import Menu, HappyHour, SingleFood, UserRating, UserFoodIm
# Create your views here. # Create your views here.
def daily_food(request): def daily_food(request):
today = datetime.datetime.now() 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() 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() 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() 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() markus_cafete = Menu.objects.filter(date__exact=today).filter(location__contains="markus").last()
happy_hours = HappyHour.objects.filter(date__exact=today) 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_feki_menu = weekly_menus.filter(location__contains="Feldkirchenstraße")
weekly_austr_menu = weekly_menus.filter(location__contains="Austraße") weekly_austr_menu = weekly_menus.filter(location__contains="Austraße")
weekly_erba_cafete = weekly_menus.filter(location__contains="Erba") weekly_erba_cafete = weekly_menus.filter(location__contains="Erba")

2
ofu_app/templates/macros/food_macros.jinja
View File

@ -43,7 +43,7 @@
{% if location_menus %} {% if location_menus %}
{% for menu in location_menus %} {% for menu in location_menus %}
<div class="menu"> <div class="menu">
<p><strong>{{ menu.date.strftime('%A, %m.%Y') }}</strong></p> <p><strong>{{ menu.date.strftime('%A, %d.%m.%Y') }}</strong></p>
{{ get_menu(menu.menu.all()) }} {{ get_menu(menu.menu.all()) }}
</div> </div>
{% endfor %} {% endfor %}