diff --git a/ofu_app/apps/events/__pycache__/urls.cpython-35.pyc b/ofu_app/apps/events/__pycache__/urls.cpython-35.pyc new file mode 100644 index 0000000..f5f8313 Binary files /dev/null and b/ofu_app/apps/events/__pycache__/urls.cpython-35.pyc differ diff --git a/ofu_app/apps/events/__pycache__/views.cpython-35.pyc b/ofu_app/apps/events/__pycache__/views.cpython-35.pyc new file mode 100644 index 0000000..68ea004 Binary files /dev/null and b/ofu_app/apps/events/__pycache__/views.cpython-35.pyc differ diff --git a/ofu_app/apps/events/migrations/__pycache__/0001_initial.cpython-35.pyc b/ofu_app/apps/events/migrations/__pycache__/0001_initial.cpython-35.pyc new file mode 100644 index 0000000..3e02ed4 Binary files /dev/null and b/ofu_app/apps/events/migrations/__pycache__/0001_initial.cpython-35.pyc differ diff --git a/ofu_app/apps/events/migrations/__pycache__/__init__.cpython-35.pyc b/ofu_app/apps/events/migrations/__pycache__/__init__.cpython-35.pyc new file mode 100644 index 0000000..942ff2a Binary files /dev/null and b/ofu_app/apps/events/migrations/__pycache__/__init__.cpython-35.pyc differ diff --git a/ofu_app/apps/food/__pycache__/urls.cpython-35.pyc b/ofu_app/apps/food/__pycache__/urls.cpython-35.pyc new file mode 100644 index 0000000..c0207f2 Binary files /dev/null and b/ofu_app/apps/food/__pycache__/urls.cpython-35.pyc differ diff --git a/ofu_app/apps/food/__pycache__/views.cpython-35.pyc b/ofu_app/apps/food/__pycache__/views.cpython-35.pyc new file mode 100644 index 0000000..e416cfb Binary files /dev/null and b/ofu_app/apps/food/__pycache__/views.cpython-35.pyc differ 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 new file mode 100644 index 0000000..7c86fc7 Binary files /dev/null and b/ofu_app/apps/food/migrations/__pycache__/0001_initial.cpython-35.pyc differ diff --git a/ofu_app/apps/food/migrations/__pycache__/0002_auto_20170929_1611.cpython-35.pyc b/ofu_app/apps/food/migrations/__pycache__/0002_auto_20170929_1611.cpython-35.pyc new file mode 100644 index 0000000..d8f7935 Binary files /dev/null and b/ofu_app/apps/food/migrations/__pycache__/0002_auto_20170929_1611.cpython-35.pyc differ diff --git a/ofu_app/apps/food/migrations/__pycache__/0003_auto_20170929_1614.cpython-35.pyc b/ofu_app/apps/food/migrations/__pycache__/0003_auto_20170929_1614.cpython-35.pyc new file mode 100644 index 0000000..68d7c08 Binary files /dev/null and b/ofu_app/apps/food/migrations/__pycache__/0003_auto_20170929_1614.cpython-35.pyc differ diff --git a/ofu_app/apps/food/migrations/__pycache__/0004_auto_20170929_1907.cpython-35.pyc b/ofu_app/apps/food/migrations/__pycache__/0004_auto_20170929_1907.cpython-35.pyc new file mode 100644 index 0000000..d1dcbc6 Binary files /dev/null and b/ofu_app/apps/food/migrations/__pycache__/0004_auto_20170929_1907.cpython-35.pyc differ diff --git a/ofu_app/apps/food/migrations/__pycache__/0005_auto_20170929_1909.cpython-35.pyc b/ofu_app/apps/food/migrations/__pycache__/0005_auto_20170929_1909.cpython-35.pyc new file mode 100644 index 0000000..033e67e Binary files /dev/null and b/ofu_app/apps/food/migrations/__pycache__/0005_auto_20170929_1909.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 new file mode 100644 index 0000000..63edbfb Binary files /dev/null and b/ofu_app/apps/food/migrations/__pycache__/__init__.cpython-35.pyc differ diff --git a/ofu_app/data_collectors/events/json_generator/jsons/events-fekide.json b/ofu_app/data_collectors/events/json_generator/jsons/events-fekide.json index 3968ed8..c622ca5 100644 --- a/ofu_app/data_collectors/events/json_generator/jsons/events-fekide.json +++ b/ofu_app/data_collectors/events/json_generator/jsons/events-fekide.json @@ -1 +1 @@ -{"dates": [{"events": [{"location": "Marcus-Haus (M3) HuWi", "time": "Ab 09:00 Uhr", "category": " Berufliches", "title": "Kompetenztraining: Visualisieren/Pr\u00e4sentieren Berufliches", "link": "https://www.feki.de/terminkalender/termin/3226"}], "date": "04.10.2017"}, {"events": [{"location": "Live-Club", "time": "Ab 22:00 Uhr", "category": " Party", "title": "Greenclub - Die Rap-Party der Stadt! Party", "link": "https://www.feki.de/terminkalender/termin/3528"}], "date": "06.10.2017"}, {"events": [{"location": "Sound'n Arts", "time": "Ab 21:00 Uhr", "category": " Kultur & Live Acts", "title": "The Apemen (Mod-Beat/Sixties-Garage) & The Quires Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3545"}], "date": "07.10.2017"}, {"events": [{"location": "Marcus-Haus (M3) HuWi", "time": "Ab 09:00 Uhr", "category": " Berufliches", "title": "Kompetenztraining: Aktivierende Methoden Berufliches", "link": "https://www.feki.de/terminkalender/termin/3218"}], "date": "09.10.2017"}, {"events": [{"location": "Alte Seilerei", "time": "Ab 19:30 Uhr", "category": " Kultur & Live Acts", "title": "William Shakespeares Star Wars Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3537"}, {"location": "Aposto", "time": "Ab 20:00 Uhr", "category": " Sonstiges", "title": "Erstsemesterstammtisch (1) Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3549"}], "date": "10.10.2017"}, {"events": [{"location": "Alte Seilerei", "time": "Ab 19:30 Uhr", "category": " Kultur & Live Acts", "title": "William Shakespeares Star Wars Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3538"}, {"location": "JuZ Margaretendamm", "time": "Ab 20:00 Uhr", "category": " Sonstiges", "title": "Erstis Kneipentour Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3531"}], "date": "11.10.2017"}, {"events": [{"location": "Sound'n Arts", "time": "Ab 22:00 Uhr", "category": " Party", "title": "Rauschkollektiv \u2013 Goldener Technooktober Party", "link": "https://www.feki.de/terminkalender/termin/3536"}], "date": "13.10.2017"}, {"events": [{"location": "JuZ Margaretendamm", "time": "Ab 12:00 Uhr", "category": " Kultur & Live Acts", "title": "Wokshops: Hip-Hop Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3535"}, {"location": "KickerBox", "time": "Ab 14:00 Uhr", "category": " Sport", "title": "Kickerturnier Sport", "link": "https://www.feki.de/terminkalender/termin/3522"}, {"location": "JuZ Margaretendamm", "time": "Ab 18:30 Uhr", "category": " Kultur & Live Acts", "title": "Bleib auf dem Teppich 2 - Open Mic & Konzerte (Hip-Hop) Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3534"}], "date": "14.10.2017"}, {"events": [{"location": "Rotenschild", "time": "Ab 20:00 Uhr", "category": " Sonstiges", "title": "Erstsemesterstammtisch (2) Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3546"}], "date": "17.10.2017"}, {"events": [{"location": "Feldkirchenstra\u00dfe (F21) SoWi", "time": "Ab 20:15 Uhr", "category": " Sonstiges", "title": "Feki.de Infoabend (Feki) Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3541"}], "date": "18.10.2017"}, {"events": [{"location": "Catwheezles' Castle", "time": "Ab 20:00 Uhr", "category": " Sonstiges", "title": "Erstsemesterstammtisch (3) Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3547"}], "date": "19.10.2017"}, {"events": [{"location": "JuZ Margaretendamm", "time": "Ab 19:00 Uhr", "category": " Kultur & Live Acts", "title": "Konzert: Somnium Captare, Varus, Carnage Calligraphy, Eroded Ashes (Metal) Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3533"}, {"location": "Parkhaus Zentrum S\u00fcd", "time": "Ab 19:30 Uhr", "category": " Kultur & Live Acts", "title": "junk space Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3413"}], "date": "21.10.2017"}, {"events": [{"location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr", "category": " Uni", "title": "Institutskolloquium Psychologie Uni", "link": "https://www.feki.de/terminkalender/termin/3551"}, {"location": "Villa Concordia", "time": "Ab 19:00 Uhr", "category": " Kultur & Live Acts", "title": "Okka-Esther Hungerb\u00fchler: Das Duell - Vernissage Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3478"}, {"location": "An der Universit\u00e4t 5 (U5) GuK", "time": "Ab 20:15 Uhr", "category": " Sonstiges", "title": "Feki.de Infoabend (Innenstadt) Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3543"}], "date": "23.10.2017"}, {"events": [{"location": "E.T.A.-Hoffmann-Theater", "time": "Ab 19:00 Uhr", "category": " Kultur & Live Acts", "title": "Villa Wild # 5: Von den Maschinen Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3479"}, {"location": "Freiraum", "time": "Ab 20:00 Uhr", "category": " Sonstiges", "title": "Viva con Agua Bamberg Treffen im Oktober Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3550"}], "date": "24.10.2017"}, {"events": [{"location": "Feldkirchenstra\u00dfe (F21) SoWi", "time": "Ab 20:00 Uhr", "category": " Uni", "title": "Informationsabend des Akademischen Auslandsamtes zum Auslandsstudium Uni", "link": "https://www.feki.de/terminkalender/termin/3305"}], "date": "25.10.2017"}, {"events": [{"location": "Parkhaus Zentrum S\u00fcd", "time": "Ab 19:30 Uhr", "category": " Kultur & Live Acts", "title": "junk space Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3414"}, {"location": "Freiraum", "time": "Ab 21:00 Uhr", "category": " Sonstiges", "title": "Erstsemesterstammtisch (4) Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3548"}], "date": "26.10.2017"}, {"events": [{"location": "JuZ Margaretendamm", "time": "Ab 19:00 Uhr", "category": " Kultur & Live Acts", "title": "Vorentscheid Rock in Oberfranken 2018 Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3532"}], "date": "27.10.2017"}, {"events": [{"location": "Parkhaus Zentrum S\u00fcd", "time": "Ab 19:30 Uhr", "category": " Kultur & Live Acts", "title": "junk space Kultur & Live Acts", "link": "https://www.feki.de/terminkalender/termin/3415"}], "date": "28.10.2017"}, {"events": [{"location": "Bamberg", "time": "Ab 14:00 Uhr", "category": " Sonstiges", "title": "Feki.de Flohmarkt Sonstiges", "link": "https://www.feki.de/terminkalender/termin/3481"}], "date": "03.11.2017"}, {"events": [{"location": "Markusstra\u00dfe 8a (MG1/MG2)", "time": "Ab 18:00 Uhr", "category": " Uni", "title": "Forum Mathematik-Didaktik Uni", "link": "https://www.feki.de/terminkalender/termin/3483"}], "date": "09.11.2017"}, {"events": [{"location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr", "category": " Uni", "title": "Institutskolloquium Psychologie Uni", "link": "https://www.feki.de/terminkalender/termin/3552"}], "date": "20.11.2017"}, {"events": [{"location": "Messezentrum Augsburg", "time": "Ab 10:00 Uhr", "category": " Berufliches", "title": "akademika augsburg 2017 Berufliches", "link": "https://www.feki.de/terminkalender/termin/3438"}], "date": "21.11.2017"}, {"events": [{"location": "Messezentrum Augsburg", "time": "Ab 10:00 Uhr", "category": " Berufliches", "title": "akademika augsburg 2017 Berufliches", "link": "https://www.feki.de/terminkalender/termin/3439"}], "date": "22.11.2017"}, {"events": [{"location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr", "category": " Uni", "title": "Institutskolloquium Psychologie Uni", "link": "https://www.feki.de/terminkalender/termin/3553"}], "date": "04.12.2017"}, {"events": [{"location": "Markusstra\u00dfe 8a (MG1/MG2)", "time": "Ab 18:00 Uhr", "category": " Uni", "title": "Forum Mathematik-Didaktik Uni", "link": "https://www.feki.de/terminkalender/termin/3482"}], "date": "07.12.2017"}, {"events": [{"location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr", "category": " Uni", "title": "Institutskolloquium Psychologie Uni", "link": "https://www.feki.de/terminkalender/termin/3554"}], "date": "15.01.2017"}, {"events": [{"location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr", "category": " Uni", "title": "Institutskolloquium Psychologie Uni", "link": "https://www.feki.de/terminkalender/termin/3555"}], "date": "22.01.2017"}, {"events": [{"location": "Marcus-Haus (M3) HuWi", "time": "Ab 18:15 Uhr", "category": " Uni", "title": "Institutskolloquium Uni", "link": "https://www.feki.de/terminkalender/termin/3556"}], "date": "29.01.2017"}]} \ No newline at end of file +{"dates": [{"events": [{"time": "Ab 09:00 Uhr", "title": "Kompetenztraining: Visualisieren/Pr\u00e4sentieren Berufliches", "location": "Marcus-Haus (M3) HuWi", "link": "https://www.feki.de/terminkalender/termin/3226", "category": " Berufliches"}], "date": "04.10.2017"}, {"events": [{"time": "Ab 22:00 Uhr", "title": "Greenclub - Die Rap-Party der Stadt! Party", "location": "Live-Club", "link": "https://www.feki.de/terminkalender/termin/3528", "category": " Party"}], "date": "06.10.2017"}, {"events": [{"time": "Ab 21:00 Uhr", "title": "The Apemen (Mod-Beat/Sixties-Garage) & The Quires Kultur & Live Acts", "location": "Sound'n Arts", "link": "https://www.feki.de/terminkalender/termin/3545", "category": " Kultur & Live Acts"}], "date": "07.10.2017"}, {"events": [{"time": "Ab 09:00 Uhr", "title": "Kompetenztraining: Aktivierende Methoden Berufliches", "location": "Marcus-Haus (M3) HuWi", "link": "https://www.feki.de/terminkalender/termin/3218", "category": " Berufliches"}], "date": "09.10.2017"}, {"events": [{"time": "Ab 19:30 Uhr", "title": "William Shakespeares Star Wars Kultur & Live Acts", "location": "Alte Seilerei", "link": "https://www.feki.de/terminkalender/termin/3537", "category": " Kultur & Live Acts"}, {"time": "Ab 20:00 Uhr", "title": "Erstsemesterstammtisch (1) Sonstiges", "location": "Aposto", "link": "https://www.feki.de/terminkalender/termin/3549", "category": " Sonstiges"}], "date": "10.10.2017"}, {"events": [{"time": "Ab 19:30 Uhr", "title": "William Shakespeares Star Wars Kultur & Live Acts", "location": "Alte Seilerei", "link": "https://www.feki.de/terminkalender/termin/3538", "category": " Kultur & Live Acts"}, {"time": "Ab 20:00 Uhr", "title": "Erstis Kneipentour Sonstiges", "location": "JuZ Margaretendamm", "link": "https://www.feki.de/terminkalender/termin/3531", "category": " Sonstiges"}], "date": "11.10.2017"}, {"events": [{"time": "Ab 22:00 Uhr", "title": "Rauschkollektiv \u2013 Goldener Technooktober Party", "location": "Sound'n Arts", "link": "https://www.feki.de/terminkalender/termin/3536", "category": " Party"}], "date": "13.10.2017"}, {"events": [{"time": "Ab 12:00 Uhr", "title": "Wokshops: Hip-Hop Kultur & Live Acts", "location": "JuZ Margaretendamm", "link": "https://www.feki.de/terminkalender/termin/3535", "category": " Kultur & Live Acts"}, {"time": "Ab 14:00 Uhr", "title": "Kickerturnier Sport", "location": "KickerBox", "link": "https://www.feki.de/terminkalender/termin/3522", "category": " Sport"}, {"time": "Ab 18:30 Uhr", "title": "Bleib auf dem Teppich 2 - Open Mic & Konzerte (Hip-Hop) Kultur & Live Acts", "location": "JuZ Margaretendamm", "link": "https://www.feki.de/terminkalender/termin/3534", "category": " Kultur & Live Acts"}], "date": "14.10.2017"}, {"events": [{"time": "Ab 20:00 Uhr", "title": "Erstsemesterstammtisch (2) Sonstiges", "location": "Rotenschild", "link": "https://www.feki.de/terminkalender/termin/3546", "category": " Sonstiges"}], "date": "17.10.2017"}, {"events": [{"time": "Ab 20:15 Uhr", "title": "Feki.de Infoabend (Feki) Sonstiges", "location": "Feldkirchenstra\u00dfe (F21) SoWi", "link": "https://www.feki.de/terminkalender/termin/3541", "category": " Sonstiges"}], "date": "18.10.2017"}, {"events": [{"time": "Ab 20:00 Uhr", "title": "Erstsemesterstammtisch (3) Sonstiges", "location": "Catwheezles' Castle", "link": "https://www.feki.de/terminkalender/termin/3547", "category": " Sonstiges"}], "date": "19.10.2017"}, {"events": [{"time": "Ab 19:00 Uhr", "title": "Konzert: Somnium Captare, Varus, Carnage Calligraphy, Eroded Ashes (Metal) Kultur & Live Acts", "location": "JuZ Margaretendamm", "link": "https://www.feki.de/terminkalender/termin/3533", "category": " Kultur & Live Acts"}, {"time": "Ab 19:30 Uhr", "title": "junk space Kultur & Live Acts", "location": "Parkhaus Zentrum S\u00fcd", "link": "https://www.feki.de/terminkalender/termin/3413", "category": " Kultur & Live Acts"}], "date": "21.10.2017"}, {"events": [{"time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni", "location": "Marcus-Haus (M3) HuWi", "link": "https://www.feki.de/terminkalender/termin/3551", "category": " Uni"}, {"time": "Ab 19:00 Uhr", "title": "Okka-Esther Hungerb\u00fchler: Das Duell - Vernissage Kultur & Live Acts", "location": "Villa Concordia", "link": "https://www.feki.de/terminkalender/termin/3478", "category": " Kultur & Live Acts"}, {"time": "Ab 20:15 Uhr", "title": "Feki.de Infoabend (Innenstadt) Sonstiges", "location": "An der Universit\u00e4t 5 (U5) GuK", "link": "https://www.feki.de/terminkalender/termin/3543", "category": " Sonstiges"}], "date": "23.10.2017"}, {"events": [{"time": "Ab 19:00 Uhr", "title": "Villa Wild # 5: Von den Maschinen Kultur & Live Acts", "location": "E.T.A.-Hoffmann-Theater", "link": "https://www.feki.de/terminkalender/termin/3479", "category": " Kultur & Live Acts"}, {"time": "Ab 20:00 Uhr", "title": "Viva con Agua Bamberg Treffen im Oktober Sonstiges", "location": "Freiraum", "link": "https://www.feki.de/terminkalender/termin/3550", "category": " Sonstiges"}], "date": "24.10.2017"}, {"events": [{"time": "Ab 20:00 Uhr", "title": "Informationsabend des Akademischen Auslandsamtes zum Auslandsstudium Uni", "location": "Feldkirchenstra\u00dfe (F21) SoWi", "link": "https://www.feki.de/terminkalender/termin/3305", "category": " Uni"}], "date": "25.10.2017"}, {"events": [{"time": "Ab 19:30 Uhr", "title": "junk space Kultur & Live Acts", "location": "Parkhaus Zentrum S\u00fcd", "link": "https://www.feki.de/terminkalender/termin/3414", "category": " Kultur & Live Acts"}, {"time": "Ab 21:00 Uhr", "title": "Erstsemesterstammtisch (4) Sonstiges", "location": "Freiraum", "link": "https://www.feki.de/terminkalender/termin/3548", "category": " Sonstiges"}], "date": "26.10.2017"}, {"events": [{"time": "Ab 19:00 Uhr", "title": "Vorentscheid Rock in Oberfranken 2018 Kultur & Live Acts", "location": "JuZ Margaretendamm", "link": "https://www.feki.de/terminkalender/termin/3532", "category": " Kultur & Live Acts"}], "date": "27.10.2017"}, {"events": [{"time": "Ab 19:30 Uhr", "title": "junk space Kultur & Live Acts", "location": "Parkhaus Zentrum S\u00fcd", "link": "https://www.feki.de/terminkalender/termin/3415", "category": " Kultur & Live Acts"}], "date": "28.10.2017"}, {"events": [{"time": "Ab 14:00 Uhr", "title": "Feki.de Flohmarkt Sonstiges", "location": "Bamberg", "link": "https://www.feki.de/terminkalender/termin/3481", "category": " Sonstiges"}], "date": "03.11.2017"}, {"events": [{"time": "Ab 18:00 Uhr", "title": "Forum Mathematik-Didaktik Uni", "location": "Markusstra\u00dfe 8a (MG1/MG2)", "link": "https://www.feki.de/terminkalender/termin/3483", "category": " Uni"}], "date": "09.11.2017"}, {"events": [{"time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni", "location": "Marcus-Haus (M3) HuWi", "link": "https://www.feki.de/terminkalender/termin/3552", "category": " Uni"}], "date": "20.11.2017"}, {"events": [{"time": "Ab 10:00 Uhr", "title": "akademika augsburg 2017 Berufliches", "location": "Messezentrum Augsburg", "link": "https://www.feki.de/terminkalender/termin/3438", "category": " Berufliches"}], "date": "21.11.2017"}, {"events": [{"time": "Ab 10:00 Uhr", "title": "akademika augsburg 2017 Berufliches", "location": "Messezentrum Augsburg", "link": "https://www.feki.de/terminkalender/termin/3439", "category": " Berufliches"}], "date": "22.11.2017"}, {"events": [{"time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni", "location": "Marcus-Haus (M3) HuWi", "link": "https://www.feki.de/terminkalender/termin/3553", "category": " Uni"}], "date": "04.12.2017"}, {"events": [{"time": "Ab 18:00 Uhr", "title": "Forum Mathematik-Didaktik Uni", "location": "Markusstra\u00dfe 8a (MG1/MG2)", "link": "https://www.feki.de/terminkalender/termin/3482", "category": " Uni"}], "date": "07.12.2017"}, {"events": [{"time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni", "location": "Marcus-Haus (M3) HuWi", "link": "https://www.feki.de/terminkalender/termin/3554", "category": " Uni"}], "date": "15.01.2017"}, {"events": [{"time": "Ab 18:15 Uhr", "title": "Institutskolloquium Psychologie Uni", "location": "Marcus-Haus (M3) HuWi", "link": "https://www.feki.de/terminkalender/termin/3555", "category": " Uni"}], "date": "22.01.2017"}, {"events": [{"time": "Ab 18:15 Uhr", "title": "Institutskolloquium Uni", "location": "Marcus-Haus (M3) HuWi", "link": "https://www.feki.de/terminkalender/termin/3556", "category": " Uni"}], "date": "29.01.2017"}]} \ No newline at end of file diff --git a/ofu_app/data_collectors/food/json_generator/jsons/cafete-erba.json b/ofu_app/data_collectors/food/json_generator/jsons/cafete-erba.json index ea46346..1edcae9 100644 --- a/ofu_app/data_collectors/food/json_generator/jsons/cafete-erba.json +++ b/ofu_app/data_collectors/food/json_generator/jsons/cafete-erba.json @@ -1 +1 @@ -{"execution_time": "Sunday, 01.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 +{"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."}], "execution_time": "Monday, 02.10.2017", "name": "Cafeteria Erba-Insel"} \ No newline at end of file diff --git a/ofu_app/data_collectors/food/json_generator/jsons/cafete-markus.json b/ofu_app/data_collectors/food/json_generator/jsons/cafete-markus.json index 2f1d325..f044229 100644 --- a/ofu_app/data_collectors/food/json_generator/jsons/cafete-markus.json +++ b/ofu_app/data_collectors/food/json_generator/jsons/cafete-markus.json @@ -1 +1 @@ -{"execution_time": "Sunday, 01.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 +{"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."}], "execution_time": "Monday, 02.10.2017", "name": "Cafeteria Markusplatz"} \ No newline at end of file diff --git a/ofu_app/data_collectors/food/json_generator/jsons/happyhourguide-fekide.json b/ofu_app/data_collectors/food/json_generator/jsons/happyhourguide-fekide.json index 922071c..f13912c 100644 --- a/ofu_app/data_collectors/food/json_generator/jsons/happyhourguide-fekide.json +++ b/ofu_app/data_collectors/food/json_generator/jsons/happyhourguide-fekide.json @@ -1 +1 @@ -{"execution_time": "Sunday, 01.10.2017", "day": "Sunday, 01.10.2017", "happyhours": []} \ No newline at end of file +{"day": "Monday, 02.10.2017", "execution_time": "Monday, 02.10.2017", "happyhours": [{"time": "11:00 - 18:00", "location": "Fritz Heaven", "description": "10% Rabatt auf Beefburger & belg. Fritten"}, {"time": "12:00 - 22:00", "location": "Caf\u00e9 Esspress", "description": "Panini f\u00fcr je 4,50 \u20ac"}, {"time": "15:00 - 17:30", "location": "Orlando", "description": "Dolce Vita (Cappucino & Tiramisu) f\u00fcr nur 3,50 \u20ac"}, {"time": "16:00 - 20:00", "location": "Caff\u00e8bar Kranen", "description": "Aperitivo Italiano incl. Antipasti"}, {"time": "16:00 - 23:59", "location": "Bowlinghaus Bamberg", "description": "Salat-Tag: Varianten f\u00fcr je 6 \u20ac"}, {"time": "17:00 - 21:00", "location": "Cafe Arte", "description": "Jede Pizza nur 5,20\u20ac"}, {"time": "17:00 - 21:00", "location": "Bolero", "description": "Jede Tapa - 2,50 \u20ac"}, {"time": "17:30 - 21:30", "location": "Luitpold", "description": "Schnitzel + 0,2l Getr\u00e4nk 7,90 \u20ac"}, {"time": "18:00 - 21:00", "location": "Aposto", "description": "Riesen-Pizzen 12,50 \u20ac"}, {"time": "19:00 - 22:00", "location": "Ah\u00f6rnla im Sand", "description": "1 Paar Bradw\u00f6rschd, 1 Ah\u00f6rnla Bier + Beilage ab 7,50 \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/data_collectors/food/json_generator/jsons/mensa-austr.json b/ofu_app/data_collectors/food/json_generator/jsons/mensa-austr.json index 2695972..898de57 100644 --- a/ofu_app/data_collectors/food/json_generator/jsons/mensa-austr.json +++ b/ofu_app/data_collectors/food/json_generator/jsons/mensa-austr.json @@ -1 +1 @@ -{"execution_time": "Sunday, 01.10.2017", "name": "Speiseplan f\u00fcr Austra\u00dfe Bamberg", "weekmenu": [{"date": "25.09.", "menu": ["Pangasiusfilet an fr\u00e4nkischer Silvanerso\u00dfe mit Gem\u00fcsestreifen", "2 St\u00fcck H\u00e4hnchenschnitzel \"Wiener Art\"", "Kasseler mit gr\u00fcnem Bohnengem\u00fcse", "Waldpilzpfanne", "Wedges mit Kr\u00e4uterquark"]}, {"date": "26.09.", "menu": ["2 St\u00fcck H\u00e4hnchenschnitzel \"Wiener Art\"", "Saftiges Rindergulasch", "Ofenfrischer Schweinekammbraten in Bierso\u00dfe", "Mensa Vital : Bohnen-Zucchini-Chili mit Vollkornreis"]}, {"date": "27.09.", "menu": ["H\u00e4hnchenkeule \"Z\u00fcricher Art\"", "Ofenfrischer Schweinekammbraten in Bierso\u00dfe", "Pulled Pork Burger mit Coleslaw", "Griechischer Kartoffelgem\u00fcseauflauf mit Paprika, Zucchini & Auberginen"]}, {"date": "28.09.", "menu": ["Moussaka vom Rind", "H\u00e4hnchenkeule \"Z\u00fcricher Art\"", "Falafelb\u00e4llchen auf Couscous Gem\u00fcse", "Pulled Pork Burger mit Coleslaw", "Rustico Triangolo \"Spinaci\" an Sahneso\u00dfe"]}, {"date": "29.09.", "menu": ["Pennenudeln mit Lachs, Spinat und Kirschtomaten", "Feuerspie\u00df mit Barbecueso\u00dfe", "Falafelb\u00e4llchen auf Couscous Gem\u00fcse", "Vegane Knusperschnitte \"Hong Kong\" mit Chop suey", "Rustico Triangolo \"Spinaci\" an Sahneso\u00dfe"]}]} \ No newline at end of file +{"weekmenu": [{"menu": [], "date": "02.10."}, {"menu": [], "date": "03.10."}, {"menu": [], "date": "04.10."}, {"menu": [], "date": "05.10."}, {"menu": [], "date": "06.10."}], "execution_time": "Monday, 02.10.2017", "name": "Speiseplan f\u00fcr Austra\u00dfe Bamberg"} \ No newline at end of file diff --git a/ofu_app/data_collectors/food/json_generator/jsons/mensa-feki.json b/ofu_app/data_collectors/food/json_generator/jsons/mensa-feki.json index a2ddbde..35117fc 100644 --- a/ofu_app/data_collectors/food/json_generator/jsons/mensa-feki.json +++ b/ofu_app/data_collectors/food/json_generator/jsons/mensa-feki.json @@ -1 +1 @@ -{"execution_time": "Sunday, 01.10.2017", "name": "Speiseplan f\u00fcr Feldkirchenstra\u00dfe Bamberg", "weekmenu": [{"date": "25.09.", "menu": ["Chili con Carne", "2 St\u00fcck H\u00e4hnchenschnitzel \"Wiener Art\"", "Kasseler mit gr\u00fcnem Bohnengem\u00fcse", "Waldpilzpfanne"]}, {"date": "26.09.", "menu": ["Pangasiusfilet an fr\u00e4nkischer Silvanerso\u00dfe mit Gem\u00fcsestreifen", "Saftiges Rindergulasch", "Kasseler mit gr\u00fcnem Bohnengem\u00fcse", "Ofenfrischer Schweinekammbraten in Bierso\u00dfe", "Blumenkohlk\u00e4semedaillon mit Pestoso\u00dfe", "Mensa Vital : Bohnen-Zucchini-Chili mit Vollkornreis"]}, {"date": "27.09.", "menu": ["Pangasiusfilet an fr\u00e4nkischer Silvanerso\u00dfe mit Gem\u00fcsestreifen", "H\u00e4hnchenkeule \"Z\u00fcricher Art\"", "Pulled Pork Burger mit Coleslaw", "Mensa Vital : Bohnen-Zucchini-Chili mit Vollkornreis", "Griechischer Kartoffelgem\u00fcseauflauf mit Paprika, Zucchini & Auberginen"]}, {"date": "28.09.", "menu": ["Moussaka vom Rind", "Falafelb\u00e4llchen auf Couscous Gem\u00fcse", "Ofenfrischer Schweinekammbraten in Bierso\u00dfe", "Rustico Triangolo \"Spinaci\" an Sahneso\u00dfe"]}, {"date": "29.09.", "menu": ["Pennenudeln mit Lachs, Spinat und Kirschtomaten", "Falafelb\u00e4llchen auf Couscous Gem\u00fcse", "Feuerspie\u00df mit Barbecueso\u00dfe", "Vegane Knusperschnitte \"Hong Kong\" mit Chop suey"]}]} \ No newline at end of file +{"weekmenu": [{"menu": [], "date": "02.10."}, {"menu": [], "date": "03.10."}, {"menu": [], "date": "04.10."}, {"menu": [], "date": "05.10."}, {"menu": [], "date": "06.10."}], "execution_time": "Monday, 02.10.2017", "name": "Speiseplan f\u00fcr Feldkirchenstra\u00dfe Bamberg"} \ No newline at end of file diff --git a/ofu_app/db.sqlite3 b/ofu_app/db.sqlite3 index ab7c83f..5caf5e2 100644 Binary files a/ofu_app/db.sqlite3 and b/ofu_app/db.sqlite3 differ diff --git a/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc b/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc index 13ac77f..1cd8bd7 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 new file mode 100644 index 0000000..0ad4ff7 Binary files /dev/null and b/ofu_app/ofu_app/__pycache__/urls.cpython-35.pyc differ diff --git a/ofu_app/ofu_app/__pycache__/wsgi.cpython-35.pyc b/ofu_app/ofu_app/__pycache__/wsgi.cpython-35.pyc new file mode 100644 index 0000000..dc3a9f8 Binary files /dev/null and b/ofu_app/ofu_app/__pycache__/wsgi.cpython-35.pyc differ diff --git a/ofu_app/ofu_app/settings.py b/ofu_app/ofu_app/settings.py index 171ecaf..e11c0da 100644 --- a/ofu_app/ofu_app/settings.py +++ b/ofu_app/ofu_app/settings.py @@ -23,8 +23,8 @@ SECRET_KEY = '7tm($-7tz!co8762!)ptmj%)80)qa^z0odee*8-!be!i(a!p4j' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True +ALLOWED_HOSTS = ['mg-server.ddns.net', 'localhost' ] -ALLOWED_HOSTS = ['mg-server.ddns.net', ] # Application definition @@ -161,3 +161,5 @@ STATICFILES_DIRS = [ # Setup support for proxy headers USE_X_FORWARDED_HOST = True SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') + +FORCE_SCRIPT_NAME = "app"