From f159a56307361e5b9ddbfe73740b32344cf89d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20G=C3=B6tz?= Date: Mon, 2 Oct 2017 23:27:29 +0200 Subject: [PATCH 1/3] =?UTF-8?q?'README.md'=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) 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 From d21bc402ad123edfaac5821d05195abc4754ae55 Mon Sep 17 00:00:00 2001 From: michigg Date: Tue, 3 Oct 2017 00:34:02 +0200 Subject: [PATCH 2/3] fix locale bug --- .../apps/events/utils/json_generator/jsons/events-fekide.json | 2 +- ofu_app/apps/events/utils/parser/fekide_eventpage_parser.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) 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 index ed7fa68..681c3ba 100644 --- a/ofu_app/apps/events/utils/json_generator/jsons/events-fekide.json +++ b/ofu_app/apps/events/utils/json_generator/jsons/events-fekide.json @@ -1 +1 @@ -{"dates": [{"date": "04.10.2017", "events": [{"location": "Marcus-Haus (M3) HuWi", "time": "Ab 09:00 Uhr", "title": "Kompetenztraining: Visualisieren/Pr\u00e4sentieren Berufliches", "link": "https://www.feki.de/terminkalender/termin/3226", "category": " Berufliches"}, {"location": "Sound'n Arts", "time": "Ab 22:00 Uhr", "title": "!! AB DURCH DIE MITTE mit HOWIE MAUI & DJ GRAMOE !! Party", "link": "https://www.feki.de/terminkalender/termin/3567", "category": " Party"}]}, {"date": "06.10.2017", "events": [{"location": "Live-Club", "time": "Ab 22:00 Uhr", "title": "Greenclub - Die Rap-Party der Stadt! Party", "link": "https://www.feki.de/terminkalender/termin/3528", "category": " Party"}]}, {"date": "07.10.2017", "events": [{"location": "Sound'n Arts", "time": "Ab 21:00 Uhr", "title": "The Apemen (Mod-Beat/Sixties-Garage) & The Quires Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3545", "category": " Kultur & Live Acts"}]}, {"date": "09.10.2017", "events": [{"location": "Marcus-Haus (M3) HuWi", "time": "Ab 09:00 Uhr", "title": "Kompetenztraining: Aktivierende Methoden Berufliches", "link": "https://www.feki.de/terminkalender/termin/3218", "category": " Berufliches"}, {"location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 16:00 Uhr", "title": "Steuertipps f\u00fcr Studierende Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3558", "category": " Sonstiges"}]}, {"date": "10.10.2017", "events": [{"location": "Alte Seilerei", "time": "Ab 19:30 Uhr", "title": "William Shakespeares Star Wars Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3537", "category": " Kultur & Live Acts"}, {"location": "Aposto", "time": "Ab 20:00 Uhr", "title": "Erstsemesterstammtisch (1) Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3549", "category": " Sonstiges"}]}, {"date": "11.10.2017", "events": [{"location": "Alte Seilerei", "time": "Ab 19:30 Uhr", "title": "William Shakespeares Star Wars Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3538", "category": " Kultur & Live Acts"}, {"location": "JuZ Margaretendamm", "time": "Ab 20:00 Uhr", "title": "Erstis Kneipentour Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3531", "category": " Sonstiges"}, {"location": "Rotenschild", "time": "Ab 20:00 Uhr", "title": "Soziologiestammtisch bei den EETS Party", "link": "https://www.feki.de/terminkalender/termin/3557", "category": " Party"}]}, {"date": "13.10.2017", "events": [{"location": "Sound'n Arts", "time": "Ab 22:00 Uhr", "title": "Rauschkollektiv \u2013 Goldener Technooktober Party", "link": "https://www.feki.de/terminkalender/termin/3536", "category": " Party"}]}, {"date": "14.10.2017", "events": [{"location": "JuZ Margaretendamm", "time": "Ab 12:00 Uhr", "title": "Wokshops: Hip-Hop Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3535", "category": " Kultur & Live Acts"}, {"location": "KickerBox", "time": "Ab 14:00 Uhr", "title": "Kickerturnier Sport", "link": "https://www.feki.de/terminkalender/termin/3522", "category": " Sport"}, {"location": "JuZ Margaretendamm", "time": "Ab 18:30 Uhr", "title": "Bleib auf dem Teppich 2 - Open Mic & Konzerte (Hip-Hop) Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3534", "category": " Kultur & Live Acts"}]}, {"date": "16.10.2017", "events": [{"location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 16:00 Uhr", "title": "Assessment Center Training - Die wichtigsten \u00dcbungen, die besten L\u00f6sungen Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3562", "category": " Sonstiges"}]}, {"date": "17.10.2017", "events": [{"location": "Rotenschild", "time": "Ab 20:00 Uhr", "title": "Erstsemesterstammtisch (2) Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3546", "category": " Sonstiges"}]}, {"date": "18.10.2017", "events": [{"location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 16:00 Uhr", "title": "Steuertipps f\u00fcr Studierende Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3559", "category": " Sonstiges"}, {"location": "Feldkirchenstra\u00dfe (F21) SoWi", "time": "Ab 20:15 Uhr", "title": "Feki.de Infoabend (Feki) Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3541", "category": " Sonstiges"}]}, {"date": "19.10.2017", "events": [{"location": "Catwheezles' Castle", "time": "Ab 20:00 Uhr", "title": "Erstsemesterstammtisch (3) Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3547", "category": " Sonstiges"}]}, {"date": "21.10.2017", "events": [{"location": "JuZ Margaretendamm", "time": "Ab 19:00 Uhr", "title": "Konzert: Somnium Captare, Varus, Carnage Calligraphy, Eroded Ashes (Metal) Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3533", "category": " Kultur & Live Acts"}, {"location": "Parkhaus Zentrum S\u00fcd", "time": "Ab 19:30 Uhr", "title": "junk space Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3413", "category": " Kultur & Live Acts"}]}, {"date": "23.10.2017", "events": [{"location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni", "link": "https://www.feki.de/terminkalender/termin/3551", "category": " Uni"}, {"location": "Villa Concordia", "time": "Ab 19:00 Uhr", "title": "Okka-Esther Hungerb\u00fchler: Das Duell - Vernissage Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3478", "category": " Kultur & Live Acts"}, {"location": "An der Universit\u00e4t 5 (U5) GuK", "time": "Ab 20:15 Uhr", "title": "Feki.de Infoabend (Innenstadt) Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3543", "category": " Sonstiges"}]}, {"date": "24.10.2017", "events": [{"location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 15:00 Uhr", "title": "Professionelles Bewerben - Tods\u00fcnden und Tugenden Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3563", "category": " Sonstiges"}, {"location": "E.T.A.-Hoffmann-Theater", "time": "Ab 19:00 Uhr", "title": "Villa Wild # 5: Von den Maschinen Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3479", "category": " Kultur & Live Acts"}, {"location": "Freiraum", "time": "Ab 20:00 Uhr", "title": "Viva con Agua Bamberg Treffen im Oktober Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3550", "category": " Sonstiges"}]}, {"date": "25.10.2017", "events": [{"location": "Feldkirchenstra\u00dfe (F21) SoWi", "time": "Ab 20:00 Uhr", "title": "Informationsabend des Akademischen Auslandsamtes zum Auslandsstudium Uni", "link": "https://www.feki.de/terminkalender/termin/3305", "category": " Uni"}]}, {"date": "26.10.2017", "events": [{"location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 16:00 Uhr", "title": "Abenteuer Referendariat Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3564", "category": " Sonstiges"}, {"location": "Parkhaus Zentrum S\u00fcd", "time": "Ab 19:30 Uhr", "title": "junk space Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3414", "category": " Kultur & Live Acts"}, {"location": "Freiraum", "time": "Ab 21:00 Uhr", "title": "Erstsemesterstammtisch (4) Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3548", "category": " Sonstiges"}]}, {"date": "27.10.2017", "events": [{"location": "JuZ Margaretendamm", "time": "Ab 19:00 Uhr", "title": "Vorentscheid Rock in Oberfranken 2018 Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3532", "category": " Kultur & Live Acts"}]}, {"date": "28.10.2017", "events": [{"location": "Parkhaus Zentrum S\u00fcd", "time": "Ab 19:30 Uhr", "title": "junk space Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3415", "category": " Kultur & Live Acts"}]}, {"date": "30.10.2017", "events": [{"location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 15:00 Uhr", "title": "Steuertipps f\u00fcr Studierende Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3560", "category": " Sonstiges"}]}, {"date": "02.11.2017", "events": [{"location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 17:00 Uhr", "title": "Gehaltsverhandlung f\u00fcr Absolventen Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3565", "category": " Sonstiges"}]}, {"date": "03.11.2017", "events": [{"location": "Bamberg", "time": "Ab 14:00 Uhr", "title": "Feki.de Flohmarkt Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3481", "category": " Sonstiges"}]}, {"date": "08.11.2017", "events": [{"location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 16:00 Uhr", "title": "Steuertipps f\u00fcr Studierende Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3561", "category": " Sonstiges"}]}, {"date": "09.11.2017", "events": [{"location": "MLP Gesch\u00e4ftsstelle", "time": "Ab 15:00 Uhr", "title": "Soft Skill Training Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3566", "category": " Sonstiges"}, {"location": "Markusstra\u00dfe 8a (MG1/MG2)", "time": "Ab 18:00 Uhr", "title": "Forum Mathematik-Didaktik Uni", "link": "https://www.feki.de/terminkalender/termin/3483", "category": " Uni"}]}, {"date": "20.11.2017", "events": [{"location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni", "link": "https://www.feki.de/terminkalender/termin/3552", "category": " Uni"}]}, {"date": "21.11.2017", "events": [{"location": "Messezentrum Augsburg", "time": "Ab 10:00 Uhr", "title": "akademika augsburg 2017 Berufliches", "link": "https://www.feki.de/terminkalender/termin/3438", "category": " Berufliches"}]}, {"date": "22.11.2017", "events": [{"location": "Messezentrum Augsburg", "time": "Ab 10:00 Uhr", "title": "akademika augsburg 2017 Berufliches", "link": "https://www.feki.de/terminkalender/termin/3439", "category": " Berufliches"}]}, {"date": "04.12.2017", "events": [{"location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni", "link": "https://www.feki.de/terminkalender/termin/3553", "category": " Uni"}]}, {"date": "07.12.2017", "events": [{"location": "Markusstra\u00dfe 8a (MG1/MG2)", "time": "Ab 18:00 Uhr", "title": "Forum Mathematik-Didaktik Uni", "link": "https://www.feki.de/terminkalender/termin/3482", "category": " Uni"}]}, {"date": "15.01.2017", "events": [{"location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni", "link": "https://www.feki.de/terminkalender/termin/3554", "category": " Uni"}]}, {"date": "22.01.2017", "events": [{"location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni", "link": "https://www.feki.de/terminkalender/termin/3555", "category": " Uni"}]}, {"date": "29.01.2017", "events": [{"location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Uni", "link": "https://www.feki.de/terminkalender/termin/3556", "category": " Uni"}]}]} \ No newline at end of file +{"dates": [{"date": "04.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3226", "location": "Marcus-Haus (M3) HuWi", "category": " Berufliches", "time": "Ab 09:00 Uhr", "title": "Kompetenztraining: Visualisieren/Pr\u00e4sentieren Berufliches"}, {"link": "https://www.feki.de/terminkalender/termin/3567", "location": "Sound'n Arts", "category": " Party", "time": "Ab 22:00 Uhr", "title": "!! AB DURCH DIE MITTE mit HOWIE MAUI & DJ GRAMOE !! Party"}]}, {"date": "06.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3528", "location": "Live-Club", "category": " Party", "time": "Ab 22:00 Uhr", "title": "Greenclub - Die Rap-Party der Stadt! Party"}]}, {"date": "07.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3545", "location": "Sound'n Arts", "category": " Kultur & Live Acts", "time": "Ab 21:00 Uhr", "title": "The Apemen (Mod-Beat/Sixties-Garage) & The Quires Kultur & Live Acts"}]}, {"date": "09.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3218", "location": "Marcus-Haus (M3) HuWi", "category": " Berufliches", "time": "Ab 09:00 Uhr", "title": "Kompetenztraining: Aktivierende Methoden Berufliches"}, {"link": "https://www.feki.de/terminkalender/termin/3558", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 16:00 Uhr", "title": "Steuertipps f\u00fcr Studierende Sonstiges"}]}, {"date": "10.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3537", "location": "Alte Seilerei", "category": " Kultur & Live Acts", "time": "Ab 19:30 Uhr", "title": "William Shakespeares Star Wars Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3549", "location": "Aposto", "category": " Sonstiges", "time": "Ab 20:00 Uhr", "title": "Erstsemesterstammtisch (1) Sonstiges"}]}, {"date": "11.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3538", "location": "Alte Seilerei", "category": " Kultur & Live Acts", "time": "Ab 19:30 Uhr", "title": "William Shakespeares Star Wars Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3531", "location": "JuZ Margaretendamm", "category": " Sonstiges", "time": "Ab 20:00 Uhr", "title": "Erstis Kneipentour Sonstiges"}, {"link": "https://www.feki.de/terminkalender/termin/3557", "location": "Rotenschild", "category": " Party", "time": "Ab 20:00 Uhr", "title": "Soziologiestammtisch bei den EETS Party"}]}, {"date": "13.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3536", "location": "Sound'n Arts", "category": " Party", "time": "Ab 22:00 Uhr", "title": "Rauschkollektiv \u2013 Goldener Technooktober Party"}]}, {"date": "14.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3535", "location": "JuZ Margaretendamm", "category": " Kultur & Live Acts", "time": "Ab 12:00 Uhr", "title": "Wokshops: Hip-Hop Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3522", "location": "KickerBox", "category": " Sport", "time": "Ab 14:00 Uhr", "title": "Kickerturnier Sport"}, {"link": "https://www.feki.de/terminkalender/termin/3534", "location": "JuZ Margaretendamm", "category": " Kultur & Live Acts", "time": "Ab 18:30 Uhr", "title": "Bleib auf dem Teppich 2 - Open Mic & Konzerte (Hip-Hop) Kultur & Live Acts"}]}, {"date": "16.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3562", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 16:00 Uhr", "title": "Assessment Center Training - Die wichtigsten \u00dcbungen, die besten L\u00f6sungen Sonstiges"}]}, {"date": "17.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3546", "location": "Rotenschild", "category": " Sonstiges", "time": "Ab 20:00 Uhr", "title": "Erstsemesterstammtisch (2) Sonstiges"}]}, {"date": "18.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3559", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 16:00 Uhr", "title": "Steuertipps f\u00fcr Studierende Sonstiges"}, {"link": "https://www.feki.de/terminkalender/termin/3541", "location": "Feldkirchenstra\u00dfe (F21) SoWi", "category": " Sonstiges", "time": "Ab 20:15 Uhr", "title": "Feki.de Infoabend (Feki) Sonstiges"}]}, {"date": "19.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3547", "location": "Catwheezles' Castle", "category": " Sonstiges", "time": "Ab 20:00 Uhr", "title": "Erstsemesterstammtisch (3) Sonstiges"}]}, {"date": "21.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3533", "location": "JuZ Margaretendamm", "category": " Kultur & Live Acts", "time": "Ab 19:00 Uhr", "title": "Konzert: Somnium Captare, Varus, Carnage Calligraphy, Eroded Ashes (Metal) Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3413", "location": "Parkhaus Zentrum S\u00fcd", "category": " Kultur & Live Acts", "time": "Ab 19:30 Uhr", "title": "junk space Kultur & Live Acts"}]}, {"date": "23.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3551", "location": "Marcus-Haus (M3) HuWi", "category": " Uni", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni"}, {"link": "https://www.feki.de/terminkalender/termin/3478", "location": "Villa Concordia", "category": " Kultur & Live Acts", "time": "Ab 19:00 Uhr", "title": "Okka-Esther Hungerb\u00fchler: Das Duell - Vernissage Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3543", "location": "An der Universit\u00e4t 5 (U5) GuK", "category": " Sonstiges", "time": "Ab 20:15 Uhr", "title": "Feki.de Infoabend (Innenstadt) Sonstiges"}]}, {"date": "24.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3563", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 15:00 Uhr", "title": "Professionelles Bewerben - Tods\u00fcnden und Tugenden Sonstiges"}, {"link": "https://www.feki.de/terminkalender/termin/3479", "location": "E.T.A.-Hoffmann-Theater", "category": " Kultur & Live Acts", "time": "Ab 19:00 Uhr", "title": "Villa Wild # 5: Von den Maschinen Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3550", "location": "Freiraum", "category": " Sonstiges", "time": "Ab 20:00 Uhr", "title": "Viva con Agua Bamberg Treffen im Oktober Sonstiges"}]}, {"date": "25.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3305", "location": "Feldkirchenstra\u00dfe (F21) SoWi", "category": " Uni", "time": "Ab 20:00 Uhr", "title": "Informationsabend des Akademischen Auslandsamtes zum Auslandsstudium Uni"}]}, {"date": "26.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3564", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 16:00 Uhr", "title": "Abenteuer Referendariat Sonstiges"}, {"link": "https://www.feki.de/terminkalender/termin/3414", "location": "Parkhaus Zentrum S\u00fcd", "category": " Kultur & Live Acts", "time": "Ab 19:30 Uhr", "title": "junk space Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3548", "location": "Freiraum", "category": " Sonstiges", "time": "Ab 21:00 Uhr", "title": "Erstsemesterstammtisch (4) Sonstiges"}]}, {"date": "27.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3532", "location": "JuZ Margaretendamm", "category": " Kultur & Live Acts", "time": "Ab 19:00 Uhr", "title": "Vorentscheid Rock in Oberfranken 2018 Kultur & Live Acts"}]}, {"date": "28.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3415", "location": "Parkhaus Zentrum S\u00fcd", "category": " Kultur & Live Acts", "time": "Ab 19:30 Uhr", "title": "junk space Kultur & Live Acts"}]}, {"date": "30.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3560", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 15:00 Uhr", "title": "Steuertipps f\u00fcr Studierende Sonstiges"}]}, {"date": "02.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3565", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 17:00 Uhr", "title": "Gehaltsverhandlung f\u00fcr Absolventen Sonstiges"}]}, {"date": "03.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3481", "location": "Bamberg", "category": " Sonstiges", "time": "Ab 14:00 Uhr", "title": "Feki.de Flohmarkt Sonstiges"}]}, {"date": "08.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3561", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 16:00 Uhr", "title": "Steuertipps f\u00fcr Studierende Sonstiges"}]}, {"date": "09.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3566", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 15:00 Uhr", "title": "Soft Skill Training Sonstiges"}, {"link": "https://www.feki.de/terminkalender/termin/3483", "location": "Markusstra\u00dfe 8a (MG1/MG2)", "category": " Uni", "time": "Ab 18:00 Uhr", "title": "Forum Mathematik-Didaktik Uni"}]}, {"date": "20.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3552", "location": "Marcus-Haus (M3) HuWi", "category": " Uni", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni"}]}, {"date": "21.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3438", "location": "Messezentrum Augsburg", "category": " Berufliches", "time": "Ab 10:00 Uhr", "title": "akademika augsburg 2017 Berufliches"}]}, {"date": "22.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3439", "location": "Messezentrum Augsburg", "category": " Berufliches", "time": "Ab 10:00 Uhr", "title": "akademika augsburg 2017 Berufliches"}]}, {"date": "04.12.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3553", "location": "Marcus-Haus (M3) HuWi", "category": " Uni", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni"}]}, {"date": "07.12.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3482", "location": "Markusstra\u00dfe 8a (MG1/MG2)", "category": " Uni", "time": "Ab 18:00 Uhr", "title": "Forum Mathematik-Didaktik Uni"}]}, {"date": "15.01.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3554", "location": "Marcus-Haus (M3) HuWi", "category": " Uni", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni"}]}, {"date": "22.01.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3555", "location": "Marcus-Haus (M3) HuWi", "category": " Uni", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni"}]}, {"date": "29.01.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3556", "location": "Marcus-Haus (M3) HuWi", "category": " Uni", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Uni"}]}]} \ 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 3a5c727..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,13 +6,11 @@ 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" -locale.setlocale(locale.LC_TIME, '') +locale.setlocale(locale.LC_TIME, 'de_DE.utf-8') def loadPage(url: str): From 6d912c8a25467b7aa65015a838c25323fd54d3fe Mon Sep 17 00:00:00 2001 From: michigg Date: Tue, 3 Oct 2017 02:13:55 +0200 Subject: [PATCH 3/3] update ui --- ofu_app/apps/events/urls.py | 4 +- .../json_generator/jsons/events-fekide.json | 2 +- ofu_app/apps/events/views.py | 15 +++++++ .../__pycache__/0001_initial.cpython-35.pyc | Bin 1449 -> 1449 bytes .../__pycache__/__init__.cpython-35.pyc | Bin 159 -> 159 bytes ofu_app/apps/food/urls.py | 4 +- .../json_generator/jsons/cafete-erba.json | 2 +- .../json_generator/jsons/cafete-markus.json | 2 +- .../jsons/happyhourguide-fekide.json | 2 +- .../json_generator/jsons/mensa-austr.json | 2 +- .../json_generator/jsons/mensa-feki.json | 2 +- ofu_app/apps/food/views.py | 38 +++++++++++++++- .../__pycache__/settings.cpython-35.pyc | Bin 2873 -> 2873 bytes .../ofu_app/__pycache__/urls.cpython-35.pyc | Bin 1066 -> 1151 bytes ofu_app/ofu_app/urls.py | 2 + ofu_app/ofu_app/views.py | 9 ++++ ofu_app/templates/events/all_events.jinja | 22 ++++++++++ ofu_app/templates/events/events.jinja | 29 +++++++++++++ ofu_app/templates/events/week_events.jinja | 14 +++--- ofu_app/templates/food/food_home.jinja | 41 ++++++++++++++++++ ofu_app/templates/home.jinja | 28 ++++++++++++ 21 files changed, 203 insertions(+), 15 deletions(-) create mode 100644 ofu_app/ofu_app/views.py create mode 100644 ofu_app/templates/events/all_events.jinja create mode 100644 ofu_app/templates/events/events.jinja create mode 100644 ofu_app/templates/food/food_home.jinja create mode 100644 ofu_app/templates/home.jinja 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 index 681c3ba..fa3afdf 100644 --- a/ofu_app/apps/events/utils/json_generator/jsons/events-fekide.json +++ b/ofu_app/apps/events/utils/json_generator/jsons/events-fekide.json @@ -1 +1 @@ -{"dates": [{"date": "04.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3226", "location": "Marcus-Haus (M3) HuWi", "category": " Berufliches", "time": "Ab 09:00 Uhr", "title": "Kompetenztraining: Visualisieren/Pr\u00e4sentieren Berufliches"}, {"link": "https://www.feki.de/terminkalender/termin/3567", "location": "Sound'n Arts", "category": " Party", "time": "Ab 22:00 Uhr", "title": "!! AB DURCH DIE MITTE mit HOWIE MAUI & DJ GRAMOE !! Party"}]}, {"date": "06.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3528", "location": "Live-Club", "category": " Party", "time": "Ab 22:00 Uhr", "title": "Greenclub - Die Rap-Party der Stadt! Party"}]}, {"date": "07.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3545", "location": "Sound'n Arts", "category": " Kultur & Live Acts", "time": "Ab 21:00 Uhr", "title": "The Apemen (Mod-Beat/Sixties-Garage) & The Quires Kultur & Live Acts"}]}, {"date": "09.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3218", "location": "Marcus-Haus (M3) HuWi", "category": " Berufliches", "time": "Ab 09:00 Uhr", "title": "Kompetenztraining: Aktivierende Methoden Berufliches"}, {"link": "https://www.feki.de/terminkalender/termin/3558", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 16:00 Uhr", "title": "Steuertipps f\u00fcr Studierende Sonstiges"}]}, {"date": "10.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3537", "location": "Alte Seilerei", "category": " Kultur & Live Acts", "time": "Ab 19:30 Uhr", "title": "William Shakespeares Star Wars Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3549", "location": "Aposto", "category": " Sonstiges", "time": "Ab 20:00 Uhr", "title": "Erstsemesterstammtisch (1) Sonstiges"}]}, {"date": "11.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3538", "location": "Alte Seilerei", "category": " Kultur & Live Acts", "time": "Ab 19:30 Uhr", "title": "William Shakespeares Star Wars Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3531", "location": "JuZ Margaretendamm", "category": " Sonstiges", "time": "Ab 20:00 Uhr", "title": "Erstis Kneipentour Sonstiges"}, {"link": "https://www.feki.de/terminkalender/termin/3557", "location": "Rotenschild", "category": " Party", "time": "Ab 20:00 Uhr", "title": "Soziologiestammtisch bei den EETS Party"}]}, {"date": "13.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3536", "location": "Sound'n Arts", "category": " Party", "time": "Ab 22:00 Uhr", "title": "Rauschkollektiv \u2013 Goldener Technooktober Party"}]}, {"date": "14.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3535", "location": "JuZ Margaretendamm", "category": " Kultur & Live Acts", "time": "Ab 12:00 Uhr", "title": "Wokshops: Hip-Hop Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3522", "location": "KickerBox", "category": " Sport", "time": "Ab 14:00 Uhr", "title": "Kickerturnier Sport"}, {"link": "https://www.feki.de/terminkalender/termin/3534", "location": "JuZ Margaretendamm", "category": " Kultur & Live Acts", "time": "Ab 18:30 Uhr", "title": "Bleib auf dem Teppich 2 - Open Mic & Konzerte (Hip-Hop) Kultur & Live Acts"}]}, {"date": "16.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3562", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 16:00 Uhr", "title": "Assessment Center Training - Die wichtigsten \u00dcbungen, die besten L\u00f6sungen Sonstiges"}]}, {"date": "17.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3546", "location": "Rotenschild", "category": " Sonstiges", "time": "Ab 20:00 Uhr", "title": "Erstsemesterstammtisch (2) Sonstiges"}]}, {"date": "18.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3559", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 16:00 Uhr", "title": "Steuertipps f\u00fcr Studierende Sonstiges"}, {"link": "https://www.feki.de/terminkalender/termin/3541", "location": "Feldkirchenstra\u00dfe (F21) SoWi", "category": " Sonstiges", "time": "Ab 20:15 Uhr", "title": "Feki.de Infoabend (Feki) Sonstiges"}]}, {"date": "19.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3547", "location": "Catwheezles' Castle", "category": " Sonstiges", "time": "Ab 20:00 Uhr", "title": "Erstsemesterstammtisch (3) Sonstiges"}]}, {"date": "21.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3533", "location": "JuZ Margaretendamm", "category": " Kultur & Live Acts", "time": "Ab 19:00 Uhr", "title": "Konzert: Somnium Captare, Varus, Carnage Calligraphy, Eroded Ashes (Metal) Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3413", "location": "Parkhaus Zentrum S\u00fcd", "category": " Kultur & Live Acts", "time": "Ab 19:30 Uhr", "title": "junk space Kultur & Live Acts"}]}, {"date": "23.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3551", "location": "Marcus-Haus (M3) HuWi", "category": " Uni", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni"}, {"link": "https://www.feki.de/terminkalender/termin/3478", "location": "Villa Concordia", "category": " Kultur & Live Acts", "time": "Ab 19:00 Uhr", "title": "Okka-Esther Hungerb\u00fchler: Das Duell - Vernissage Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3543", "location": "An der Universit\u00e4t 5 (U5) GuK", "category": " Sonstiges", "time": "Ab 20:15 Uhr", "title": "Feki.de Infoabend (Innenstadt) Sonstiges"}]}, {"date": "24.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3563", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 15:00 Uhr", "title": "Professionelles Bewerben - Tods\u00fcnden und Tugenden Sonstiges"}, {"link": "https://www.feki.de/terminkalender/termin/3479", "location": "E.T.A.-Hoffmann-Theater", "category": " Kultur & Live Acts", "time": "Ab 19:00 Uhr", "title": "Villa Wild # 5: Von den Maschinen Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3550", "location": "Freiraum", "category": " Sonstiges", "time": "Ab 20:00 Uhr", "title": "Viva con Agua Bamberg Treffen im Oktober Sonstiges"}]}, {"date": "25.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3305", "location": "Feldkirchenstra\u00dfe (F21) SoWi", "category": " Uni", "time": "Ab 20:00 Uhr", "title": "Informationsabend des Akademischen Auslandsamtes zum Auslandsstudium Uni"}]}, {"date": "26.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3564", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 16:00 Uhr", "title": "Abenteuer Referendariat Sonstiges"}, {"link": "https://www.feki.de/terminkalender/termin/3414", "location": "Parkhaus Zentrum S\u00fcd", "category": " Kultur & Live Acts", "time": "Ab 19:30 Uhr", "title": "junk space Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3548", "location": "Freiraum", "category": " Sonstiges", "time": "Ab 21:00 Uhr", "title": "Erstsemesterstammtisch (4) Sonstiges"}]}, {"date": "27.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3532", "location": "JuZ Margaretendamm", "category": " Kultur & Live Acts", "time": "Ab 19:00 Uhr", "title": "Vorentscheid Rock in Oberfranken 2018 Kultur & Live Acts"}]}, {"date": "28.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3415", "location": "Parkhaus Zentrum S\u00fcd", "category": " Kultur & Live Acts", "time": "Ab 19:30 Uhr", "title": "junk space Kultur & Live Acts"}]}, {"date": "30.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3560", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 15:00 Uhr", "title": "Steuertipps f\u00fcr Studierende Sonstiges"}]}, {"date": "02.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3565", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 17:00 Uhr", "title": "Gehaltsverhandlung f\u00fcr Absolventen Sonstiges"}]}, {"date": "03.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3481", "location": "Bamberg", "category": " Sonstiges", "time": "Ab 14:00 Uhr", "title": "Feki.de Flohmarkt Sonstiges"}]}, {"date": "08.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3561", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 16:00 Uhr", "title": "Steuertipps f\u00fcr Studierende Sonstiges"}]}, {"date": "09.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3566", "location": "MLP Gesch\u00e4ftsstelle", "category": " Sonstiges", "time": "Ab 15:00 Uhr", "title": "Soft Skill Training Sonstiges"}, {"link": "https://www.feki.de/terminkalender/termin/3483", "location": "Markusstra\u00dfe 8a (MG1/MG2)", "category": " Uni", "time": "Ab 18:00 Uhr", "title": "Forum Mathematik-Didaktik Uni"}]}, {"date": "20.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3552", "location": "Marcus-Haus (M3) HuWi", "category": " Uni", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni"}]}, {"date": "21.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3438", "location": "Messezentrum Augsburg", "category": " Berufliches", "time": "Ab 10:00 Uhr", "title": "akademika augsburg 2017 Berufliches"}]}, {"date": "22.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3439", "location": "Messezentrum Augsburg", "category": " Berufliches", "time": "Ab 10:00 Uhr", "title": "akademika augsburg 2017 Berufliches"}]}, {"date": "04.12.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3553", "location": "Marcus-Haus (M3) HuWi", "category": " Uni", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni"}]}, {"date": "07.12.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3482", "location": "Markusstra\u00dfe 8a (MG1/MG2)", "category": " Uni", "time": "Ab 18:00 Uhr", "title": "Forum Mathematik-Didaktik Uni"}]}, {"date": "15.01.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3554", "location": "Marcus-Haus (M3) HuWi", "category": " Uni", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni"}]}, {"date": "22.01.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3555", "location": "Marcus-Haus (M3) HuWi", "category": " Uni", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni"}]}, {"date": "29.01.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3556", "location": "Marcus-Haus (M3) HuWi", "category": " Uni", "time": "Ab 18:15 Uhr", "title": "Institutskolloquium Uni"}]}]} \ No newline at end of file +{"dates": [{"date": "04.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3226", "time": "Ab 09:00 Uhr", "location": "Marcus-Haus (M3) HuWi", "title": "Kompetenztraining: Visualisieren/Pr\u00e4sentieren Berufliches", "category": " Berufliches"}, {"link": "https://www.feki.de/terminkalender/termin/3567", "time": "Ab 22:00 Uhr", "location": "Sound'n Arts", "title": "!! AB DURCH DIE MITTE mit HOWIE MAUI & DJ GRAMOE !! Party", "category": " Party"}]}, {"date": "06.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3528", "time": "Ab 22:00 Uhr", "location": "Live-Club", "title": "Greenclub - Die Rap-Party der Stadt! Party", "category": " Party"}]}, {"date": "07.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3545", "time": "Ab 21:00 Uhr", "location": "Sound'n Arts", "title": "The Apemen (Mod-Beat/Sixties-Garage) & The Quires Kultur & Live Acts", "category": " Kultur & Live Acts"}]}, {"date": "09.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3218", "time": "Ab 09:00 Uhr", "location": "Marcus-Haus (M3) HuWi", "title": "Kompetenztraining: Aktivierende Methoden Berufliches", "category": " Berufliches"}, {"link": "https://www.feki.de/terminkalender/termin/3558", "time": "Ab 16:00 Uhr", "location": "MLP Gesch\u00e4ftsstelle", "title": "Steuertipps f\u00fcr Studierende Sonstiges", "category": " Sonstiges"}]}, {"date": "10.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3537", "time": "Ab 19:30 Uhr", "location": "Alte Seilerei", "title": "William Shakespeares Star Wars Kultur & Live Acts", "category": " Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3549", "time": "Ab 20:00 Uhr", "location": "Aposto", "title": "Erstsemesterstammtisch (1) Sonstiges", "category": " Sonstiges"}]}, {"date": "11.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3538", "time": "Ab 19:30 Uhr", "location": "Alte Seilerei", "title": "William Shakespeares Star Wars Kultur & Live Acts", "category": " Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3531", "time": "Ab 20:00 Uhr", "location": "JuZ Margaretendamm", "title": "Erstis Kneipentour Sonstiges", "category": " Sonstiges"}, {"link": "https://www.feki.de/terminkalender/termin/3557", "time": "Ab 20:00 Uhr", "location": "Rotenschild", "title": "Soziologiestammtisch bei den EETS Party", "category": " Party"}]}, {"date": "13.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3536", "time": "Ab 22:00 Uhr", "location": "Sound'n Arts", "title": "Rauschkollektiv \u2013 Goldener Technooktober Party", "category": " Party"}]}, {"date": "14.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3535", "time": "Ab 12:00 Uhr", "location": "JuZ Margaretendamm", "title": "Wokshops: Hip-Hop Kultur & Live Acts", "category": " Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3522", "time": "Ab 14:00 Uhr", "location": "KickerBox", "title": "Kickerturnier Sport", "category": " Sport"}, {"link": "https://www.feki.de/terminkalender/termin/3534", "time": "Ab 18:30 Uhr", "location": "JuZ Margaretendamm", "title": "Bleib auf dem Teppich 2 - Open Mic & Konzerte (Hip-Hop) Kultur & Live Acts", "category": " Kultur & Live Acts"}]}, {"date": "16.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3562", "time": "Ab 16:00 Uhr", "location": "MLP Gesch\u00e4ftsstelle", "title": "Assessment Center Training - Die wichtigsten \u00dcbungen, die besten L\u00f6sungen Sonstiges", "category": " Sonstiges"}]}, {"date": "17.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3546", "time": "Ab 20:00 Uhr", "location": "Rotenschild", "title": "Erstsemesterstammtisch (2) Sonstiges", "category": " Sonstiges"}]}, {"date": "18.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3559", "time": "Ab 16:00 Uhr", "location": "MLP Gesch\u00e4ftsstelle", "title": "Steuertipps f\u00fcr Studierende Sonstiges", "category": " Sonstiges"}, {"link": "https://www.feki.de/terminkalender/termin/3541", "time": "Ab 20:15 Uhr", "location": "Feldkirchenstra\u00dfe (F21) SoWi", "title": "Feki.de Infoabend (Feki) Sonstiges", "category": " Sonstiges"}]}, {"date": "19.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3547", "time": "Ab 20:00 Uhr", "location": "Catwheezles' Castle", "title": "Erstsemesterstammtisch (3) Sonstiges", "category": " Sonstiges"}]}, {"date": "21.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3533", "time": "Ab 19:00 Uhr", "location": "JuZ Margaretendamm", "title": "Konzert: Somnium Captare, Varus, Carnage Calligraphy, Eroded Ashes (Metal) Kultur & Live Acts", "category": " Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3413", "time": "Ab 19:30 Uhr", "location": "Parkhaus Zentrum S\u00fcd", "title": "junk space Kultur & Live Acts", "category": " Kultur & Live Acts"}]}, {"date": "23.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3551", "time": "Ab 18:15 Uhr", "location": "Marcus-Haus (M3) HuWi", "title": "Institutskolloquium Psychologie Uni", "category": " Uni"}, {"link": "https://www.feki.de/terminkalender/termin/3478", "time": "Ab 19:00 Uhr", "location": "Villa Concordia", "title": "Okka-Esther Hungerb\u00fchler: Das Duell - Vernissage Kultur & Live Acts", "category": " Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3543", "time": "Ab 20:15 Uhr", "location": "An der Universit\u00e4t 5 (U5) GuK", "title": "Feki.de Infoabend (Innenstadt) Sonstiges", "category": " Sonstiges"}]}, {"date": "24.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3563", "time": "Ab 15:00 Uhr", "location": "MLP Gesch\u00e4ftsstelle", "title": "Professionelles Bewerben - Tods\u00fcnden und Tugenden Sonstiges", "category": " Sonstiges"}, {"link": "https://www.feki.de/terminkalender/termin/3479", "time": "Ab 19:00 Uhr", "location": "E.T.A.-Hoffmann-Theater", "title": "Villa Wild # 5: Von den Maschinen Kultur & Live Acts", "category": " Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3550", "time": "Ab 20:00 Uhr", "location": "Freiraum", "title": "Viva con Agua Bamberg Treffen im Oktober Sonstiges", "category": " Sonstiges"}]}, {"date": "25.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3305", "time": "Ab 20:00 Uhr", "location": "Feldkirchenstra\u00dfe (F21) SoWi", "title": "Informationsabend des Akademischen Auslandsamtes zum Auslandsstudium Uni", "category": " Uni"}]}, {"date": "26.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3564", "time": "Ab 16:00 Uhr", "location": "MLP Gesch\u00e4ftsstelle", "title": "Abenteuer Referendariat Sonstiges", "category": " Sonstiges"}, {"link": "https://www.feki.de/terminkalender/termin/3414", "time": "Ab 19:30 Uhr", "location": "Parkhaus Zentrum S\u00fcd", "title": "junk space Kultur & Live Acts", "category": " Kultur & Live Acts"}, {"link": "https://www.feki.de/terminkalender/termin/3548", "time": "Ab 21:00 Uhr", "location": "Freiraum", "title": "Erstsemesterstammtisch (4) Sonstiges", "category": " Sonstiges"}]}, {"date": "27.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3532", "time": "Ab 19:00 Uhr", "location": "JuZ Margaretendamm", "title": "Vorentscheid Rock in Oberfranken 2018 Kultur & Live Acts", "category": " Kultur & Live Acts"}]}, {"date": "28.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3415", "time": "Ab 19:30 Uhr", "location": "Parkhaus Zentrum S\u00fcd", "title": "junk space Kultur & Live Acts", "category": " Kultur & Live Acts"}]}, {"date": "30.10.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3560", "time": "Ab 15:00 Uhr", "location": "MLP Gesch\u00e4ftsstelle", "title": "Steuertipps f\u00fcr Studierende Sonstiges", "category": " Sonstiges"}]}, {"date": "02.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3565", "time": "Ab 17:00 Uhr", "location": "MLP Gesch\u00e4ftsstelle", "title": "Gehaltsverhandlung f\u00fcr Absolventen Sonstiges", "category": " Sonstiges"}]}, {"date": "03.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3481", "time": "Ab 14:00 Uhr", "location": "Bamberg", "title": "Feki.de Flohmarkt Sonstiges", "category": " Sonstiges"}]}, {"date": "08.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3561", "time": "Ab 16:00 Uhr", "location": "MLP Gesch\u00e4ftsstelle", "title": "Steuertipps f\u00fcr Studierende Sonstiges", "category": " Sonstiges"}]}, {"date": "09.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3566", "time": "Ab 15:00 Uhr", "location": "MLP Gesch\u00e4ftsstelle", "title": "Soft Skill Training Sonstiges", "category": " Sonstiges"}, {"link": "https://www.feki.de/terminkalender/termin/3483", "time": "Ab 18:00 Uhr", "location": "Markusstra\u00dfe 8a (MG1/MG2)", "title": "Forum Mathematik-Didaktik Uni", "category": " Uni"}]}, {"date": "20.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3552", "time": "Ab 18:15 Uhr", "location": "Marcus-Haus (M3) HuWi", "title": "Institutskolloquium Psychologie Uni", "category": " Uni"}]}, {"date": "21.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3438", "time": "Ab 10:00 Uhr", "location": "Messezentrum Augsburg", "title": "akademika augsburg 2017 Berufliches", "category": " Berufliches"}]}, {"date": "22.11.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3439", "time": "Ab 10:00 Uhr", "location": "Messezentrum Augsburg", "title": "akademika augsburg 2017 Berufliches", "category": " Berufliches"}]}, {"date": "04.12.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3553", "time": "Ab 18:15 Uhr", "location": "Marcus-Haus (M3) HuWi", "title": "Institutskolloquium Psychologie Uni", "category": " Uni"}]}, {"date": "07.12.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3482", "time": "Ab 18:00 Uhr", "location": "Markusstra\u00dfe 8a (MG1/MG2)", "title": "Forum Mathematik-Didaktik Uni", "category": " Uni"}]}, {"date": "15.01.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3554", "time": "Ab 18:15 Uhr", "location": "Marcus-Haus (M3) HuWi", "title": "Institutskolloquium Psychologie Uni", "category": " Uni"}]}, {"date": "22.01.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3555", "time": "Ab 18:15 Uhr", "location": "Marcus-Haus (M3) HuWi", "title": "Institutskolloquium Psychologie Uni", "category": " Uni"}]}, {"date": "29.01.2017", "events": [{"link": "https://www.feki.de/terminkalender/termin/3556", "time": "Ab 18:15 Uhr", "location": "Marcus-Haus (M3) HuWi", "title": "Institutskolloquium Uni", "category": " Uni"}]}]} \ No newline at end of file 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 8674b14bacc9f24683cb7904587c6b6e08b7e5e3..0ef0bbc2bb84cdd32055612d032ec908200d0695 100644 GIT binary patch delta 15 WcmZ3SSoR^pD*}+Q_*=GO%BCQ21 delta 15 WcmbQwIG>SSoR^nN#OB;Y_89;h7z5D& 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 index 0865ed3..be6c45f 100644 --- a/ofu_app/apps/food/utils/json_generator/jsons/cafete-erba.json +++ b/ofu_app/apps/food/utils/json_generator/jsons/cafete-erba.json @@ -1 +1 @@ -{"execution_time": "Monday, 02.10.2017", "name": "Cafeteria Erba-Insel", "weekmenu": [{"date": "24.07.", "menu": ["Rinderhacksteak an Cognacso\u00dfe und Sp\u00e4tzle"]}, {"date": "25.07.", "menu": ["Gem\u00fcseschnitzel mit Kr\u00e4utercreme und Kartoffeln"]}, {"date": "26.07.", "menu": ["Penne-Nudeln mit Hackfleischso\u00dfe"]}, {"date": "27.07.", "menu": ["Kaiserschmarrn mit Apfelmus"]}]} \ No newline at end of file +{"execution_time": "Tuesday, 03.10.2017", "weekmenu": [{"date": "24.07.", "menu": ["Rinderhacksteak an Cognacso\u00dfe und Sp\u00e4tzle"]}, {"date": "25.07.", "menu": ["Gem\u00fcseschnitzel mit Kr\u00e4utercreme und Kartoffeln"]}, {"date": "26.07.", "menu": ["Penne-Nudeln mit Hackfleischso\u00dfe"]}, {"date": "27.07.", "menu": ["Kaiserschmarrn mit Apfelmus"]}], "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 index b3a7ccf..751676d 100644 --- a/ofu_app/apps/food/utils/json_generator/jsons/cafete-markus.json +++ b/ofu_app/apps/food/utils/json_generator/jsons/cafete-markus.json @@ -1 +1 @@ -{"execution_time": "Monday, 02.10.2017", "name": "Cafeteria Markusplatz", "weekmenu": [{"date": "24.07.", "menu": ["Vegetarisches Chili sin Carne"]}, {"date": "25.07.", "menu": ["Gem\u00fcseschnitzel mit Kr\u00e4utercreme und Kartoffeln"]}, {"date": "26.07.", "menu": ["\u00dcberbackene Zucchini an Paprikaso\u00dfe mit P\u00fcree"]}, {"date": "27.07.", "menu": ["Kaiserschmarrn mit Apfelmus"]}]} \ No newline at end of file +{"execution_time": "Tuesday, 03.10.2017", "weekmenu": [{"date": "24.07.", "menu": ["Vegetarisches Chili sin Carne"]}, {"date": "25.07.", "menu": ["Gem\u00fcseschnitzel mit Kr\u00e4utercreme und Kartoffeln"]}, {"date": "26.07.", "menu": ["\u00dcberbackene Zucchini an Paprikaso\u00dfe mit P\u00fcree"]}, {"date": "27.07.", "menu": ["Kaiserschmarrn mit Apfelmus"]}], "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 index 2f2ab9e..6f2b9dc 100644 --- a/ofu_app/apps/food/utils/json_generator/jsons/happyhourguide-fekide.json +++ b/ofu_app/apps/food/utils/json_generator/jsons/happyhourguide-fekide.json @@ -1 +1 @@ -{"execution_time": "Monday, 02.10.2017", "happyhours": [{"description": "Panini f\u00fcr je 4,50 \u20ac", "time": "12:00 - 22:00", "location": "Caf\u00e9 Esspress"}, {"description": "Salat-Tag: Varianten f\u00fcr je 6 \u20ac", "time": "16:00 - 23:59", "location": "Bowlinghaus Bamberg"}, {"description": "Jede Pizza nur 5,20\u20ac", "time": "17:00 - 21:00", "location": "Cafe Arte"}, {"description": "Jede Tapa - 2,50 \u20ac", "time": "17:00 - 21:00", "location": "Bolero"}, {"description": "Schnitzel + 0,2l Getr\u00e4nk 7,90 \u20ac", "time": "17:30 - 21:30", "location": "Luitpold"}, {"description": "Riesen-Pizzen 12,50 \u20ac", "time": "18:00 - 21:00", "location": "Aposto"}, {"description": "1 Paar Bradw\u00f6rschd, 1 Ah\u00f6rnla Bier + Beilage ab 7,50 \u20ac", "time": "19:00 - 22:00", "location": "Ah\u00f6rnla im Sand"}, {"description": "Jede Pizza 4,90 \u20ac", "time": "19:00 - 01:00", "location": "Mainfranken Bowling"}], "day": "Monday, 02.10.2017"} \ No newline at end of file +{"execution_time": "Tuesday, 03.10.2017", "day": "Tuesday, 03.10.2017", "happyhours": []} \ 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 index 370f688..6d2f1c8 100644 --- a/ofu_app/apps/food/utils/json_generator/jsons/mensa-austr.json +++ b/ofu_app/apps/food/utils/json_generator/jsons/mensa-austr.json @@ -1 +1 @@ -{"execution_time": "Monday, 02.10.2017", "name": "Speiseplan f\u00fcr Austra\u00dfe Bamberg", "weekmenu": [{"date": "02.10.", "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": "03.10.", "menu": []}, {"date": "04.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": "05.10.", "menu": ["Chicken Burger mit Ananas Currydip", "Schneller Teller: Paprikagulsch vom Schwein mit Spiralnudeln und Rosenkohl", "Nudelgem\u00fcseauflauf", "Pizza \"Spinat & Hirtenk\u00e4se\""]}, {"date": "06.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"]}]} \ No newline at end of file +{"execution_time": "Tuesday, 03.10.2017", "weekmenu": [{"date": "02.10.", "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": "03.10.", "menu": []}, {"date": "04.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": "05.10.", "menu": ["Chicken Burger mit Ananas Currydip", "Schneller Teller: Paprikagulsch vom Schwein mit Spiralnudeln und Rosenkohl", "Nudelgem\u00fcseauflauf", "Pizza \"Spinat & Hirtenk\u00e4se\""]}, {"date": "06.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"]}], "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 index 87b31d5..019bae0 100644 --- a/ofu_app/apps/food/utils/json_generator/jsons/mensa-feki.json +++ b/ofu_app/apps/food/utils/json_generator/jsons/mensa-feki.json @@ -1 +1 @@ -{"execution_time": "Monday, 02.10.2017", "name": "Speiseplan f\u00fcr Feldkirchenstra\u00dfe Bamberg", "weekmenu": [{"date": "02.10.", "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": "03.10.", "menu": []}, {"date": "04.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": "05.10.", "menu": ["Chicken Burger mit Ananas Currydip", "Schneller Teller: Paprikagulsch vom Schwein mit Spiralnudeln und Rosenkohl", "Nudelgem\u00fcseauflauf", "Pizza \"Spinat & Hirtenk\u00e4se\""]}, {"date": "06.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"]}]} \ No newline at end of file +{"execution_time": "Tuesday, 03.10.2017", "weekmenu": [{"date": "02.10.", "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": "03.10.", "menu": []}, {"date": "04.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": "05.10.", "menu": ["Chicken Burger mit Ananas Currydip", "Schneller Teller: Paprikagulsch vom Schwein mit Spiralnudeln und Rosenkohl", "Nudelgem\u00fcseauflauf", "Pizza \"Spinat & Hirtenk\u00e4se\""]}, {"date": "06.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"]}], "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 b8818deda14c16520c6e55297919bb351a57de12..12c9f2aeae022e223d6a45255b518a49f54c9119 100644 GIT binary patch delta 15 Wcmdlfwo{BvoR^pD*};u$#@qlULIivO delta 15 Wcmdlfwo{BvoR^pDUG7FUV{QN=&IB+3 diff --git a/ofu_app/ofu_app/__pycache__/urls.cpython-35.pyc b/ofu_app/ofu_app/__pycache__/urls.cpython-35.pyc index 0ad4ff77fdbdf7feaf523a5955245bc35cc93253..3cfea3b688c10cc37b0518370ca423c1662094d1 100644 GIT binary patch delta 297 zcmYk1ze>YU7{$-MH_1(trj&rX7VFZfQyn@9u7aRAn4uE5w>6>p<4vNF#i95BB~PKa zxcdq&9kco%dRr>^!GXh%A0M1I`^O$0d7d-bY;Hdp@Qr`RbwAT7*6ZQ;Sr7;VOA84{ zz(FL1FdNbD7KsK-L z!aN_`TwM&#vveLUs*m>FlI6(lC*&ai1l!nX*&TZ64Tk z67c;SW$F>FQADMdDzz-sc3JD{nuld6Ra(44d73G&`C^xTPgjc^l0NA(pB_-3`~sz$ BLr(wz delta 188 zcmey*v5G@koR^o2LF+WqqeqCWaIihE!IDEH;KLc7|pq z29O9VLn<>v3L8T+BTR%HEW!a5NoQt=;$TSOWC+&e+PHHr6K55BTw+RYW}g1!3T87# z&dKYUt(0!D6la#C-eM^&$|=6Z4I~Q^OG;9U@`_h76mbC^P{cJ^j>Vr3#AIU>V-#Q( IVisZq022l#+5i9m 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