diff --git a/ofu_app/apps/food/utils/migrate_data.py b/ofu_app/apps/food/utils/migrate_data.py index f728e4a..15e71af 100644 --- a/ofu_app/apps/food/utils/migrate_data.py +++ b/ofu_app/apps/food/utils/migrate_data.py @@ -20,10 +20,12 @@ def getJsonFromFile(path): def writeStudentenwerkDataInDB(data): data = json.loads(data) + pprint(data) for menu in data['weekmenu']: - + pprint(menu) foodlist = [] for single_food in menu['menu']: + pprint(single_food) if 'allergens' in single_food: allergens = [] for allergen in single_food['allergens']: @@ -53,17 +55,15 @@ def writeStudentenwerkDataInDB(data): db_single_food.price_guest = single_food['prices']['price_guest'] if 'allergens' in locals(): db_single_food.allergens = allergens - foodlist.append(db_single_food) try: date = datetime.strptime(str(menu['date']), "%d.%m.").replace(year=datetime.today().year) - menu = Menu.objects.create(location=data['name'], - date=date) + menu = Menu.objects.create(location=data['name'], date=date) menu.menu = foodlist menu.save() - except IntegrityError: + except IntegrityError as error: # ignored - break + pass def writeFekideDataInDB(data): diff --git a/ofu_app/apps/food/utils/parser/cafete_page_parser.py b/ofu_app/apps/food/utils/parser/cafete_page_parser.py index f218c3e..a11fe37 100644 --- a/ofu_app/apps/food/utils/parser/cafete_page_parser.py +++ b/ofu_app/apps/food/utils/parser/cafete_page_parser.py @@ -3,6 +3,7 @@ from bs4 import BeautifulSoup import json import datetime import re +from pprint import pprint SPEISEPLAN_NAME_SELECTOR = '.csc-default .csc-header .csc-firstHeader' @@ -64,4 +65,4 @@ def parsePage(url: str): # LINK_ERBA_CAFETE = "https://www.studentenwerk-wuerzburg.de/bamberg/essen-trinken/sonderspeiseplaene/cafeteria-erba-insel.html" -# parsePage(LINK_ERBA_CAFETE) +# pprint(parsePage(LINK_ERBA_CAFETE)) diff --git a/ofu_app/apps/food/utils/parser/mensa_page_parser.py b/ofu_app/apps/food/utils/parser/mensa_page_parser.py index c8b9164..dad1349 100644 --- a/ofu_app/apps/food/utils/parser/mensa_page_parser.py +++ b/ofu_app/apps/food/utils/parser/mensa_page_parser.py @@ -28,7 +28,6 @@ def getFoodPerDay(soup): title = singleFoodSoup.find('div', {'class': 'title'}).getText() allergens = [e.getText() for e in singleFoodSoup.select('.left .additnr .toggler ul li')] prices = {} - print(singleFoodSoup.select('.price')) if singleFoodSoup.select('.price'): prices['price_student'] = singleFoodSoup.select('.price')[0]['data-default'] if singleFoodSoup.select('.price'): diff --git a/ofu_app/apps/food/views.py b/ofu_app/apps/food/views.py index 1f61a15..4599cac 100644 --- a/ofu_app/apps/food/views.py +++ b/ofu_app/apps/food/views.py @@ -58,8 +58,11 @@ def food_detail(request, id): if pic_upload(request, id) == False: return HttpResponse(status=404) food = SingleFood.objects.get(id=id) - images = UserFoodImage.objects.filter(food=id) - return render(request, "food/detailed_food.jinja", {'food': food, 'images': images}) + if request.user.is_authenticated: + images = UserFoodImage.objects.filter(food=id, user=request.user) + return render(request, "food/detailed_food.jinja", {'food': food, 'images': images}) + else: + return render(request, "food/detailed_food.jinja", {'food': food}) def all_food(request): @@ -79,8 +82,7 @@ def all_food(request): def food(request): - return render(request, "food/home.jinja", { - }) + return render(request, "food/home.jinja", {}) def food_rating(request): diff --git a/ofu_app/templates/macros/food_macros.jinja b/ofu_app/templates/macros/food_macros.jinja index b850a42..c9b51fe 100644 --- a/ofu_app/templates/macros/food_macros.jinja +++ b/ofu_app/templates/macros/food_macros.jinja @@ -51,12 +51,8 @@
- {% if single_food.price_student %} - -

{{ single_food.name }}

- {% else %} -

{{ single_food.name }}

- {% endif %} + +

{{ single_food.name }}

{% if single_food.price_student %}
{{ single_food.price_student }}