diff --git a/README.md b/README.md index 04cd5cb..3b42586 100644 --- a/README.md +++ b/README.md @@ -2,16 +2,24 @@ Die OFU APP ist überwiegend eine WebApplikation, die auf Mobile Devices optimiert werden soll. Die OFU APP soll keine Kopie der Feki.de Webseite darstellen oder dahingehend entwickelt werden, sondern Informationen verschiedenster Portale, die für Studenten relevant sind oder sein könnten, zusammentragen und diese nutzerfreundlich und auch mobil bedienbar darzustellen. -## Phase 1: Implementierung der Grundfunktionen: -siehe Auflistung Infos/Funktionen +## Phasen: +### Phase 1: Implementierung der Grundfunktionen: +- Univis +- Flexnow 2 +- Virtueller Campus +- ZUV ZUL Portal +- Roofis: Room finder service mit Erweiterung: Donar - Find my Room +- Essensmöglichkeiten: Speisepläne Mensen und Cafeten; Happy Hours (Feki.de) +- Veranstaltungen: HSnGs (Feki.de), Uni (Univis), Zusätzlicher: (Bsp.: Bockbieranstiche) +- Weitere Folgen... -## Phase 2: Erweiterung der Grundfunktionen: +### Phase 2: Erweiterung der Grundfunktionen: Die nun bestehenden Systeme sollen hinsichtlich ihrer Erweiterungsmöglichkeiten überdacht werden und dahingehend optimiert werden. Auch neue Services sind denkbar, die die Vernetzung der OFU-Studenten fördern. ## Entwicklungsübersicht: ### Alpha (Oktober 2017 - Dezember 2017): - Versionsnummer: 0.#.# -- Umsetzung der Phase 1 +- Umsetzung der 1. Phase - Beginn Phase 2 ### Beta (Januar 2018 - Februar 2018): @@ -36,12 +44,3 @@ Die nun bestehenden Systeme sollen hinsichtlich ihrer Erweiterungsmöglichkeiten ### Release (Ende Juni 2018 evtl. darauf folgendes Semester): - Versionsnummer: 2.0.0 - Bekanntmachung der App an der ganzen OFU - -## Zugängliche Infos/Funktionen: -- Univis -- Flexnow 2 -- Virtueller Campus -- ZUV ZUL Portal -- Roofis: Room finder service mit Erweiterung: Donar - Find my Room -- Essensmöglichkeiten: Speisepläne Mensen und Cafeten; Happy Hours (Feki.de) -- Veranstaltungen: HSnGs (Feki.de), Uni (Univis), Zusätzlicher: (Bsp.: Bockbieranstiche) \ No newline at end of file diff --git a/ofu_app/apps/events/urls.py b/ofu_app/apps/events/urls.py index 284b8c5..53922e3 100644 --- a/ofu_app/apps/events/urls.py +++ b/ofu_app/apps/events/urls.py @@ -18,5 +18,7 @@ from django.conf.urls import url from apps.events import views urlpatterns = [ - url(r'^week/', views.week_events, name='week-events'), + url(r'^$', views.events_main_page, name='events-main'), + url(r'^week/$', views.week_events, name='week-events'), + url(r'^all/$', views.all_events, name='all-events'), ] diff --git a/ofu_app/apps/events/utils/json_generator/jsons/events-fekide.json b/ofu_app/apps/events/utils/json_generator/jsons/events-fekide.json deleted file mode 100644 index 0b8cc93..0000000 --- a/ofu_app/apps/events/utils/json_generator/jsons/events-fekide.json +++ /dev/null @@ -1 +0,0 @@ -{"dates": [{"date": "04.10.2017", "events": [{"category": " Berufliches", "link": "https://www.feki.de/terminkalender/termin/3226", "title": "Kompetenztraining: Visualisieren/Pr\u00e4sentieren Berufliches", "location": "Marcus-Haus (M3) HuWi", "time": "Ab 09:00 Uhr"}, {"category": " Party", "link": "https://www.feki.de/terminkalender/termin/3567", "title": "!! AB DURCH DIE MITTE mit HOWIE MAUI & DJ GRAMOE !! Party", "location": "Sound'n Arts", "time": "Ab 22:00 Uhr"}]}, {"date": "06.10.2017", "events": [{"category": " Party", "link": "https://www.feki.de/terminkalender/termin/3528", "title": "Greenclub - Die Rap-Party der Stadt! Party", "location": "Live-Club", "time": "Ab 22:00 Uhr"}]}, {"date": "07.10.2017", "events": [{"category": " Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3545", "title": "The Apemen (Mod-Beat/Sixties-Garage) & The Quires Kultur & Live Acts", "location": "Sound'n Arts", "time": "Ab 21:00 Uhr"}]}, {"date": "09.10.2017", "events": [{"category": " Berufliches", "link": "https://www.feki.de/terminkalender/termin/3218", "title": "Kompetenztraining: Aktivierende Methoden Berufliches", "location": "Marcus-Haus (M3) HuWi", "time": "Ab 09:00 Uhr"}, {"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3558", "title": "Steuertipps f\u00fcr Studierende Sonstiges", "location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 16:00 Uhr"}]}, {"date": "10.10.2017", "events": [{"category": " Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3537", "title": "William Shakespeares Star Wars Kultur & Live Acts", "location": "Alte Seilerei", "time": "Ab 19:30 Uhr"}, {"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3549", "title": "Erstsemesterstammtisch (1) Sonstiges", "location": "Aposto", "time": "Ab 20:00 Uhr"}]}, {"date": "11.10.2017", "events": [{"category": " Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3538", "title": "William Shakespeares Star Wars Kultur & Live Acts", "location": "Alte Seilerei", "time": "Ab 19:30 Uhr"}, {"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3531", "title": "Erstis Kneipentour Sonstiges", "location": "JuZ Margaretendamm", "time": "Ab 20:00 Uhr"}, {"category": " Party", "link": "https://www.feki.de/terminkalender/termin/3557", "title": "Soziologiestammtisch bei den EETS Party", "location": "Rotenschild", "time": "Ab 20:00 Uhr"}]}, {"date": "13.10.2017", "events": [{"category": " Party", "link": "https://www.feki.de/terminkalender/termin/3536", "title": "Rauschkollektiv \u2013 Goldener Technooktober Party", "location": "Sound'n Arts", "time": "Ab 22:00 Uhr"}]}, {"date": "14.10.2017", "events": [{"category": " Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3535", "title": "Wokshops: Hip-Hop Kultur & Live Acts", "location": "JuZ Margaretendamm", "time": "Ab 12:00 Uhr"}, {"category": " Sport", "link": "https://www.feki.de/terminkalender/termin/3522", "title": "Kickerturnier Sport", "location": "KickerBox", "time": "Ab 14:00 Uhr"}, {"category": " Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3534", "title": "Bleib auf dem Teppich 2 - Open Mic & Konzerte (Hip-Hop) Kultur & Live Acts", "location": "JuZ Margaretendamm", "time": "Ab 18:30 Uhr"}]}, {"date": "16.10.2017", "events": [{"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3562", "title": "Assessment Center Training - Die wichtigsten \u00dcbungen, die besten L\u00f6sungen Sonstiges", "location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 16:00 Uhr"}]}, {"date": "17.10.2017", "events": [{"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3546", "title": "Erstsemesterstammtisch (2) Sonstiges", "location": "Rotenschild", "time": "Ab 20:00 Uhr"}]}, {"date": "18.10.2017", "events": [{"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3559", "title": "Steuertipps f\u00fcr Studierende Sonstiges", "location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 16:00 Uhr"}, {"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3541", "title": "Feki.de Infoabend (Feki) Sonstiges", "location": "Feldkirchenstra\u00dfe (F21) SoWi", "time": "Ab 20:15 Uhr"}]}, {"date": "19.10.2017", "events": [{"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3547", "title": "Erstsemesterstammtisch (3) Sonstiges", "location": "Catwheezles' Castle", "time": "Ab 20:00 Uhr"}]}, {"date": "21.10.2017", "events": [{"category": " Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3533", "title": "Konzert: Somnium Captare, Varus, Carnage Calligraphy, Eroded Ashes (Metal) Kultur & Live Acts", "location": "JuZ Margaretendamm", "time": "Ab 19:00 Uhr"}, {"category": " Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3413", "title": "junk space Kultur & Live Acts", "location": "Parkhaus Zentrum S\u00fcd", "time": "Ab 19:30 Uhr"}]}, {"date": "23.10.2017", "events": [{"category": " Uni", "link": "https://www.feki.de/terminkalender/termin/3551", "title": "Institutskolloquium Psychologie Uni", "location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr"}, {"category": " Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3478", "title": "Okka-Esther Hungerb\u00fchler: Das Duell - Vernissage Kultur & Live Acts", "location": "Villa Concordia", "time": "Ab 19:00 Uhr"}, {"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3543", "title": "Feki.de Infoabend (Innenstadt) Sonstiges", "location": "An der Universit\u00e4t 5 (U5) GuK", "time": "Ab 20:15 Uhr"}]}, {"date": "24.10.2017", "events": [{"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3563", "title": "Professionelles Bewerben - Tods\u00fcnden und Tugenden Sonstiges", "location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 15:00 Uhr"}, {"category": " Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3479", "title": "Villa Wild # 5: Von den Maschinen Kultur & Live Acts", "location": "E.T.A.-Hoffmann-Theater", "time": "Ab 19:00 Uhr"}, {"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3550", "title": "Viva con Agua Bamberg Treffen im Oktober Sonstiges", "location": "Freiraum", "time": "Ab 20:00 Uhr"}]}, {"date": "25.10.2017", "events": [{"category": " Uni", "link": "https://www.feki.de/terminkalender/termin/3305", "title": "Informationsabend des Akademischen Auslandsamtes zum Auslandsstudium Uni", "location": "Feldkirchenstra\u00dfe (F21) SoWi", "time": "Ab 20:00 Uhr"}]}, {"date": "26.10.2017", "events": [{"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3564", "title": "Abenteuer Referendariat Sonstiges", "location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 16:00 Uhr"}, {"category": " Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3414", "title": "junk space Kultur & Live Acts", "location": "Parkhaus Zentrum S\u00fcd", "time": "Ab 19:30 Uhr"}, {"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3548", "title": "Erstsemesterstammtisch (4) Sonstiges", "location": "Freiraum", "time": "Ab 21:00 Uhr"}]}, {"date": "27.10.2017", "events": [{"category": " Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3532", "title": "Vorentscheid Rock in Oberfranken 2018 Kultur & Live Acts", "location": "JuZ Margaretendamm", "time": "Ab 19:00 Uhr"}]}, {"date": "28.10.2017", "events": [{"category": " Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3415", "title": "junk space Kultur & Live Acts", "location": "Parkhaus Zentrum S\u00fcd", "time": "Ab 19:30 Uhr"}]}, {"date": "30.10.2017", "events": [{"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3560", "title": "Steuertipps f\u00fcr Studierende Sonstiges", "location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 15:00 Uhr"}]}, {"date": "02.11.2017", "events": [{"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3565", "title": "Gehaltsverhandlung f\u00fcr Absolventen Sonstiges", "location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 17:00 Uhr"}]}, {"date": "03.11.2017", "events": [{"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3481", "title": "Feki.de Flohmarkt Sonstiges", "location": "Bamberg", "time": "Ab 14:00 Uhr"}]}, {"date": "08.11.2017", "events": [{"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3561", "title": "Steuertipps f\u00fcr Studierende Sonstiges", "location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 16:00 Uhr"}]}, {"date": "09.11.2017", "events": [{"category": " Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3566", "title": "Soft Skill Training Sonstiges", "location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 15:00 Uhr"}, {"category": " Uni", "link": "https://www.feki.de/terminkalender/termin/3483", "title": "Forum Mathematik-Didaktik Uni", "location": "Markusstra\u00dfe 8a (MG1/MG2)", "time": "Ab 18:00 Uhr"}]}, {"date": "20.11.2017", "events": [{"category": " Uni", "link": "https://www.feki.de/terminkalender/termin/3552", "title": "Institutskolloquium Psychologie Uni", "location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr"}]}, {"date": "21.11.2017", "events": [{"category": " Berufliches", "link": "https://www.feki.de/terminkalender/termin/3438", "title": "akademika augsburg 2017 Berufliches", "location": "Messezentrum Augsburg", "time": "Ab 10:00 Uhr"}]}, {"date": "22.11.2017", "events": [{"category": " Berufliches", "link": "https://www.feki.de/terminkalender/termin/3439", "title": "akademika augsburg 2017 Berufliches", "location": "Messezentrum Augsburg", "time": "Ab 10:00 Uhr"}]}, {"date": "04.12.2017", "events": [{"category": " Uni", "link": "https://www.feki.de/terminkalender/termin/3553", "title": "Institutskolloquium Psychologie Uni", "location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr"}]}, {"date": "07.12.2017", "events": [{"category": " Uni", "link": "https://www.feki.de/terminkalender/termin/3482", "title": "Forum Mathematik-Didaktik Uni", "location": "Markusstra\u00dfe 8a (MG1/MG2)", "time": "Ab 18:00 Uhr"}]}, {"date": "15.01.2017", "events": [{"category": " Uni", "link": "https://www.feki.de/terminkalender/termin/3554", "title": "Institutskolloquium Psychologie Uni", "location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr"}]}, {"date": "22.01.2017", "events": [{"category": " Uni", "link": "https://www.feki.de/terminkalender/termin/3555", "title": "Institutskolloquium Psychologie Uni", "location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr"}]}, {"date": "29.01.2017", "events": [{"category": " Uni", "link": "https://www.feki.de/terminkalender/termin/3556", "title": "Institutskolloquium Uni", "location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr"}]}]} \ No newline at end of file diff --git a/ofu_app/apps/events/utils/parser/fekide_eventpage_parser.py b/ofu_app/apps/events/utils/parser/fekide_eventpage_parser.py index 6b2c17f..f984756 100644 --- a/ofu_app/apps/events/utils/parser/fekide_eventpage_parser.py +++ b/ofu_app/apps/events/utils/parser/fekide_eventpage_parser.py @@ -6,8 +6,6 @@ from pprint import pprint import os import locale -os.environ['TZ'] = 'Europe/Berlin' - SPEISEPLAN_NAME_SELECTOR = '.csc-default .csc-header .csc-firstHeader' LINK_FEKIDE_Events = "https://www.feki.de/terminkalender" LINK_FEKIDE = "https://www.feki.de" diff --git a/ofu_app/apps/events/views.py b/ofu_app/apps/events/views.py index dcc2add..804c6c7 100644 --- a/ofu_app/apps/events/views.py +++ b/ofu_app/apps/events/views.py @@ -6,6 +6,21 @@ from apps.events.models import Event # Create your views here. +def events_main_page(request): + return render(request, "events/events.jinja") + + +def all_events(request): + today = datetime.datetime.now() + all_future_events = Event.objects.filter(date__gte=today) + lastdate = all_future_events.last().date + return render(request, "events/all_events.jinja", { + 'startdate': today, + 'events': all_future_events, + 'enddate': lastdate, + }) + + def week_events(request): today = datetime.datetime.now() weekdelta = today + datetime.timedelta(7) diff --git a/ofu_app/apps/food/migrations/__pycache__/0001_initial.cpython-35.pyc b/ofu_app/apps/food/migrations/__pycache__/0001_initial.cpython-35.pyc index 8674b14..0ef0bbc 100644 Binary files a/ofu_app/apps/food/migrations/__pycache__/0001_initial.cpython-35.pyc and b/ofu_app/apps/food/migrations/__pycache__/0001_initial.cpython-35.pyc differ diff --git a/ofu_app/apps/food/migrations/__pycache__/__init__.cpython-35.pyc b/ofu_app/apps/food/migrations/__pycache__/__init__.cpython-35.pyc index 63edbfb..df1f028 100644 Binary files a/ofu_app/apps/food/migrations/__pycache__/__init__.cpython-35.pyc and b/ofu_app/apps/food/migrations/__pycache__/__init__.cpython-35.pyc differ diff --git a/ofu_app/apps/food/urls.py b/ofu_app/apps/food/urls.py index e2c65a6..fe72a68 100644 --- a/ofu_app/apps/food/urls.py +++ b/ofu_app/apps/food/urls.py @@ -18,7 +18,9 @@ from django.conf.urls import url from apps.food import views urlpatterns = [ - url(r'^all/', views.food, name='food'), + url(r'^$', views.food, name='food'), # Daily Menus url(r'^daily/$', views.daily_food, name='daily-food'), + url(r'^weekly/$', views.daily_food, name='weekly-food'), + url(r'^all/$', views.food, name='all-food'), ] diff --git a/ofu_app/apps/food/utils/json_generator/jsons/cafete-erba.json b/ofu_app/apps/food/utils/json_generator/jsons/cafete-erba.json deleted file mode 100644 index 1aa8d2c..0000000 --- a/ofu_app/apps/food/utils/json_generator/jsons/cafete-erba.json +++ /dev/null @@ -1 +0,0 @@ -{"execution_time": "Monday, 02.10.2017", "weekmenu": [{"menu": ["Rinderhacksteak an Cognacso\u00dfe und Sp\u00e4tzle"], "date": "24.07."}, {"menu": ["Gem\u00fcseschnitzel mit Kr\u00e4utercreme und Kartoffeln"], "date": "25.07."}, {"menu": ["Penne-Nudeln mit Hackfleischso\u00dfe"], "date": "26.07."}, {"menu": ["Kaiserschmarrn mit Apfelmus"], "date": "27.07."}], "name": "Cafeteria Erba-Insel"} \ No newline at end of file diff --git a/ofu_app/apps/food/utils/json_generator/jsons/cafete-markus.json b/ofu_app/apps/food/utils/json_generator/jsons/cafete-markus.json deleted file mode 100644 index df2b42d..0000000 --- a/ofu_app/apps/food/utils/json_generator/jsons/cafete-markus.json +++ /dev/null @@ -1 +0,0 @@ -{"execution_time": "Monday, 02.10.2017", "weekmenu": [{"menu": ["Vegetarisches Chili sin Carne"], "date": "24.07."}, {"menu": ["Gem\u00fcseschnitzel mit Kr\u00e4utercreme und Kartoffeln"], "date": "25.07."}, {"menu": ["\u00dcberbackene Zucchini an Paprikaso\u00dfe mit P\u00fcree"], "date": "26.07."}, {"menu": ["Kaiserschmarrn mit Apfelmus"], "date": "27.07."}], "name": "Cafeteria Markusplatz"} \ No newline at end of file diff --git a/ofu_app/apps/food/utils/json_generator/jsons/happyhourguide-fekide.json b/ofu_app/apps/food/utils/json_generator/jsons/happyhourguide-fekide.json deleted file mode 100644 index 21dfd20..0000000 --- a/ofu_app/apps/food/utils/json_generator/jsons/happyhourguide-fekide.json +++ /dev/null @@ -1 +0,0 @@ -{"execution_time": "Monday, 02.10.2017", "day": "Monday, 02.10.2017", "happyhours": [{"time": "16:00 - 23:59", "location": "Bowlinghaus Bamberg", "description": "Salat-Tag: Varianten f\u00fcr je 6 \u20ac"}, {"time": "19:00 - 01:00", "location": "Mainfranken Bowling", "description": "Jede Pizza 4,90 \u20ac"}]} \ No newline at end of file diff --git a/ofu_app/apps/food/utils/json_generator/jsons/mensa-austr.json b/ofu_app/apps/food/utils/json_generator/jsons/mensa-austr.json deleted file mode 100644 index 8293538..0000000 --- a/ofu_app/apps/food/utils/json_generator/jsons/mensa-austr.json +++ /dev/null @@ -1 +0,0 @@ -{"execution_time": "Monday, 02.10.2017", "weekmenu": [{"menu": ["Pennenudeln mit Lachs, Spinat und Kirschtomaten", "Rinderhacksteak mit Cognac - Pfefferso\u00dfe", "Schneller Teller: H\u00e4hnchenspie\u00df mit Gefl\u00fcgelso\u00dfe, Bratkartoffeln und Blumenkohl", "Kartoffelgnocchi - Gem\u00fcsepfanne", "Dampfkartoffeln mit hausgemachtem Schnittlauchquark"], "date": "02.10."}, {"menu": [], "date": "03.10."}, {"menu": ["Siebenschwabenplatte mit Bratenso\u00dfe", "Putenbrustgeschnetzeltes in Pilzrahm", "Schneller Teller: Veganes Soja - Gem\u00fcsegeschnetzeltes mit Penine Rigate, Apfel", "\u00dcberbackene Zucchini \"mediterrane Art\" an Paprikaso\u00dfe"], "date": "04.10."}, {"menu": ["Chicken Burger mit Ananas Currydip", "Schneller Teller: Paprikagulsch vom Schwein mit Spiralnudeln und Rosenkohl", "Nudelgem\u00fcseauflauf", "Pizza \"Spinat & Hirtenk\u00e4se\""], "date": "05.10."}, {"menu": ["Schneller Teller: Seelachsfilet an \"S\u00fc\u00df - Scharfer\" Tomatenso\u00dfe, Langkornreis und Brokkoli", "Gyros mit hausgemachtem Tsatsiki", "Green Tacos mit Walnuss - Chili - P\u00e2t\u00e9", "Kartoffel Broccoli Gratin"], "date": "06.10."}], "name": "Speiseplan f\u00fcr Austra\u00dfe Bamberg"} \ No newline at end of file diff --git a/ofu_app/apps/food/utils/json_generator/jsons/mensa-feki.json b/ofu_app/apps/food/utils/json_generator/jsons/mensa-feki.json deleted file mode 100644 index b9fd6b5..0000000 --- a/ofu_app/apps/food/utils/json_generator/jsons/mensa-feki.json +++ /dev/null @@ -1 +0,0 @@ -{"execution_time": "Monday, 02.10.2017", "weekmenu": [{"menu": ["Rinderhacksteak mit Cognac - Pfefferso\u00dfe", "Schneller Teller: H\u00e4hnchenspie\u00df mit Gefl\u00fcgelso\u00dfe, Bratkartoffeln und Blumenkohl", "Kartoffelgnocchi - Gem\u00fcsepfanne", "Dampfkartoffeln mit hausgemachtem Schnittlauchquark"], "date": "02.10."}, {"menu": [], "date": "03.10."}, {"menu": ["Siebenschwabenplatte mit Bratenso\u00dfe", "Putenbrustgeschnetzeltes in Pilzrahm", "Schneller Teller: Veganes Soja - Gem\u00fcsegeschnetzeltes mit Penine Rigate, Apfel", "\u00dcberbackene Zucchini \"mediterrane Art\" an Paprikaso\u00dfe"], "date": "04.10."}, {"menu": ["Chicken Burger mit Ananas Currydip", "Schneller Teller: Paprikagulsch vom Schwein mit Spiralnudeln und Rosenkohl", "Nudelgem\u00fcseauflauf", "Pizza \"Spinat & Hirtenk\u00e4se\""], "date": "05.10."}, {"menu": ["Schneller Teller: Seelachsfilet an \"S\u00fc\u00df - Scharfer\" Tomatenso\u00dfe, Langkornreis und Brokkoli", "Gyros mit hausgemachtem Tsatsiki", "Green Tacos mit Walnuss - Chili - P\u00e2t\u00e9", "Kartoffel Broccoli Gratin"], "date": "06.10."}], "name": "Speiseplan f\u00fcr Feldkirchenstra\u00dfe Bamberg"} \ No newline at end of file diff --git a/ofu_app/apps/food/views.py b/ofu_app/apps/food/views.py index 5e880f1..ed86d64 100644 --- a/ofu_app/apps/food/views.py +++ b/ofu_app/apps/food/views.py @@ -10,7 +10,7 @@ from apps.food.models import Menu, HappyHour # Create your views here. def daily_food(request): - today = datetime.datetime.now() + datetime.timedelta(2) + today = datetime.datetime.now() daily_menus = Menu.objects.filter(date__exact=today) feki_menu = daily_menus.filter(location__contains="Feldkirchenstraße").last() austr_menu = daily_menus.filter(location__contains="Austraße").last() @@ -28,6 +28,42 @@ def daily_food(request): }) +def weekly_food(request): + today = datetime.datetime.now() + lastday = datetime.datetime.now() + datetime.timedelta(7) + weekly_menus = Menu.objects.filter(date__gte=today, date__lte=lastday) + feki_menu = weekly_menus.filter(location__contains="Feldkirchenstraße") + austr_menu = weekly_menus.filter(location__contains="Austraße") + erba_cafete = weekly_menus.filter(location__contains="Erba") + markus_cafete = weekly_menus.filter(location__contains="markus") + happy_hours = HappyHour.objects.filter(date__gte=today, date__lte=lastday) + print(feki_menu.menu) + return render(request, "food/daily_food.jinja", { + 'day': today, + 'happy_hours': happy_hours, + 'feki_menu': feki_menu, + 'austr_menu': austr_menu, + 'erba_cafete': erba_cafete, + 'markus_cafete': markus_cafete, + }) + + +def all_food(request): + menus = Menu.objects.all() + feki_menu = menus.filter(location__contains="Feldkirchenstraße") + austr_menu = menus.filter(location__contains="Austraße") + erba_cafete = menus.filter(location__contains="Erba") + markus_cafete = menus.filter(location__contains="markus") + happy_hours = HappyHour.objects.all() + return render(request, "food/daily_food.jinja", { + 'happy_hours': happy_hours, + 'feki_menu': feki_menu, + 'austr_menu': austr_menu, + 'erba_cafete': erba_cafete, + 'markus_cafete': markus_cafete, + }) + + def food(request): return render(request, "food/food.jinja", { }) diff --git a/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc b/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc index b8818de..12c9f2a 100644 Binary files a/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc and b/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc differ diff --git a/ofu_app/ofu_app/__pycache__/urls.cpython-35.pyc b/ofu_app/ofu_app/__pycache__/urls.cpython-35.pyc index 0ad4ff7..3cfea3b 100644 Binary files a/ofu_app/ofu_app/__pycache__/urls.cpython-35.pyc and b/ofu_app/ofu_app/__pycache__/urls.cpython-35.pyc differ diff --git a/ofu_app/ofu_app/urls.py b/ofu_app/ofu_app/urls.py index 16b7fe5..1fd08dd 100644 --- a/ofu_app/ofu_app/urls.py +++ b/ofu_app/ofu_app/urls.py @@ -15,10 +15,12 @@ Including another URLconf """ from django.conf.urls import url, include from django.contrib import admin +from ofu_app import views urlpatterns = [ url(r'^admin/', admin.site.urls), + url(r'^$', views.home, name="home"), # -- Apps -- url(r'^food/', include('apps.food.urls')), url(r'^events/', include('apps.events.urls')), diff --git a/ofu_app/ofu_app/views.py b/ofu_app/ofu_app/views.py new file mode 100644 index 0000000..43ed5bc --- /dev/null +++ b/ofu_app/ofu_app/views.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.shortcuts import render + + +# Create your views here. +def home(request): + return render(request, "home.jinja", {}) diff --git a/ofu_app/templates/events/all_events.jinja b/ofu_app/templates/events/all_events.jinja new file mode 100644 index 0000000..6c1d3a6 --- /dev/null +++ b/ofu_app/templates/events/all_events.jinja @@ -0,0 +1,22 @@ +{% extends 'base.jinja' %} +{% block headline %} +

