From ddf1fde2dc30f239a1c10225d67f5dbd13dc20d4 Mon Sep 17 00:00:00 2001 From: michigg Date: Tue, 17 Apr 2018 18:36:01 +0200 Subject: [PATCH 1/2] Update admin pages --- ofu_app/apps/food/admin.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ofu_app/apps/food/admin.py b/ofu_app/apps/food/admin.py index 40c25e2..e23bfc2 100644 --- a/ofu_app/apps/food/admin.py +++ b/ofu_app/apps/food/admin.py @@ -2,7 +2,8 @@ from __future__ import unicode_literals from django.contrib import admin -from apps.food.models import SingleFood, Menu, HappyHour, UserFoodRating, UserFoodImage, FoodImage, UserFoodComment +from apps.food.models import SingleFood, Menu, HappyHour, UserFoodRating, UserFoodImage, FoodImage, UserFoodComment, \ + Allergene, HappyHourLocation class SingleFoodInline(admin.TabularInline): @@ -27,3 +28,5 @@ admin.site.register(UserFoodImage) admin.site.register(UserFoodComment) admin.site.register(Menu, MenuAdmin) admin.site.register(FoodImage) +admin.site.register(Allergene) +admin.site.register(HappyHourLocation) From 61187ac073dceb2803f197227f1aa71ceb88e2d0 Mon Sep 17 00:00:00 2001 From: michigg Date: Tue, 5 Jun 2018 01:40:49 +0200 Subject: [PATCH 2/2] Fix cafete parser --- ofu_app/apps/food/utils/migrate_data.py | 4 ++++ ofu_app/apps/food/utils/parser/cafete_page_parser.py | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ofu_app/apps/food/utils/migrate_data.py b/ofu_app/apps/food/utils/migrate_data.py index 6d6c43e..b52ad55 100644 --- a/ofu_app/apps/food/utils/migrate_data.py +++ b/ofu_app/apps/food/utils/migrate_data.py @@ -117,9 +117,13 @@ def main(): logger.info("Aktueller Stand:" + writeoutDBObjects()) # get food jsons + logger.info('AUSTRASSE') writeStudentenwerkDataInDB(mensa_page_parser.parsePage(LINK_AUSTR_MENSA)) + logger.info('FEKI') writeStudentenwerkDataInDB(mensa_page_parser.parsePage(LINK_FEKI_MENSA)) + logger.info('ERBA') writeStudentenwerkDataInDB(cafete_page_parser.parse_page(LINK_ERBA_CAFETE)) + logger.info('MARKUSHAUS') writeStudentenwerkDataInDB(cafete_page_parser.parse_page(LINK_MARKUS_CAFETE)) writeFekideDataInDB(fekide_happyhour_page_parser.parse_page(LINK_FEKIDE_GUIDE)) 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 5c1ef6d..ce18bd1 100644 --- a/ofu_app/apps/food/utils/parser/cafete_page_parser.py +++ b/ofu_app/apps/food/utils/parser/cafete_page_parser.py @@ -8,7 +8,7 @@ from . import load_page logger = logging.getLogger(__name__) -SPEISEPLAN_NAME_SELECTOR = '.csc-default .csc-header .csc-firstHeader' +SPEISEPLAN_NAME_SELECTOR = '.csc-frame .csc-header .csc-firstHeader' def get_foodplan_name(soup): @@ -28,7 +28,7 @@ def get_right_line(lines): def get_food_per_day(soup): days = [] - lines = soup.select('.csc-default .bodytext') + lines = soup.select('.csc-frame .bodytext') foodlines = get_right_line(lines) for food in foodlines: day = str(food).split()[0] @@ -64,4 +64,7 @@ def parse_page(url: str): logger.exception(e) return None -# LINK_ERBA_CAFETE = "https://www.studentenwerk-wuerzburg.de/bamberg/essen-trinken/sonderspeiseplaene/cafeteria-erba-insel.html" + +if __name__ == "__main__": + LINK_ERBA_CAFETE = "https://www.studentenwerk-wuerzburg.de/bamberg/essen-trinken/sonderspeiseplaene/cafeteria-erba-insel.html" + parse_page(LINK_ERBA_CAFETE)