Alle Events an der OFU

+

{{ startdate }} bis {{ enddate }}

+{% endblock %} +{% block content %} +
+
+ {% for event in events %} +
+
+

{{ event.title }}

+

Wann: {{ event.date|date:"D, d.M" }} ab {{ event.time }}

+

Wo: {{ event.location }}

+ Details +

Kategorie: {{ event.category }}

+
+
+ {% endfor %} +
+
+{% endblock %} \ No newline at end of file diff --git a/ofu_app/templates/events/events.jinja b/ofu_app/templates/events/events.jinja new file mode 100644 index 0000000..6a5d50f --- /dev/null +++ b/ofu_app/templates/events/events.jinja @@ -0,0 +1,29 @@ +{% extends 'base.jinja' %} +{% block headline %} +

Events in Bamberg

+{% endblock %} +{% block content %} +
+
+
+
+
+

Events for a Week

+

Übersicht über alle Events an der Uni und Veranstaltungen der HSnGs

+ Zur Gesamtübersicht +
+
+
+
+
+
+

Events for a Week

+

Übersicht über alle Events an der Uni und Veranstaltungen der HSnGs in der + zukünftigen Woche.

+ Zur Wochenübersicht +
+
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/ofu_app/templates/events/week_events.jinja b/ofu_app/templates/events/week_events.jinja index 8e10882..9df687c 100644 --- a/ofu_app/templates/events/week_events.jinja +++ b/ofu_app/templates/events/week_events.jinja @@ -7,12 +7,14 @@
{% for event in events %} -
-

{{ event.title }}

-

Wann: {{ event.date|date:"M Y" }} ab {{ event.time }}

-

Wo: {{ event.location }}

- Details -

Kategorie: {{ event.category }}

+
+
+

{{ event.title }}

+

Wann: {{ event.date|date:"D, d.M" }} ab {{ event.time }}

+

Wo: {{ event.location }}

+ Details +

Kategorie: {{ event.category }}

+
{% endfor %}
diff --git a/ofu_app/templates/food/food_home.jinja b/ofu_app/templates/food/food_home.jinja new file mode 100644 index 0000000..8dd6409 --- /dev/null +++ b/ofu_app/templates/food/food_home.jinja @@ -0,0 +1,41 @@ +{% extends 'base.jinja' %} +{% block headline %} +

Übersicht Food

+{% endblock %} +{% block content %} +
+
+
+
+
+

Daily

+

Übersicht über Essensmöglichkeiten des aktuellen Tages.

+ Zur Daily Page +
+
+
+
+
+
+

Weekly

+

Übersicht über Essensmöglichkeiten der aktuellen Woche.

+ Zur Weekly Page +
+
+
+ +
+
+
+
+
+

All

+

Übersicht über alle zukünftigen Essensmöglichkeiten an der Universität + Bamberg.

+ Zur All Page +
+
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/ofu_app/templates/home.jinja b/ofu_app/templates/home.jinja new file mode 100644 index 0000000..b84b404 --- /dev/null +++ b/ofu_app/templates/home.jinja @@ -0,0 +1,28 @@ +{% extends 'base.jinja' %} +{% block headline %} +

App für die Uni Bamberg

+{% endblock %} +{% block content %} +
+
+
+
+
+

Food

+

Übersicht über Essensmöglichkeiten für Studenten in der Stadt Bamberg

+ Zur Mainpage +
+
+
+
+
+
+

Events

+

Übersicht über alle Events an der Universität Bambergs und Veranstaltungen der HSnGs.

+ Zur Mainpage +
+
+
+
+
+{% endblock %} \ No newline at end of file