From 0fcb726f9282d99c9c4708a8a45d0b80076e06c9 Mon Sep 17 00:00:00 2001
From: michigg <michael-guenther.goetz@stud.uni-bamberg.de>
Date: Mon, 2 Oct 2017 21:21:15 +0200
Subject: [PATCH] integrate data collectors in apps

---
 .gitignore                                    | 133 ++++-
 .../inspectionProfiles/profiles_settings.xml  |   7 +
 .idea/misc.xml                                |   4 +
 .idea/modules.xml                             |   8 +
 .idea/ofu-app.iml                             |  18 +
 .idea/vcs.xml                                 |   6 +
 ofu_app/.idea/workspace.xml                   | 561 +++++++-----------
 .../events/__pycache__/admin.cpython-35.pyc   | Bin 195 -> 281 bytes
 ofu_app/apps/events/admin.py                  |   3 +-
 .../events/management}/__init__.py            |   0
 .../events/management/commands}/__init__.py   |   0
 .../management/commands/import_events.py      |  16 +
 .../events/utils}/__init__.py                 |   0
 .../events/utils/json_generator}/__init__.py  |   0
 .../json_generator/controller_json_events.py  |  38 ++
 .../json_generator/jsons/events-fekide.json   |   1 +
 .../jsons/events-univis-pretty.json           |   0
 .../json_generator/jsons/events-univis.json   |   0
 .../events/utils/migrate_data.py}             |  12 +-
 .../events/utils/parser}/__init__.py          |   0
 .../utils/parser/fekide_eventpage_parser.py}  |   0
 .../utils/parser/univis_eventpage_parser.py}  |   0
 .../utils/parser/univis_json_prettifier.py}   |   0
 .../food/__pycache__/admin.cpython-35.pyc     | Bin 248 -> 412 bytes
 .../food/__pycache__/models.cpython-35.pyc    | Bin 1679 -> 2154 bytes
 .../food/__pycache__/views.cpython-35.pyc     | Bin 1082 -> 1139 bytes
 ofu_app/apps/food/admin.py                    |   5 +
 .../food/management}/__init__.py              |   0
 .../food/management/commands}/__init__.py     |   0
 .../food/management/commands/import_food.py   |  15 +
 ofu_app/apps/food/models.py                   |   9 +
 ofu_app/apps/food/utils/__init__.py           |   0
 .../food/utils/json_generator/__init__.py     |   0
 .../json_generator/controller_json_food.py}   |  32 +-
 .../json_generator/jsons/cafete-erba.json     |   1 +
 .../json_generator/jsons/cafete-markus.json   |   1 +
 .../jsons/happyhourguide-fekide.json          |   1 +
 .../json_generator/jsons/mensa-austr.json     |   1 +
 .../json_generator/jsons/mensa-feki.json      |   1 +
 .../food/utils/migrate_data.py}               |  22 +-
 ofu_app/apps/food/utils/parser/__init__.py    |   0
 .../food/utils/parser/cafete_page_parser.py}  |   0
 .../parser/fekide_happyhour_page_parser.py}   |   0
 .../food/utils/parser/mensa_page_parser.py}   |   4 +
 ofu_app/apps/food/views.py                    |   3 +-
 .../__pycache__/__init__.cpython-35.pyc       | Bin 162 -> 0 bytes
 .../data_collectors/collect_and_migrate.py    |   7 -
 .../__pycache__/__init__.cpython-35.pyc       | Bin 169 -> 0 bytes
 .../__pycache__/migrate-data.cpython-35.pyc   | Bin 1421 -> 0 bytes
 .../__pycache__/__init__.cpython-35.pyc       | Bin 176 -> 0 bytes
 .../controller-json-events.cpython-35.pyc     | Bin 1289 -> 0 bytes
 .../json_generator/controller-json-events.py  |  42 --
 .../json_generator/jsons/events-fekide.json   |   1 -
 .../__pycache__/__init__.cpython-35.pyc       | Bin 176 -> 0 bytes
 .../fekide-eventpage-parser.cpython-35.pyc    | Bin 2595 -> 0 bytes
 .../univis-eventpage-parser.cpython-35.pyc    | Bin 1825 -> 0 bytes
 .../univis-json-prettifier.cpython-35.pyc     | Bin 3764 -> 0 bytes
 .../food/__pycache__/__init__.cpython-35.pyc  | Bin 167 -> 0 bytes
 .../__pycache__/migrate-data.cpython-35.pyc   | Bin 2336 -> 0 bytes
 .../food/json_generator/__init__.pyc          | Bin 176 -> 0 bytes
 .../__pycache__/__init__.cpython-35.pyc       | Bin 172 -> 0 bytes
 .../controller-json-food.cpython-35.pyc       | Bin 2425 -> 0 bytes
 .../json_generator/jsons/cafete-erba.json     |   1 -
 .../json_generator/jsons/cafete-markus.json   |   1 -
 .../jsons/happyhourguide-fekide.json          |   1 -
 .../json_generator/jsons/mensa-austr.json     |   1 -
 .../food/json_generator/jsons/mensa-feki.json |   1 -
 .../__pycache__/__init__.cpython-35.pyc       | Bin 174 -> 0 bytes
 .../cafete-page-parser.cpython-35.pyc         | Bin 1834 -> 0 bytes
 ...ekide-happyhour-page-parser.cpython-35.pyc | Bin 1605 -> 0 bytes
 .../mensa-page-parser.cpython-35.pyc          | Bin 1819 -> 0 bytes
 ofu_app/db.sqlite3                            | Bin 217088 -> 217088 bytes
 .../__pycache__/settings.cpython-35.pyc       | Bin 2859 -> 2873 bytes
 ofu_app/ofu_app/settings.py                   |   5 +-
 74 files changed, 531 insertions(+), 431 deletions(-)
 create mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/ofu-app.iml
 create mode 100644 .idea/vcs.xml
 rename ofu_app/{data_collectors => apps/events/management}/__init__.py (100%)
 rename ofu_app/{data_collectors/events => apps/events/management/commands}/__init__.py (100%)
 create mode 100644 ofu_app/apps/events/management/commands/import_events.py
 rename ofu_app/{data_collectors/events/json_generator => apps/events/utils}/__init__.py (100%)
 rename ofu_app/{data_collectors/events/parser => apps/events/utils/json_generator}/__init__.py (100%)
 create mode 100644 ofu_app/apps/events/utils/json_generator/controller_json_events.py
 create mode 100644 ofu_app/apps/events/utils/json_generator/jsons/events-fekide.json
 rename ofu_app/{data_collectors/events => apps/events/utils}/json_generator/jsons/events-univis-pretty.json (100%)
 rename ofu_app/{data_collectors/events => apps/events/utils}/json_generator/jsons/events-univis.json (100%)
 rename ofu_app/{data_collectors/events/migrate-data.py => apps/events/utils/migrate_data.py} (82%)
 rename ofu_app/{data_collectors/food => apps/events/utils/parser}/__init__.py (100%)
 rename ofu_app/{data_collectors/events/parser/fekide-eventpage-parser.py => apps/events/utils/parser/fekide_eventpage_parser.py} (100%)
 rename ofu_app/{data_collectors/events/parser/univis-eventpage-parser.py => apps/events/utils/parser/univis_eventpage_parser.py} (100%)
 rename ofu_app/{data_collectors/events/parser/univis-json-prettifier.py => apps/events/utils/parser/univis_json_prettifier.py} (100%)
 rename ofu_app/{data_collectors/food/json_generator => apps/food/management}/__init__.py (100%)
 rename ofu_app/{data_collectors/food/parser => apps/food/management/commands}/__init__.py (100%)
 create mode 100644 ofu_app/apps/food/management/commands/import_food.py
 create mode 100644 ofu_app/apps/food/utils/__init__.py
 create mode 100644 ofu_app/apps/food/utils/json_generator/__init__.py
 rename ofu_app/{data_collectors/food/json_generator/controller-json-food.py => apps/food/utils/json_generator/controller_json_food.py} (58%)
 create mode 100644 ofu_app/apps/food/utils/json_generator/jsons/cafete-erba.json
 create mode 100644 ofu_app/apps/food/utils/json_generator/jsons/cafete-markus.json
 create mode 100644 ofu_app/apps/food/utils/json_generator/jsons/happyhourguide-fekide.json
 create mode 100644 ofu_app/apps/food/utils/json_generator/jsons/mensa-austr.json
 create mode 100644 ofu_app/apps/food/utils/json_generator/jsons/mensa-feki.json
 rename ofu_app/{data_collectors/food/migrate-data.py => apps/food/utils/migrate_data.py} (76%)
 create mode 100644 ofu_app/apps/food/utils/parser/__init__.py
 rename ofu_app/{data_collectors/food/parser/cafete-page-parser.py => apps/food/utils/parser/cafete_page_parser.py} (100%)
 rename ofu_app/{data_collectors/food/parser/fekide-happyhour-page-parser.py => apps/food/utils/parser/fekide_happyhour_page_parser.py} (100%)
 rename ofu_app/{data_collectors/food/parser/mensa-page-parser.py => apps/food/utils/parser/mensa_page_parser.py} (81%)
 delete mode 100644 ofu_app/data_collectors/__pycache__/__init__.cpython-35.pyc
 delete mode 100644 ofu_app/data_collectors/collect_and_migrate.py
 delete mode 100644 ofu_app/data_collectors/events/__pycache__/__init__.cpython-35.pyc
 delete mode 100644 ofu_app/data_collectors/events/__pycache__/migrate-data.cpython-35.pyc
 delete mode 100644 ofu_app/data_collectors/events/json_generator/__pycache__/__init__.cpython-35.pyc
 delete mode 100644 ofu_app/data_collectors/events/json_generator/__pycache__/controller-json-events.cpython-35.pyc
 delete mode 100644 ofu_app/data_collectors/events/json_generator/controller-json-events.py
 delete mode 100644 ofu_app/data_collectors/events/json_generator/jsons/events-fekide.json
 delete mode 100644 ofu_app/data_collectors/events/parser/__pycache__/__init__.cpython-35.pyc
 delete mode 100644 ofu_app/data_collectors/events/parser/__pycache__/fekide-eventpage-parser.cpython-35.pyc
 delete mode 100644 ofu_app/data_collectors/events/parser/__pycache__/univis-eventpage-parser.cpython-35.pyc
 delete mode 100644 ofu_app/data_collectors/events/parser/__pycache__/univis-json-prettifier.cpython-35.pyc
 delete mode 100644 ofu_app/data_collectors/food/__pycache__/__init__.cpython-35.pyc
 delete mode 100644 ofu_app/data_collectors/food/__pycache__/migrate-data.cpython-35.pyc
 delete mode 100644 ofu_app/data_collectors/food/json_generator/__init__.pyc
 delete mode 100644 ofu_app/data_collectors/food/json_generator/__pycache__/__init__.cpython-35.pyc
 delete mode 100644 ofu_app/data_collectors/food/json_generator/__pycache__/controller-json-food.cpython-35.pyc
 delete mode 100644 ofu_app/data_collectors/food/json_generator/jsons/cafete-erba.json
 delete mode 100644 ofu_app/data_collectors/food/json_generator/jsons/cafete-markus.json
 delete mode 100644 ofu_app/data_collectors/food/json_generator/jsons/happyhourguide-fekide.json
 delete mode 100644 ofu_app/data_collectors/food/json_generator/jsons/mensa-austr.json
 delete mode 100644 ofu_app/data_collectors/food/json_generator/jsons/mensa-feki.json
 delete mode 100644 ofu_app/data_collectors/food/parser/__pycache__/__init__.cpython-35.pyc
 delete mode 100644 ofu_app/data_collectors/food/parser/__pycache__/cafete-page-parser.cpython-35.pyc
 delete mode 100644 ofu_app/data_collectors/food/parser/__pycache__/fekide-happyhour-page-parser.cpython-35.pyc
 delete mode 100644 ofu_app/data_collectors/food/parser/__pycache__/mensa-page-parser.cpython-35.pyc

diff --git a/.gitignore b/.gitignore
index 0d8bd0a..1c01507 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,19 @@
+# Created by https://www.gitignore.io/api/pycharm,python,django
+
+### Django ###
+*.log
+*.pot
+*.pyc
+__pycache__/
+local_settings.py
+db.sqlite3
+media
+
+# If your build process includes running collectstatic, then you probably don't need or want to include staticfiles/
+# in your Git repository. Update and uncomment the following line accordingly.
+# <django-project-name>/staticfiles/
+
+### PyCharm ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
@@ -31,7 +47,7 @@ cmake-build-debug/
 ## Plugin-specific files:
 
 # IntelliJ
-out/
+/out/
 
 # mpeltonen/sbt-idea plugin
 .idea_modules/
@@ -42,9 +58,124 @@ atlassian-ide-plugin.xml
 # Cursive Clojure plugin
 .idea/replstate.xml
 
+# Ruby plugin and RubyMine
+/.rakeTasks
+
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
 
+### PyCharm Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+
+# Translations
+*.mo
+
+# Django stuff:
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+# End of https://www.gitignore.io/api/pycharm,python,django
+
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..c23ecac
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="useProjectProfile" value="false" />
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..4e1dbee
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.5.3 (/usr/bin/python3.5)" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..a083734
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/ofu-app.iml" filepath="$PROJECT_DIR$/.idea/ofu-app.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/ofu-app.iml b/.idea/ofu-app.iml
new file mode 100644
index 0000000..e6087c0
--- /dev/null
+++ b/.idea/ofu-app.iml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_FOLDERS">
+      <list>
+        <option value="$MODULE_DIR$/ofu_app/templates" />
+      </list>
+    </option>
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/ofu_app/.idea/workspace.xml b/ofu_app/.idea/workspace.xml
index f4f4a25..b748b12 100644
--- a/ofu_app/.idea/workspace.xml
+++ b/ofu_app/.idea/workspace.xml
@@ -13,9 +13,10 @@
     <SUITE FILE_PATH="coverage/ofu_app$controller_json_food.coverage" NAME="controller-json-food Coverage Results" MODIFIED="1506703105217" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/data_collectors/food/json_generator" />
     <SUITE FILE_PATH="coverage/ofu_app$fekide_eventpage_parser.coverage" NAME="fekide-eventpage-parser Coverage Results" MODIFIED="1506732818806" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/data_collectors/events/parser" />
     <SUITE FILE_PATH="coverage/ofu_app$migrate_data__1_.coverage" NAME="migrate-data (1) Coverage Results" MODIFIED="1506734928822" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/data_collectors/events" />
-    <SUITE FILE_PATH="coverage/ofu_app$collect_and_migrate.coverage" NAME="collect_and_migrate Coverage Results" MODIFIED="1506815482638" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/data_collectors" />
+    <SUITE FILE_PATH="coverage/ofu_app$collect_and_migrate.coverage" NAME="collect_and_migrate Coverage Results" MODIFIED="1506956141616" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/data_collectors" />
     <SUITE FILE_PATH="coverage/ofu_app$migrate_data.coverage" NAME="migrate-data Coverage Results" MODIFIED="1506814046322" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/data_collectors/food" />
     <SUITE FILE_PATH="coverage/ofu_app$controller_json_events.coverage" NAME="controller-json-events Coverage Results" MODIFIED="1506733064332" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/data_collectors/events/json_generator" />
+    <SUITE FILE_PATH="coverage/ofu_app$mensa_page_parser.coverage" NAME="mensa_page_parser Coverage Results" MODIFIED="1506961724724" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/apps/food/utils/parser" />
   </component>
   <component name="DjangoConsoleOptions" custom-start-script="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)">
     <option name="myCustomStartScript" value="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)" />
@@ -23,24 +24,24 @@
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="settings.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/ofu_app/settings.py">
+      <file leaf-file-name="views.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/apps/food/views.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="70" />
-              <folding />
+            <state relative-caret-position="160">
+              <caret line="12" column="58" lean-forward="false" selection-start-line="12" selection-start-column="58" selection-end-line="12" selection-end-column="58" />
+              <folding>
+                <element signature="e#24#63#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="models.py" pinned="false" current-in-tab="false">
+      <file leaf-file-name="models.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/apps/food/models.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="200">
-              <caret line="12" column="12" lean-forward="false" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="12" />
-              <folding>
-                <element signature="e#24#63#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="356">
+              <caret line="39" column="43" lean-forward="false" selection-start-line="39" selection-start-column="43" selection-end-line="39" selection-end-column="43" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -55,76 +56,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="collect_and_migrate.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/data_collectors/collect_and_migrate.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="100">
-              <caret line="5" column="69" lean-forward="false" selection-start-line="5" selection-start-column="69" selection-end-line="5" selection-end-column="69" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="migrate-data.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/data_collectors/events/migrate-data.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="96">
-              <caret line="12" column="2" lean-forward="false" selection-start-line="12" selection-start-column="2" selection-end-line="12" selection-end-column="2" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="controller-json-food.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/data_collectors/food/json_generator/controller-json-food.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="160">
-              <caret line="8" column="24" lean-forward="true" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="46" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="controller-json-events.py" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/data_collectors/events/json_generator/controller-json-events.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="700">
-              <caret line="35" column="33" lean-forward="false" selection-start-line="35" selection-start-column="33" selection-end-line="35" selection-end-column="33" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="food.jinja" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/food/food.jinja">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="3" column="11" lean-forward="false" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="week_events.jinja" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/events/week_events.jinja">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="80">
-              <caret line="4" column="11" lean-forward="false" selection-start-line="4" selection-start-column="11" selection-end-line="4" selection-end-column="11" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="base.jinja" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/base.jinja">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="460">
-              <caret line="23" column="24" lean-forward="false" selection-start-line="23" selection-start-column="17" selection-end-line="23" selection-end-column="24" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -152,7 +83,6 @@
         <option value="$PROJECT_DIR$/events/urls.py" />
         <option value="$PROJECT_DIR$/ofu_app/urls.py" />
         <option value="$PROJECT_DIR$/events/views.py" />
-        <option value="$PROJECT_DIR$/ofu_app/settings.py" />
         <option value="$PROJECT_DIR$/food/views.py" />
         <option value="$PROJECT_DIR$/templates/base.jinja" />
         <option value="$PROJECT_DIR$/templates/events/week_events.jinja" />
@@ -160,9 +90,22 @@
         <option value="$PROJECT_DIR$/templates/food/food.jinja" />
         <option value="$PROJECT_DIR$/data_collectors/food/migrate-data.py" />
         <option value="$PROJECT_DIR$/data_collectors/events/migrate-data.py" />
-        <option value="$PROJECT_DIR$/data_collectors/collect_and_migrate.py" />
-        <option value="$PROJECT_DIR$/data_collectors/food/json_generator/controller-json-food.py" />
+        <option value="$PROJECT_DIR$/apps/events/views.py" />
         <option value="$PROJECT_DIR$/data_collectors/events/json_generator/controller-json-events.py" />
+        <option value="$PROJECT_DIR$/data_collectors/food/json_generator/controller-json-food.py" />
+        <option value="$PROJECT_DIR$/data_collectors/collect_and_migrate.py" />
+        <option value="$PROJECT_DIR$/apps/food/management/commands/import.py" />
+        <option value="$PROJECT_DIR$/data_collectors/events/migrate_data.py" />
+        <option value="$PROJECT_DIR$/apps/events/management/commands/import.py" />
+        <option value="$PROJECT_DIR$/apps/events/utils/json_generator/controller_json_events.py" />
+        <option value="$PROJECT_DIR$/apps/food/utils/json_generator/controller_json_food.py" />
+        <option value="$PROJECT_DIR$/apps/food/utils/parser/mensa_page_parser.py" />
+        <option value="$PROJECT_DIR$/apps/food/utils/migrate_data.py" />
+        <option value="$PROJECT_DIR$/apps/events/admin.py" />
+        <option value="$PROJECT_DIR$/ofu_app/settings.py" />
+        <option value="$PROJECT_DIR$/apps/food/admin.py" />
+        <option value="$PROJECT_DIR$/apps/food/views.py" />
+        <option value="$PROJECT_DIR$/apps/food/models.py" />
       </list>
     </option>
   </component>
@@ -192,6 +135,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scratches" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -204,126 +149,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ofu_app" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ofu_app" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="data_collectors" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ofu_app" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ofu_app" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="data_collectors" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="food" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ofu_app" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ofu_app" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="data_collectors" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="food" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="json_generator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ofu_app" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ofu_app" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="data_collectors" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="food" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="json_generator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="jsons" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ofu_app" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ofu_app" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="data_collectors" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="events" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ofu_app" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ofu_app" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="data_collectors" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="events" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="json_generator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="ofu_app" />
@@ -340,8 +165,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -350,14 +173,19 @@
     <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/apps" />
-    </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/apps/events" />
       <recent name="$PROJECT_DIR$/data_collectors/events/parser" />
       <recent name="$PROJECT_DIR$/food/static" />
       <recent name="$PROJECT_DIR$/data_collectors/food/parser" />
     </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/apps/events/utils" />
+      <recent name="$PROJECT_DIR$/apps/food/utils" />
+      <recent name="$PROJECT_DIR$/apps/food" />
+      <recent name="$PROJECT_DIR$/apps/food/management/utils" />
+      <recent name="$PROJECT_DIR$/apps" />
+    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -371,7 +199,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Python.collect_and_migrate">
+  <component name="RunManager" selected="Python.mensa_page_parser">
     <configuration default="false" name="migrate-data" type="PythonConfigurationType" factoryName="Python" activateToolWindowBeforeRun="false" temporary="true">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -385,7 +213,7 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <module name="ofu_app" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/data_collectors/food/migrate-data.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/apps/food/utils/migrate_data.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -404,26 +232,7 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <module name="ofu_app" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/data_collectors/events/json_generator/controller-json-events.py" />
-      <option name="PARAMETERS" value="" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <method />
-    </configuration>
-    <configuration default="false" name="fekide-eventpage-parser" type="PythonConfigurationType" factoryName="Python" temporary="true">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="/usr/bin/python3.5" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/data_collectors/events/parser" />
-      <option name="IS_MODULE_SDK" value="true" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="ofu_app" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/data_collectors/events/parser/fekide-eventpage-parser.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/data_collectors/events/json_generator/controller_json_events.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -442,7 +251,7 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <module name="ofu_app" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/data_collectors/events/migrate-data.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/apps/events/utils/migrate_data.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -467,6 +276,25 @@
       <option name="EMULATE_TERMINAL" value="false" />
       <method />
     </configuration>
+    <configuration default="false" name="mensa_page_parser" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="/usr/bin/python3.5" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/apps/food/utils/parser" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="ofu_app" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/apps/food/utils/parser/mensa_page_parser.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <method />
+    </configuration>
     <configuration default="true" type="DjangoTestsConfigurationType" factoryName="Django tests">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -665,17 +493,17 @@
       <item index="0" class="java.lang.String" itemvalue="Django server.ofu_app" />
       <item index="1" class="java.lang.String" itemvalue="Python.migrate-data" />
       <item index="2" class="java.lang.String" itemvalue="Python.controller-json-events" />
-      <item index="3" class="java.lang.String" itemvalue="Python.fekide-eventpage-parser" />
-      <item index="4" class="java.lang.String" itemvalue="Python.migrate-data (1)" />
-      <item index="5" class="java.lang.String" itemvalue="Python.collect_and_migrate" />
+      <item index="3" class="java.lang.String" itemvalue="Python.migrate-data (1)" />
+      <item index="4" class="java.lang.String" itemvalue="Python.collect_and_migrate" />
+      <item index="5" class="java.lang.String" itemvalue="Python.mensa_page_parser" />
     </list>
     <recent_temporary>
       <list size="5">
-        <item index="0" class="java.lang.String" itemvalue="Python.collect_and_migrate" />
-        <item index="1" class="java.lang.String" itemvalue="Python.migrate-data" />
-        <item index="2" class="java.lang.String" itemvalue="Python.migrate-data (1)" />
-        <item index="3" class="java.lang.String" itemvalue="Python.controller-json-events" />
-        <item index="4" class="java.lang.String" itemvalue="Python.fekide-eventpage-parser" />
+        <item index="0" class="java.lang.String" itemvalue="Python.mensa_page_parser" />
+        <item index="1" class="java.lang.String" itemvalue="Python.collect_and_migrate" />
+        <item index="2" class="java.lang.String" itemvalue="Python.migrate-data" />
+        <item index="3" class="java.lang.String" itemvalue="Python.migrate-data (1)" />
+        <item index="4" class="java.lang.String" itemvalue="Python.controller-json-events" />
       </list>
     </recent_temporary>
   </component>
@@ -703,19 +531,18 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="27" width="1920" height="1053" extended-state="7" />
-    <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2628205" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26602563" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32896176" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32896176" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32896176" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -734,11 +561,27 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="3" />
+      <option name="time" value="4" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/templates/food/food.jinja">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="3" column="11" lean-forward="false" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/data_collectors/collect_and_migrate.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="100">
+          <caret line="5" column="72" lean-forward="true" selection-start-line="5" selection-start-column="72" selection-end-line="5" selection-end-column="72" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/ofu_app/settings.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2980">
@@ -752,7 +595,7 @@
         <state relative-caret-position="200">
           <caret line="12" column="12" lean-forward="false" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="12" />
           <folding>
-            <element signature="e#24#63#0" expanded="true" />
+            <element signature="e#24#63#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -769,7 +612,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="80">
           <caret line="4" column="11" lean-forward="false" selection-start-line="4" selection-start-column="11" selection-end-line="4" selection-end-column="11" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -777,7 +619,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="460">
           <caret line="23" column="24" lean-forward="false" selection-start-line="23" selection-start-column="17" selection-end-line="23" selection-end-column="24" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -810,7 +651,7 @@
         <state relative-caret-position="200">
           <caret line="12" column="12" lean-forward="false" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="12" />
           <folding>
-            <element signature="e#24#63#0" expanded="true" />
+            <element signature="e#24#63#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -827,7 +668,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="80">
           <caret line="4" column="11" lean-forward="false" selection-start-line="4" selection-start-column="11" selection-end-line="4" selection-end-column="11" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -835,7 +675,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="460">
           <caret line="23" column="24" lean-forward="false" selection-start-line="23" selection-start-column="17" selection-end-line="23" selection-end-column="24" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -868,19 +707,19 @@
         <state relative-caret-position="480">
           <caret line="24" column="69" lean-forward="false" selection-start-line="24" selection-start-column="69" selection-end-line="24" selection-end-column="69" />
           <folding>
-            <element signature="e#24#63#0" expanded="true" />
+            <element signature="e#24#63#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data_collectors/food/migrate-data.py">
+    <entry file="file://$PROJECT_DIR$/apps/food/utils/migrate_data.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="20">
           <caret line="1" column="24" lean-forward="true" selection-start-line="1" selection-start-column="24" selection-end-line="1" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data_collectors/food/parser/cafete-page-parser.py">
+    <entry file="file://$PROJECT_DIR$/apps/food/utils/parser/cafete_page_parser.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -900,34 +739,20 @@
         <state relative-caret-position="460">
           <caret line="23" column="4" lean-forward="false" selection-start-line="23" selection-start-column="4" selection-end-line="23" selection-end-column="4" />
           <folding>
-            <element signature="e#24#63#0" expanded="true" />
+            <element signature="e#24#63#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/food/static/bootstrap-4.0.0-beta-dist/js/bootstrap.js" />
-    <entry file="file://$PROJECT_DIR$/data_collectors/food/parser/fekide-happyhour-page-parser.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-564">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/data_collectors/food/parser/mensa-page-parser.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-40">
-          <caret line="22" column="25" lean-forward="false" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/data_collectors/events/parser/univis-json-prettifier.py">
+    <entry file="file://$PROJECT_DIR$/apps/events/utils/parser/univis_json_prettifier.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="296">
           <caret line="136" column="29" lean-forward="false" selection-start-line="136" selection-start-column="20" selection-end-line="136" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data_collectors/events/parser/fekide-eventpage-parser.py">
+    <entry file="file://$PROJECT_DIR$/apps/events/utils/parser/fekide_eventpage_parser.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1136">
           <caret line="71" column="2" lean-forward="false" selection-start-line="71" selection-start-column="2" selection-end-line="71" selection-end-column="2" />
@@ -969,34 +794,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/apps/events/views.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="8" column="23" lean-forward="false" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/data_collectors/food/parser/cafete-page-parser.py">
+    <entry file="file://$PROJECT_DIR$/apps/food/utils/parser/cafete_page_parser.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
           <caret line="33" column="28" lean-forward="false" selection-start-line="33" selection-start-column="25" selection-end-line="33" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/apps/food/views.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="12" column="35" lean-forward="false" selection-start-line="12" selection-start-column="35" selection-end-line="12" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/events/week_events.jinja">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="80">
           <caret line="4" column="11" lean-forward="false" selection-start-line="4" selection-start-column="11" selection-end-line="4" selection-end-column="11" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1004,33 +812,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="460">
           <caret line="23" column="24" lean-forward="false" selection-start-line="23" selection-start-column="17" selection-end-line="23" selection-end-column="24" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/ofu_app/settings.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="70" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/food/models.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="12" column="12" lean-forward="false" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="12" />
-          <folding>
-            <element signature="e#24#63#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/food/daily_food.jinja">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="4" column="8" lean-forward="false" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="8" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1042,44 +823,162 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data_collectors/food/migrate-data.py">
+    <entry file="file://$PROJECT_DIR$/apps/events/utils/parser/univis_eventpage_parser.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="2" lean-forward="false" selection-start-line="12" selection-start-column="2" selection-end-line="12" selection-end-column="2" />
+        <state relative-caret-position="60">
+          <caret line="6" column="74" lean-forward="false" selection-start-line="6" selection-start-column="18" selection-end-line="6" selection-end-column="74" />
+          <folding>
+            <element signature="e#0#15#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/data_collectors/collect_and_migrate.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="40">
+          <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/food/management/commands/import_food.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="260">
+          <caret line="13" column="25" lean-forward="false" selection-start-line="13" selection-start-column="25" selection-end-line="13" selection-end-column="25" />
+          <folding>
+            <element signature="e#0#65#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ofu_app/wsgi.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/events/views.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="80">
+          <caret line="4" column="23" lean-forward="false" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/events/utils/migrate_data.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="617">
+          <caret line="31" column="0" lean-forward="true" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
           <folding>
             <element signature="e#0#11#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data_collectors/events/migrate-data.py">
+    <entry file="file://$PROJECT_DIR$/apps/events/management/commands/import_events.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
-          <caret line="12" column="2" lean-forward="false" selection-start-line="12" selection-start-column="2" selection-end-line="12" selection-end-column="2" />
+        <state relative-caret-position="240">
+          <caret line="12" column="39" lean-forward="false" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" />
+          <folding>
+            <element signature="e#0#65#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/events/utils/json_generator/controller_json_events.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="660">
+          <caret line="33" column="40" lean-forward="false" selection-start-line="33" selection-start-column="40" selection-end-line="33" selection-end-column="40" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data_collectors/collect_and_migrate.py">
+    <entry file="file://$PROJECT_DIR$/apps/food/utils/parser/mensa_page_parser.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="100">
-          <caret line="5" column="69" lean-forward="false" selection-start-line="5" selection-start-column="69" selection-end-line="5" selection-end-column="69" />
+        <state relative-caret-position="40">
+          <caret line="5" column="0" lean-forward="false" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data_collectors/food/json_generator/controller-json-food.py">
+    <entry file="file://$PROJECT_DIR$/templates/food/daily_food.jinja">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="80">
+          <caret line="4" column="8" lean-forward="false" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="8" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/food/utils/migrate_data.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="29" column="30" lean-forward="true" selection-start-line="29" selection-start-column="30" selection-end-line="29" selection-end-column="30" />
+          <folding>
+            <element signature="e#0#11#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/events/admin.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="3" column="25" lean-forward="false" selection-start-line="3" selection-start-column="25" selection-end-line="3" selection-end-column="25" />
+          <folding>
+            <element signature="e#0#32#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ofu_app/settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="39" column="1" lean-forward="false" selection-start-line="39" selection-start-column="1" selection-end-line="39" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/food/admin.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="9" column="29" lean-forward="false" selection-start-line="9" selection-start-column="29" selection-end-line="9" selection-end-column="29" />
+          <folding>
+            <element signature="e#24#63#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/food/views.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="160">
-          <caret line="8" column="24" lean-forward="true" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="46" />
+          <caret line="12" column="58" lean-forward="false" selection-start-line="12" selection-start-column="58" selection-end-line="12" selection-end-column="58" />
+          <folding>
+            <element signature="e#24#63#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/food/utils/parser/fekide_happyhour_page_parser.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-564">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data_collectors/events/json_generator/controller-json-events.py">
+    <entry file="file://$PROJECT_DIR$/apps/food/utils/json_generator/controller_json_food.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="700">
-          <caret line="35" column="33" lean-forward="false" selection-start-line="35" selection-start-column="33" selection-end-line="35" selection-end-column="33" />
+        <state relative-caret-position="200">
+          <caret line="10" column="21" lean-forward="true" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="50" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/food/models.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="356">
+          <caret line="39" column="43" lean-forward="false" selection-start-line="39" selection-start-column="43" selection-end-line="39" selection-end-column="43" />
           <folding />
         </state>
       </provider>
diff --git a/ofu_app/apps/events/__pycache__/admin.cpython-35.pyc b/ofu_app/apps/events/__pycache__/admin.cpython-35.pyc
index 998e593fdc4ef43bf9c2f7501c500cd060e73d65..8da690bd4b61b6a9df90c36f2f3402ad2cf50529 100644
GIT binary patch
delta 207
zcmX@iIFqSfoR^nNDfd!jEdv9?V<3hDCLqfJh>J~tL<$fwGUPBY<T5fuF)}cM_)H8r
zObofq3{lJsjH!$aSu6}$tPH8l49y^UW`<x*mX|=C44RC$SQArnGxI<U*Rs^S5<gA0
zD87`e#Ju!;J-g)mypp2Kq#}@YQ9_9Y1;u))AVtM`x%nxnImJcHK#5x{#hE3kw>XMY
d(=&@pQj1nH6tMw?i`XV+hj6d}Sptj#OaR(MEo1-y

delta 120
zcmbQqbeJ()oR^nN@a?%sdj<xE$3P4ROhA?c5EqL8i4-7WWXNG)$Yo@RVq{=UVPXi@
zWPS;hVbEl}#hRFso0;dQ$rQzxl9ia3p0AgjpI1_pnN$QaWF<opGmt7`p13!J1*8K2
D0^b)E

diff --git a/ofu_app/apps/events/admin.py b/ofu_app/apps/events/admin.py
index 8c38f3f..74ee734 100644
--- a/ofu_app/apps/events/admin.py
+++ b/ofu_app/apps/events/admin.py
@@ -1,3 +1,4 @@
 from django.contrib import admin
-
+from apps.events.models import Event
 # Register your models here.
+admin.site.register(Event)
\ No newline at end of file
diff --git a/ofu_app/data_collectors/__init__.py b/ofu_app/apps/events/management/__init__.py
similarity index 100%
rename from ofu_app/data_collectors/__init__.py
rename to ofu_app/apps/events/management/__init__.py
diff --git a/ofu_app/data_collectors/events/__init__.py b/ofu_app/apps/events/management/commands/__init__.py
similarity index 100%
rename from ofu_app/data_collectors/events/__init__.py
rename to ofu_app/apps/events/management/commands/__init__.py
diff --git a/ofu_app/apps/events/management/commands/import_events.py b/ofu_app/apps/events/management/commands/import_events.py
new file mode 100644
index 0000000..d8ca178
--- /dev/null
+++ b/ofu_app/apps/events/management/commands/import_events.py
@@ -0,0 +1,16 @@
+from django.core.management.base import BaseCommand, CommandError
+from apps.events.models import Event
+from apps.events.utils.json_generator import controller_json_events
+from apps.events.utils import migrate_data
+
+
+class Command(BaseCommand):
+    help = "Imports Food from special Websites"
+
+    def add_arguments(self, parser):
+        pass
+
+    def handle(self, *args, **options):
+        controller_json_events.main("apps/events/utils/json_generator/jsons/")
+        migrate_data.main("apps/events/utils/json_generator/jsons/")
+        self.stdout.write(self.style.SUCCESS('Successfully migrate data'))
diff --git a/ofu_app/data_collectors/events/json_generator/__init__.py b/ofu_app/apps/events/utils/__init__.py
similarity index 100%
rename from ofu_app/data_collectors/events/json_generator/__init__.py
rename to ofu_app/apps/events/utils/__init__.py
diff --git a/ofu_app/data_collectors/events/parser/__init__.py b/ofu_app/apps/events/utils/json_generator/__init__.py
similarity index 100%
rename from ofu_app/data_collectors/events/parser/__init__.py
rename to ofu_app/apps/events/utils/json_generator/__init__.py
diff --git a/ofu_app/apps/events/utils/json_generator/controller_json_events.py b/ofu_app/apps/events/utils/json_generator/controller_json_events.py
new file mode 100644
index 0000000..3a78a8b
--- /dev/null
+++ b/ofu_app/apps/events/utils/json_generator/controller_json_events.py
@@ -0,0 +1,38 @@
+from apps.events.utils.parser import fekide_eventpage_parser, univis_eventpage_parser, univis_json_prettifier
+
+# CONFIG
+JSON_OUTPUT_DIR_EVENTS = "./events/json_generator/jsons/"
+
+
+def writeToFile(jsonfile, root, filename):
+    with open((root + filename), "w") as file:
+        file.write(jsonfile)
+
+
+def main(path=JSON_OUTPUT_DIR_EVENTS):
+    try:
+        json_events_univis = univis_eventpage_parser.parsePage()
+    except Exception as err:
+        print(err.args)
+        json_events_univis = "{}"
+
+    writeToFile(json_events_univis, path, "events-univis.json")
+
+    try:
+        json_events_univis_pretty = univis_json_prettifier.prettify(path + "events-univis.json")
+    except Exception as err:
+        print(err.args)
+        json_events_univis_pretty = "{}"
+
+    try:
+        json_events_fekide = fekide_eventpage_parser.parsePage()
+    except:
+        print("Error")
+        json_events_fekide = "{}"
+
+    writeToFile(json_events_univis_pretty, path, "events-univis-pretty.json")
+    writeToFile(json_events_fekide, path, "events-fekide.json")
+
+
+if __name__ == '__main__':
+    main()
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
new file mode 100644
index 0000000..ed7fa68
--- /dev/null
+++ b/ofu_app/apps/events/utils/json_generator/jsons/events-fekide.json
@@ -0,0 +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
diff --git a/ofu_app/data_collectors/events/json_generator/jsons/events-univis-pretty.json b/ofu_app/apps/events/utils/json_generator/jsons/events-univis-pretty.json
similarity index 100%
rename from ofu_app/data_collectors/events/json_generator/jsons/events-univis-pretty.json
rename to ofu_app/apps/events/utils/json_generator/jsons/events-univis-pretty.json
diff --git a/ofu_app/data_collectors/events/json_generator/jsons/events-univis.json b/ofu_app/apps/events/utils/json_generator/jsons/events-univis.json
similarity index 100%
rename from ofu_app/data_collectors/events/json_generator/jsons/events-univis.json
rename to ofu_app/apps/events/utils/json_generator/jsons/events-univis.json
diff --git a/ofu_app/data_collectors/events/migrate-data.py b/ofu_app/apps/events/utils/migrate_data.py
similarity index 82%
rename from ofu_app/data_collectors/events/migrate-data.py
rename to ofu_app/apps/events/utils/migrate_data.py
index dd3b632..a1a8e64 100644
--- a/ofu_app/data_collectors/events/migrate-data.py
+++ b/ofu_app/apps/events/utils/migrate_data.py
@@ -1,13 +1,8 @@
 import json
 from datetime import datetime
 from pprint import pprint
-
-import django
-import os
 from django.db.utils import IntegrityError
 
-os.environ['DJANGO_SETTINGS_MODULE'] = 'ofu_app.settings'
-django.setup()
 from apps.events.models import Event
 
 # JSON_FILES_PATH_EVENTS = "json_generator/jsons/"
@@ -31,11 +26,12 @@ def writeFekideDataInDB(data):
                 break
 
 
-def main():
+def main(path=JSON_FILES_PATH_EVENTS):
     # get food jsons
-    writeFekideDataInDB(getJsonFromFile(JSON_FILES_PATH_EVENTS + "events-fekide.json"))
+    writeFekideDataInDB(getJsonFromFile(path + "events-fekide.json"))
 
     pprint("Event: " + str(Event.objects.count()))
 
 
-main()
+if __name__ == '__main__':
+    main()
diff --git a/ofu_app/data_collectors/food/__init__.py b/ofu_app/apps/events/utils/parser/__init__.py
similarity index 100%
rename from ofu_app/data_collectors/food/__init__.py
rename to ofu_app/apps/events/utils/parser/__init__.py
diff --git a/ofu_app/data_collectors/events/parser/fekide-eventpage-parser.py b/ofu_app/apps/events/utils/parser/fekide_eventpage_parser.py
similarity index 100%
rename from ofu_app/data_collectors/events/parser/fekide-eventpage-parser.py
rename to ofu_app/apps/events/utils/parser/fekide_eventpage_parser.py
diff --git a/ofu_app/data_collectors/events/parser/univis-eventpage-parser.py b/ofu_app/apps/events/utils/parser/univis_eventpage_parser.py
similarity index 100%
rename from ofu_app/data_collectors/events/parser/univis-eventpage-parser.py
rename to ofu_app/apps/events/utils/parser/univis_eventpage_parser.py
diff --git a/ofu_app/data_collectors/events/parser/univis-json-prettifier.py b/ofu_app/apps/events/utils/parser/univis_json_prettifier.py
similarity index 100%
rename from ofu_app/data_collectors/events/parser/univis-json-prettifier.py
rename to ofu_app/apps/events/utils/parser/univis_json_prettifier.py
diff --git a/ofu_app/apps/food/__pycache__/admin.cpython-35.pyc b/ofu_app/apps/food/__pycache__/admin.cpython-35.pyc
index 2d70e0346a1003bce56ff5f663cf29a203f0de77..08f04512eaf14adc8f2071c629fc195e2035ebbd 100644
GIT binary patch
delta 243
zcmeytIEPtToR^m?J?~PaFe3xQV+JI^1Y|n^adE*!WtBh%h7@Lo92SOLR)#26hFms=
zC^m*%c7`Z+2F6rohAa+-EKY`0R)%IqWIh`jpB>CkVPOc?WS!`vq@>Awiz_%YFFhyK
zEk8fy7K?9cUg<4PkHmt4N{{@~B0o*8iG^xbQ361LV!bq=6208~l+>K!A{L;#idaDe
u8<4ogQk+?mdW)kdH9fPqB(-QILlGB9j%(tAAU+UFfJuN+hFO47fDr%_XEUY%

delta 80
zcmbQk{DV<hoR^nN#O7RN0|NuYV<3hDCLqfJh>KMwDyy(EGX!h0Oq`*_><6UosBx}j
UC}IUl7O_sYVGLpesTE)X05FLSLI3~&

diff --git a/ofu_app/apps/food/__pycache__/models.cpython-35.pyc b/ofu_app/apps/food/__pycache__/models.cpython-35.pyc
index 4b2e729c143faf5b86bc5407e90f73037a43b4fb..cb8e490f1e13a729699a6b8b789692b2a03b0856 100644
GIT binary patch
literal 2154
zcma)7OLOBy5N<teOR^m&fn+y4ia=G05(V*{+5&Iwl7y;_FV2DWMWwaIj=XwgM^Y_G
zaSQNExbSy4&XrUC0w?+#<sm1_L-w?0dfGGHUw40g)bD$r{rbntE1T#~YCOEA5s%^*
z77>39N{CW}rUn^Uo0OQ8S~RulwMB_dX^W;UUfVQn(_z%2s7*h!ahpVomL0ledxtkV
z6ghgsX>7Q>;Zo%34X?4`QPic0-@9U0$T!q_mBq6>5<wD|LWW7fI;V_Nagk?&=k1g?
zlj7<Lo6qo@o5$kGh)403g&@Sjp-fE@7A<YW$YEWQ!7)J7rpO}Ep{1jhu2!-$Hi@p*
z^t7f=9Oxw@vxY!9Hja2Y;9wl$co4ozmnKcu5!=M?D*ISumFk|!I1S}_@LHUos7@s2
zVU?81OT!<7L}ZKdRC$v)TO{Hj&!d^aF5|%)aXjNuY_lkdej-{Lv@{U`JHp?IZ;mgV
zy=Z?g-QRoZTgoa*sq82$g>ra02V4x5U5I4<JIMhb^w+n;(>xW!G@hNti^cGH{<=y<
zR*K=__b0=AUVRmwo#7qe&7&C3*|TAd_Ws$q>I4Cw9R%y}&16BwMGwL5UvI2r0|p}=
zI*MjC7+|g{#(v_rE?oWlV^M~($HvM@@>y8Mc{cV<t&y9o_HE?^K^CSW2$UBD>{FFs
z-V1^^RhV4w47hUMR3a$zg(y#j)NwZi97lS}@I5#N4||4u#ILcxA)%A+Lu^6VER_4S
zD)WO_B#|=XNV(4$VZD?{lCrY=ZSA-F>@<|Mp?CcBhv3C`<HM69?YtTshuQf_4yi4s
zHsfB&4cvmu8y+H25^l;i3y((uSbD~$vBhIx_AI@#f^>^5Mld~K(M0-R>Yh6Rh0Z-o
zCim=ZFHgBeJDeFu;&RzxaiZEauF~bzN~HopU8#MZ+*YbCPy-3<vRc{5j&H~{UNl10
zQ38VxdEAuK=3PtN6xG=G-jy2p7{~2Ed<5|^#4d!!RReh^^ks+$co)DHkUlnblq+B&
zuOk@!#^Qg1d7nh?F$<I3L%Qi|Wlv|Jujyv(fo9Oi%lay>f^jxLJrmzk?h&`^`B7fU
zI$_db-ydcRq3LV^E9MgLil!FOV!bqJZqoL|x5gLSsP(UR_lhrfUtISjR!loDHSI*c
zRW~SdUw7$0=lFBBxykXyt+zKRUP%CIY6NqzUo!zKys>t7$SrwjC+_ja{nEjqjUv43
zHx$MfxEA-{vcl&5--8tzrS}1rz*VA(H6By9U@|Mgz^Ws%2$M#Mg3eSo62(l$XCS)&
z;DJxs{u3SrO1S2MEzJd+-~#N9`9Fs_abA^`WKNU_K=q<!m@V@Cs*IDOCM)+^6}{5j
oraMNpj`3%zIi>D+ocJz)l=Gx!-EVNdW~Ft5KW5wB>F+py1Ed~|K>z>%

delta 805
zcmZ{i&2G~`5XaZ+kJwJqI4Pk72@nz&w`vasRjBF#gi3NCz9a|eC9<*$SWWD7Z6A8d
z0qzyr3$MU~aODB^5s>&eab{-S4+zE5{yn=pGdnxK{TiG#{f%bR-~0aM)i3jd|IIj-
zKg~_~#t!7Jai`a34q-L&o}j*?<fuiMOGcq53u8|%=)rAevAE#Mon_OwNU}5vsi+e|
zL_>b2``#xa+Bj=Vj~+g-hP;RanCBFvVTg73MPVSC=(C2>l8?>pC1z0Gv$wH$p70q{
z{_yF`$&16NKOTq%?zM(-dOFTfD-UbV(^BU<KM<4YqdRChAU=#7rD1f8E{qn{>r+^|
z{A{qEpyd0|iG$@RbOgqT8pv2VWtyCnTzD{xLhsMQ(aA!&fzm~}h0+62RvORwwUuFV
zjL0z-E7Qka)FgN8HRIzslcPs{W)nbyJRHp<Kro}wRo)<8EKUbmDXL0^3+Z&3GNTWr
zasu5{-MuSD;1gP_mq0+*mWs6Q!}yzCdo_Ng2{$pFNyw6j4KypZc@c}ENakGCc*@YY
z>Q;rg&Uii*$pT;1|H0mcl-S`MUrz<LtKoL2z`ZD}D}OS1T^903ZD&ivu!kArGtItY
Qi;n-?SPtBKrr)!F18y9UQvd(}

diff --git a/ofu_app/apps/food/__pycache__/views.cpython-35.pyc b/ofu_app/apps/food/__pycache__/views.cpython-35.pyc
index e416cfbae1690a06931f569998916e0ea5ba4681..ce92ef0929fdc8e1ab064d01b15729c4d3172de7 100644
GIT binary patch
delta 484
zcmZWkyGjE=6g{&u`_5`1VUsl&1RwYXwpKQRjW*hZz^s_XB(jcZu^~llEM@*du+-8&
zh^6KJfLQwj-ianI$P9;b&zyVjnOE=23*smW_V3<Lw#7p*9e)5&Kt`8g^204i;tcVK
zL2+aPnGI>7Fb*~%V$Bo|DU6airgOwAx?RylMK{j5-zI%LALLdZ94PnSRu{@cL1}yw
zji~?yAU#Om<dRgnkfCwN8VUg!p`g@DC>-=?EyvN$^5LgN|2++5SEZd!dfU}6>~S?L
zJtL@IKP~xScvJd@%Jf2Y^|`ekmG))c8>mwB)4{dAw>DcoP00fTp@EtKkKhS;tlzBT
zjWsI3TCC0*zo*V3<}+t;@}}P72U~U18ZV$htQ2R%p==YoGHJo`L_hPGMS9A2lO`#7
PV&Jc9#u_>iZMO0aD@0k)

delta 488
zcmZXPKT88K7{;Icxx4gw)oQ)!P#gq7H=P8LegVNn9h{D8uF#|PAeSOSii4j(?o&9r
zIyngrg7bY1aW^To97w{$lV9HV$(wKSD#FcHE8IKyy82;H;m5-#01aez6FdSl0!@)I
zWE_&fI7ns`#zIRdBy%M5=EbbWd5!ZLca?wjUXA;XUoL`tX#d}<0dxQZ$N*BfQDg(g
z`VfXeHeu{Q5sU}fg7Go3i45oaD`(|9c{vo7kOQ6S(Il<dZGNY?{c08D*I9a_i^?C4
z#yV9M9}fzxJbPEZ(cPY~Mm3y-PMS^vE6-4!lCX=No;`r9l9+5QR!kbiUoI7w_w2O4
z<{CRo*|4tS!#tPU))mwWi0WG1534XqhEqLNX_6>+qoR`XqvP0FS5nKFC(gsf$t0K4
TaoTqsg&Vd_Big229<BcZr|4JR

diff --git a/ofu_app/apps/food/admin.py b/ofu_app/apps/food/admin.py
index 13be29d..dc617cc 100644
--- a/ofu_app/apps/food/admin.py
+++ b/ofu_app/apps/food/admin.py
@@ -2,5 +2,10 @@
 from __future__ import unicode_literals
 
 from django.contrib import admin
+from apps.food.models import SingleFood, Menu, HappyHour
 
 # Register your models here.
+admin.site.register(SingleFood)
+admin.site.register(Menu)
+admin.site.register(HappyHour)
+
diff --git a/ofu_app/data_collectors/food/json_generator/__init__.py b/ofu_app/apps/food/management/__init__.py
similarity index 100%
rename from ofu_app/data_collectors/food/json_generator/__init__.py
rename to ofu_app/apps/food/management/__init__.py
diff --git a/ofu_app/data_collectors/food/parser/__init__.py b/ofu_app/apps/food/management/commands/__init__.py
similarity index 100%
rename from ofu_app/data_collectors/food/parser/__init__.py
rename to ofu_app/apps/food/management/commands/__init__.py
diff --git a/ofu_app/apps/food/management/commands/import_food.py b/ofu_app/apps/food/management/commands/import_food.py
new file mode 100644
index 0000000..c05c0a0
--- /dev/null
+++ b/ofu_app/apps/food/management/commands/import_food.py
@@ -0,0 +1,15 @@
+from django.core.management.base import BaseCommand, CommandError
+from apps.food.models import Menu, HappyHour, SingleFood
+from apps.food.utils.json_generator import controller_json_food
+from apps.food.utils import migrate_data
+
+class Command(BaseCommand):
+    help = "Imports Food from special Websites"
+
+    def add_arguments(self, parser):
+        pass
+
+    def handle(self, *args, **options):
+        controller_json_food.main("apps/food/utils/json_generator/jsons/")
+        migrate_data.main("apps/food/utils/json_generator/jsons/")
+
diff --git a/ofu_app/apps/food/models.py b/ofu_app/apps/food/models.py
index c6e2869..37fefdb 100644
--- a/ofu_app/apps/food/models.py
+++ b/ofu_app/apps/food/models.py
@@ -13,6 +13,9 @@ class Menu(models.Model):
     location = models.CharField(max_length=MAX_LENGTH)
     menu = models.ManyToManyField("SingleFood")
 
+    def __str__(self):
+        return str(self.date.strftime("%d.%m.%Y"))
+
     class Meta:
         unique_together = ('date', 'location')
 
@@ -21,6 +24,9 @@ class SingleFood(models.Model):
     id = models.AutoField(primary_key=True)
     name = models.CharField(unique=True, max_length=MAX_LENGTH)
 
+    def __str__(self):
+        return str(self.name)
+
 
 class HappyHour(models.Model):
     id = models.AutoField(primary_key=True)
@@ -30,5 +36,8 @@ class HappyHour(models.Model):
     location = models.CharField(max_length=MAX_LENGTH)
     description = models.CharField(max_length=MAX_LENGTH)
 
+    def __str__(self):
+        return "Date: %s, Location: %s" % (self.date.strftime("%Y.%m.%d"), self.location)
+
     class Meta:
         unique_together = ('date', 'location')
diff --git a/ofu_app/apps/food/utils/__init__.py b/ofu_app/apps/food/utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/ofu_app/apps/food/utils/json_generator/__init__.py b/ofu_app/apps/food/utils/json_generator/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/ofu_app/data_collectors/food/json_generator/controller-json-food.py b/ofu_app/apps/food/utils/json_generator/controller_json_food.py
similarity index 58%
rename from ofu_app/data_collectors/food/json_generator/controller-json-food.py
rename to ofu_app/apps/food/utils/json_generator/controller_json_food.py
index 89d5645..f6cd0bc 100644
--- a/ofu_app/data_collectors/food/json_generator/controller-json-food.py
+++ b/ofu_app/apps/food/utils/json_generator/controller_json_food.py
@@ -1,9 +1,4 @@
-import importlib
-
-# OWN MODULS
-parser_food_mensa = importlib.import_module('data_collectors.food.parser.mensa-page-parser')
-parser_food_cafete = importlib.import_module('data_collectors.food.parser.cafete-page-parser')
-parser_food_fekidehappyhour = importlib.import_module('data_collectors.food.parser.fekide-happyhour-page-parser')
+from apps.food.utils.parser import mensa_page_parser, cafete_page_parser, fekide_happyhour_page_parser
 
 # CONFIG
 JSON_OUTPUT_DIR_FOOD = "./food/json_generator/jsons/"
@@ -21,44 +16,45 @@ def writeToFile(jsonfile, root, filename):
         file.write(jsonfile)
 
 
-def main():
+def main(path=JSON_OUTPUT_DIR_FOOD):
     try:
-        json_food_mensa_feki = parser_food_mensa.parsePage(LINK_FEKI_MENSA)
+        json_food_mensa_feki = mensa_page_parser.parsePage(LINK_FEKI_MENSA)
 
     except IndexError:
         print("Error")
         json_food_mensa_feki = {}
 
     try:
-        json_food_mensa_austr = parser_food_mensa.parsePage(LINK_AUSTR_MENSA)
+        json_food_mensa_austr = mensa_page_parser.parsePage(LINK_AUSTR_MENSA)
     except IndexError:
         print("Error")
         json_food_mensa_austr = {}
 
     try:
-        json_food_cafete_erba = parser_food_cafete.parsePage(LINK_ERBA_CAFETE)
+        json_food_cafete_erba = cafete_page_parser.parsePage(LINK_ERBA_CAFETE)
     except IndexError:
         print("Error")
         json_food_cafete_erba = {}
 
     try:
-        json_food_cafete_markus = parser_food_cafete.parsePage(LINK_MARKUS_CAFETE)
+        json_food_cafete_markus = cafete_page_parser.parsePage(LINK_MARKUS_CAFETE)
     except IndexError:
         print("Error")
         json_food_cafete_markus = {}
 
     try:
-        json_food_fekidehappyhours = parser_food_fekidehappyhour.parsePage(LINK_FEKIDE_GUIDE)
+        json_food_fekidehappyhours = fekide_happyhour_page_parser.parsePage(LINK_FEKIDE_GUIDE)
     except IndexError:
         print("Error")
         json_food_fekidehappyhours = {}
 
     # WRITE JSONS
-    writeToFile(json_food_mensa_feki, JSON_OUTPUT_DIR_FOOD, "mensa-feki.json")
-    writeToFile(json_food_mensa_austr, JSON_OUTPUT_DIR_FOOD, "mensa-austr.json")
-    writeToFile(json_food_cafete_erba, JSON_OUTPUT_DIR_FOOD, "cafete-erba.json")
-    writeToFile(json_food_cafete_markus, JSON_OUTPUT_DIR_FOOD, "cafete-markus.json")
-    writeToFile(json_food_fekidehappyhours, JSON_OUTPUT_DIR_FOOD, "happyhourguide-fekide.json")
+    writeToFile(json_food_mensa_feki, path, "mensa-feki.json")
+    writeToFile(json_food_mensa_austr, path, "mensa-austr.json")
+    writeToFile(json_food_cafete_erba, path, "cafete-erba.json")
+    writeToFile(json_food_cafete_markus, path, "cafete-markus.json")
+    writeToFile(json_food_fekidehappyhours, path, "happyhourguide-fekide.json")
 
 
-main()
+if __name__ == "__main__":
+    main()
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
new file mode 100644
index 0000000..0865ed3
--- /dev/null
+++ b/ofu_app/apps/food/utils/json_generator/jsons/cafete-erba.json
@@ -0,0 +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
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
new file mode 100644
index 0000000..b3a7ccf
--- /dev/null
+++ b/ofu_app/apps/food/utils/json_generator/jsons/cafete-markus.json
@@ -0,0 +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
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
new file mode 100644
index 0000000..2f2ab9e
--- /dev/null
+++ b/ofu_app/apps/food/utils/json_generator/jsons/happyhourguide-fekide.json
@@ -0,0 +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
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
new file mode 100644
index 0000000..370f688
--- /dev/null
+++ b/ofu_app/apps/food/utils/json_generator/jsons/mensa-austr.json
@@ -0,0 +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
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
new file mode 100644
index 0000000..87b31d5
--- /dev/null
+++ b/ofu_app/apps/food/utils/json_generator/jsons/mensa-feki.json
@@ -0,0 +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
diff --git a/ofu_app/data_collectors/food/migrate-data.py b/ofu_app/apps/food/utils/migrate_data.py
similarity index 76%
rename from ofu_app/data_collectors/food/migrate-data.py
rename to ofu_app/apps/food/utils/migrate_data.py
index cef040d..85d4d57 100644
--- a/ofu_app/data_collectors/food/migrate-data.py
+++ b/ofu_app/apps/food/utils/migrate_data.py
@@ -1,13 +1,7 @@
 import json
 from datetime import datetime
 from pprint import pprint
-
-import django
-import os
 from django.db.utils import IntegrityError
-
-os.environ['DJANGO_SETTINGS_MODULE'] = 'ofu_app.settings'
-django.setup()
 from apps.food.models import SingleFood, Menu, HappyHour
 
 # JSON_FILES_PATH_FOOD = "json_generator/jsons/"
@@ -32,6 +26,7 @@ def writeStudentenwerkDataInDB(data):
             menu = Menu.objects.create(location=data['name'],
                                        date=date)
             menu.menu = foodlist
+            menu.save()
         except IntegrityError:
             # ignored
             break
@@ -50,18 +45,19 @@ def writeFekideDataInDB(data):
             break
 
 
-def main():
+def main(path=JSON_FILES_PATH_FOOD):
     # get food jsons
-    writeStudentenwerkDataInDB(getJsonFromFile(JSON_FILES_PATH_FOOD + "mensa-austr.json"))
-    writeStudentenwerkDataInDB(getJsonFromFile(JSON_FILES_PATH_FOOD + "cafete-erba.json"))
-    writeStudentenwerkDataInDB(getJsonFromFile(JSON_FILES_PATH_FOOD + "cafete-markus.json"))
-    writeStudentenwerkDataInDB(getJsonFromFile(JSON_FILES_PATH_FOOD + "mensa-feki.json"))
+    writeStudentenwerkDataInDB(getJsonFromFile(path + "mensa-austr.json"))
+    writeStudentenwerkDataInDB(getJsonFromFile(path + "cafete-erba.json"))
+    writeStudentenwerkDataInDB(getJsonFromFile(path + "cafete-markus.json"))
+    writeStudentenwerkDataInDB(getJsonFromFile(path + "mensa-feki.json"))
 
-    json_food_fekide = getJsonFromFile(JSON_FILES_PATH_FOOD + "happyhourguide-fekide.json")
+    json_food_fekide = getJsonFromFile(path + "happyhourguide-fekide.json")
     writeFekideDataInDB(json_food_fekide)
     pprint("SingleFood: " + str(SingleFood.objects.count()))
     pprint("Menu: " + str(Menu.objects.count()))
     pprint("HappyHour: " + str(HappyHour.objects.count()))
 
 
-main()
+if __name__ == '__main__':
+    main()
diff --git a/ofu_app/apps/food/utils/parser/__init__.py b/ofu_app/apps/food/utils/parser/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/ofu_app/data_collectors/food/parser/cafete-page-parser.py b/ofu_app/apps/food/utils/parser/cafete_page_parser.py
similarity index 100%
rename from ofu_app/data_collectors/food/parser/cafete-page-parser.py
rename to ofu_app/apps/food/utils/parser/cafete_page_parser.py
diff --git a/ofu_app/data_collectors/food/parser/fekide-happyhour-page-parser.py b/ofu_app/apps/food/utils/parser/fekide_happyhour_page_parser.py
similarity index 100%
rename from ofu_app/data_collectors/food/parser/fekide-happyhour-page-parser.py
rename to ofu_app/apps/food/utils/parser/fekide_happyhour_page_parser.py
diff --git a/ofu_app/data_collectors/food/parser/mensa-page-parser.py b/ofu_app/apps/food/utils/parser/mensa_page_parser.py
similarity index 81%
rename from ofu_app/data_collectors/food/parser/mensa-page-parser.py
rename to ofu_app/apps/food/utils/parser/mensa_page_parser.py
index 744486e..09b6230 100644
--- a/ofu_app/data_collectors/food/parser/mensa-page-parser.py
+++ b/ofu_app/apps/food/utils/parser/mensa_page_parser.py
@@ -3,6 +3,8 @@ from bs4 import BeautifulSoup
 import json
 import datetime
 
+FEKI_URL = "https://www.studentenwerk-wuerzburg.de/bamberg/essen-trinken/speiseplaene.html?tx_thmensamenu_pi2%5Bmensen%5D=3&tx_thmensamenu_pi2%5Baction%5D=show&tx_thmensamenu_pi2%5Bcontroller%5D=Speiseplan&cHash=c3fe5ebb35e5fba3794f01878e798b7c"
+
 
 def loadPage(url: str):
     return requests.get(url).content
@@ -41,6 +43,7 @@ def parsePage(url: str):
     mensaSpeiseplan['weekmenu'] = days
     mensaSpeiseplan['name'] = foodplan_name
     mensaSpeiseplan['execution_time'] = datetime.datetime.today().strftime("%A, %d.%m.%Y")
+    # print(mensaSpeiseplan)
     mensaSpeiseplanJson = json.dumps(mensaSpeiseplan)
     return mensaSpeiseplanJson
 
@@ -48,3 +51,4 @@ def parsePage(url: str):
 def getFoodplanName(soup):
     foodplan_name = soup.select('.mensamenu h2')[0].getText()
     return foodplan_name
+# parsePage(FEKI_URL)
diff --git a/ofu_app/apps/food/views.py b/ofu_app/apps/food/views.py
index e691a3e..5e880f1 100644
--- a/ofu_app/apps/food/views.py
+++ b/ofu_app/apps/food/views.py
@@ -10,13 +10,14 @@ from apps.food.models import Menu, HappyHour
 
 # Create your views here.
 def daily_food(request):
-    today = datetime.datetime.now()
+    today = datetime.datetime.now() + datetime.timedelta(2)
     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()
     erba_cafete = daily_menus.filter(location__contains="Erba").last()
     markus_cafete = daily_menus.filter(location__contains="markus").last()
     happy_hours = HappyHour.objects.filter(date__exact=today)
+    print(feki_menu.menu)
     return render(request, "food/daily_food.jinja", {
         'day': today,
         'happy_hours': happy_hours,
diff --git a/ofu_app/data_collectors/__pycache__/__init__.cpython-35.pyc b/ofu_app/data_collectors/__pycache__/__init__.cpython-35.pyc
deleted file mode 100644
index f47c176b6bc3d7357dead0f62a122b5e2bd938d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 162
zcmWgV<>lgvI2XwP1dl-k3@`#24nSPY0whux7=kq!{Z=v*frJsnFMs`v{M=Oi+|1;R
z%=C19m;CI~+|<01RDE~P5dE~o;*$8ZoW$bn_>$D(68-$N()h%J0{xW4lEnDr{G6QB
l<dXcNV*U8|%)HE!_;|g7%3B;Zx%nxjIjMFai;97m0RRQKDp~*l

diff --git a/ofu_app/data_collectors/collect_and_migrate.py b/ofu_app/data_collectors/collect_and_migrate.py
deleted file mode 100644
index 60caf1d..0000000
--- a/ofu_app/data_collectors/collect_and_migrate.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import importlib
-
-importlib.import_module('food.json_generator.controller-json-food')
-importlib.import_module('food.migrate-data')
-
-importlib.import_module('events.json_generator.controller-json-events')
-importlib.import_module('events.migrate-data')
diff --git a/ofu_app/data_collectors/events/__pycache__/__init__.cpython-35.pyc b/ofu_app/data_collectors/events/__pycache__/__init__.cpython-35.pyc
deleted file mode 100644
index cd7f8b066cd28bab5b9d6815d495bef464555d4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 169
zcmWgV<>k_iI2XwP1dl-k3@`#24nSPY0whux7=kq!{Z=v*frJsnuQ2_L{M=Oi+|1;R
z%=C19m;CI~+|<01RDE~P5dE~o;*$8ZoW$bn_>$D(68-$N()h%J0{xW4lEnDr{G6QB
r<dXcNV*S)Ipq66&`1s7c%#!$cy@JYH95%W6DWy57b|CwTftUdRY6vYz

diff --git a/ofu_app/data_collectors/events/__pycache__/migrate-data.cpython-35.pyc b/ofu_app/data_collectors/events/__pycache__/migrate-data.cpython-35.pyc
deleted file mode 100644
index cd817f607cbf167bd54e0360078cb10e2710583f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1421
zcmZux&u<$=6n?Y6>^OFkhL9>KhX69t0<lkAstQrClO}4NQU}slLYC{DIP2^WcXnJF
zlbphxBYyxVBo2rZH~s=7&U59|e}NO<n{81KtaoO=H}mGb_r3SVw;PSxpCA2odgT%Q
zO>aCd@Mjpsub3jdf)b)Zi5*G=rGf^61n;?&IFvdxa7r1vE)Cq*=R6vC7JHQVlm;{i
zpy!kHXj-8tpu5tgX_aoMJYJz>iP9PkYLKfmSf*%+q8fdV0O}M$tXtfm2=9u;D<oG+
z1A_YD>PtjTy-=8HG}2PXsRRyYGZkkVXyqW&a-w2=*;Oi6i?#f0J{-+vtwL%YXOqHg
zb`J0L_K$}B?(y+KZ@)i$c+~moK^JHJ?sJ*x#kS;6(ViB0Hk`;zs*%o>6^r&*uzx%b
z#uCOC7{!N}G|`pK=8Z!?Y|ynJEokb{m7p6$eu8v<`S=Oue(3a!P@!wQd?qvFu_NOp
z`6vn<<IP6;+<0ekB7Y{;fZ=~0x6kubw$pfg9#1CiPJS^@5ut4F9~`&AZx{Ud%RJl2
z%4j&wlSGaYb<uuBCXFYcA$NJZHM=yc6R8j3cTeT%9(>(m8XhJR>q4#K`yW$YeH+6v
z{R7~|@2{9{b-ww9iN5%WSw;?F;YYf5=<+*G#}p|5e}~&>3ptp&T*t_xEwl)-bnTKx
zqxdupxL3*(Y$$+6g*DJ4e7p*I$)Y8onng9BWs8=9T)JZ8fjD`#O`fjMMUB*NB!qZ$
zij^lAC(o9Ni_j12J>zrp6ecLMV?6Gomt5L~-@JdP`OtW*u&6epRx@oiPfc|Ud6KJ3
z6e`XxOf|`|5~Fawj&&l#s^X3?)k3QoTQe?@@rzj!YZdTTC4V|aQQ&o~B&;b;Z0K26
zBelUQzKut%1KZM<(+Y3B^(~rO?#YWdk{uNBAnSa-iH%|n6Ny{+x#9!yu?R)OQ9D>0
z^Tz9kec1wj0)R}TH&Gkh{o5!EUZHWR9j=GA^}zK-t+2uS{8!Kq-QHro%-8Oj4Wq@4
zyQp;ey4=}826kZE_Kw*+>>u@pdj}7?{o$i~$M=Wbue-hDzH(XP9iBKPY8#XB$N4<d
zZ}8=&SC+Jwj^gY+h-GU!8;*J(Qn;%4>e-B2lO~9!qim8JCojxuiCfXr)?CL)Ve@P%
zGJ75?t{46Z=Ci>%E=$oW`LxnJl2EiUy~~#Q0+e*v-~Yx|y^B-xM1IO`Q!uBxSQBeb
TUEu39L`|%@fm`?M^?K!BhnYa|

diff --git a/ofu_app/data_collectors/events/json_generator/__pycache__/__init__.cpython-35.pyc b/ofu_app/data_collectors/events/json_generator/__pycache__/__init__.cpython-35.pyc
deleted file mode 100644
index 5ebcb884c30de6fef10396c89341b8c7738af4a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 176
zcmWgV<>j(}dM=Uy2p)q77+?f49Dul(1xTbYFa&Ed`mJOr0tq9CU$Ocb`MIh3xtYls
znd#~JF8SG|xv6<2srv4oA^Q1grMig)1t2;eM5iQ{B*rJ_=j5a&m*f`}>!+3hl@{w~
s73b&0r>Ewn79|3O_2c6+^D;}~<Mj$EZ*kb<=BJeAq}qY3Ee2u+03W|FcmMzZ

diff --git a/ofu_app/data_collectors/events/json_generator/__pycache__/controller-json-events.cpython-35.pyc b/ofu_app/data_collectors/events/json_generator/__pycache__/controller-json-events.cpython-35.pyc
deleted file mode 100644
index c53519a0825dae0038a22e729103ea613e3c0141..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1289
zcma)5OLG!I5boJ!c?A@cR7gB{^1@-+i{32DDif`EATbb=aM{|h1KEUq)a;TJ2q(Pz
zJNys+2+wo%<X_0i?incavUH$(x|^APeDhJSR?FA+kCROc;3wQz2HI~>(o<AEei;k_
zx&R#DoPlq^oI%%Ex~6i?rJGZ34txu`7WjGa3-AT6qfrFEr0fFl0?YvzrfxUNzpxIp
zCNF(2^W0uM9P(Zki?qovd6cEi#1knO%~2Fw2C1!ri8tW3j!$0v*R}IBj_gG6EDQPp
z7yl~O=NEy`?-zU4baYn^C3FWo;=;pbm76*}lSaXnLn)!WMM;~eGJq+AsR4DId2Ybh
zb(onjH3`uv5N7NMvHo~)jJn-0T9REg44I1)9!cv;1Q~DSWRa@&gCUnW5yzP<k{x*=
z`ec0rK}D}GoU=IOP8jsgg2BMqjxR<bLdl)?yB#O)k8CeVXm@G91K(ff>%~zf=xKzl
zpj^JqSgxq%I`KPfphDx)?7%jdSi!wV4lP1v14SY79gT5~K*90n05gE2XcHJ?nL&Ib
zIFM%;K8Y9{XNVL+h@?WYnZU+%$SgR|FG6)ZK4TAOU^)X8D=do{4<9xD6k{qgQW=X;
zaYOl*^40s~ThiJQA{G<l^K7!J(Xcf|n*`8g>sCxtZ>)b>9@ivOu|`p@X+FE^o~u*I
zk_zr4-KCX?0N;Q>l^Y-0do6eGu(N;IakqC5+?`K5txj7$eISRcSU;A<1^dT$D(Nm7
zW_MLlTDQHZ-`%<&TjaZaTqjZN)2d8u=0Y!so}iUJM+MAeHIy=2F=~d%>I?ful!<jb
zhhUU~Fo{Jr3{GWLn{F8UBcxvy4+zRB)=1Sz5hm*9jRxqCAXFE{SNiH}hN1Kks*3rT
M;m6FI6|1uK8(v&j<^TWy

diff --git a/ofu_app/data_collectors/events/json_generator/controller-json-events.py b/ofu_app/data_collectors/events/json_generator/controller-json-events.py
deleted file mode 100644
index f824745..0000000
--- a/ofu_app/data_collectors/events/json_generator/controller-json-events.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import importlib
-
-# OWN MODULS
-parser_event_univis = importlib.import_module('data_collectors.events.parser.univis-eventpage-parser')
-parser_event_univis_pretty = importlib.import_module('data_collectors.events.parser.univis-json-prettifier')
-parser_event_fekide = importlib.import_module('data_collectors.events.parser.fekide-eventpage-parser')
-
-# CONFIG
-JSON_OUTPUT_DIR_EVENTS = "./events/json_generator/jsons/"
-
-
-def writeToFile(jsonfile, root, filename):
-    with open((root + filename), "w") as file:
-        file.write(jsonfile)
-
-
-def main():
-    try:
-        json_events_univis = parser_event_univis.parsePage()
-    except:
-        print("Error")
-        json_events_univis = "{}"
-
-    writeToFile(json_events_univis, JSON_OUTPUT_DIR_EVENTS, "events-univis.json")
-
-    try:
-        json_events_univis_pretty = parser_event_univis_pretty.prettify(JSON_OUTPUT_DIR_EVENTS + "events-univis.json")
-    except:
-        print("Error")
-        json_events_univis_pretty = "{}"
-
-    try:
-        json_events_fekide = parser_event_fekide.parsePage()
-    except:
-        print("Error")
-        json_events_fekide = "{}"
-
-    writeToFile(json_events_univis_pretty, JSON_OUTPUT_DIR_EVENTS, "events-univis-pretty.json")
-    writeToFile(json_events_fekide, JSON_OUTPUT_DIR_EVENTS, "events-fekide.json")
-
-
-main()
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
deleted file mode 100644
index c622ca5..0000000
--- a/ofu_app/data_collectors/events/json_generator/jsons/events-fekide.json
+++ /dev/null
@@ -1 +0,0 @@
-{"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/events/parser/__pycache__/__init__.cpython-35.pyc b/ofu_app/data_collectors/events/parser/__pycache__/__init__.cpython-35.pyc
deleted file mode 100644
index 9141dd8accca4c4ebeb8e0b5504cc95ba97f269b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 176
zcmWgV<>hjJdM=Uy2p)q77+?f49Dul(1xTbYFa&Ed`mJOr0tq9CU$Ocb`MIh3xtYls
znd#~JF8SG|xv6<2srv4oA^K^F#U=4+If=#D@g=FnCHnbkrSXXc1^Ow8C5iFL`8heM
y$tC$k#rmmbKrO}k1&Kw)sYUwn@tJv<CGqik1(mlrY;yBcN^?@}K-LxmF#`ZQH!!jQ

diff --git a/ofu_app/data_collectors/events/parser/__pycache__/fekide-eventpage-parser.cpython-35.pyc b/ofu_app/data_collectors/events/parser/__pycache__/fekide-eventpage-parser.cpython-35.pyc
deleted file mode 100644
index 3fbe7a61162d2efa398793a7d03ed7e1be29a849..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2595
zcmZuz&2HO95FY+YvLwg9aonbb;M7Tl#uADY2v8VB?O1J%IBHNEC_*407;$A&rbuN;
z`A3jX>8YnaLvMYM9@_`trH7u1_6d6GH%m(~)X?H`c4vnB&FsuauT`sakN^Jt#UDkY
zKk3G0LjDqW@(%_dKaD~nCzo{!HR|i+=%iii404Q#ok@<VWP?JB`W89X)XpZyp4b)0
zDUffHu&Gxh-=b|F>Js@-%#mLtr%a+iy^0#E<d^6Tb`<mELtQ4nLO<#B17O`EAL@A}
zFOZMvf|3`>$8Sl=OLXnHO#aHm5%Mbex0S&P2YFau`wJ0MyRK!`UEvMWpgRl?<KX}c
z_Fy1`C>>Q>Lm3Z5b63bPh#dXM8Pyw|q_gFVt~U(Rnwp#l&lfV6yMav7Z`8tQ<0MT7
z$>+`H`T2RHD^7!kFPf>4{UAE^LJ`4fwEPa6i~zwH%CMs`LR|dRaX-PGEMQ29dK!(1
z-e}a*5scQZ8(C3`*F%w{NoE|2G%IxCC>2p!*Q5oXUr3hl_&02x#C_512c47P__(<j
zpAP%563wsokD6UCN!@PfC8utRH#Ot#(Dep`rthVm+lj+abkbNRO>qX7q&e_pB4m?;
z^Tn209C*iKD_?I6F0*17d;W8*EirZuf;3si*kN&UO@q6Q6%J0t_XeZRhlMB)>w0@s
z+1z<p+w>co{l?}C4j8aR8uUeGrLpf}w<MKaUQnUl80PTa%tluByi49=g5(zDX__mT
z*tk`ie?-!ciLO+dfhUJ?rPD>Ejdj|4+10KL3SePUs!^)b*kGW(&c%CWQEE^RKa<85
z^(^w0wr3Nf@=dnsp(&<jMPBcr@JZ{T=wXJ9(Om`FW`Fp=LZd5Nfhy3&Z#1@n;#ayV
zDioy&3T1bVVvfdhYI8K3YNY_l1iCVf%amgoLsh{hm;+>$H+id=hvMc7Zc+Y%w-yUC
z7K{J0SfcF|`=RldX?=~iTY-;icTBLI_WEb~9t#}qDpUYa;fYe+g^ExAc6;>cJ+3p<
z<;@Oq<1-=80&!kzsPdc6U9JZ+yy%CHe)4E!qikxMyP0_@JUJ>(iYPO=ghrMhoYg$X
zz$3FdDF4J+nR#6rq#@UtdYH+;i?U(|zQ?h=bk=5!!x*X{hRH;7mS;><*_!!yB1IQi
z!3&wK%#wOFvlGGHCb>5<1BETQK2?bia<^^}`Az{veIzc>?otdwuOl)eiqGXDY~?&V
zln?gXPu;ItPxtp)nT=)!^VBPunSkq@Du*8iX!>3fM~-SJo;qb#002{i<lfD7>?Ggk
z>0A!f^`yL(T{h1wweFO1HSaO6a^_BwHQSXX1kh4+@*dusJj6hnt=-b97+19i+6H9%
zdUi)!(AKfCp)F~P+8l0qANHMhGG!GSaOAXk6^Gov_X=lnx|LiespxO@y&$SJKw3eh
zPOR35kj$C~(!2|IJU+r>7IPVx+puF|dj$Q2P98v>Vqq#_;#G7aAb{9%$_A-`GEmn{
zDriSt(FceF4Q?=TfM8fQRkK^%4DuzVAR6$6tr|tAbuh|0tk&2PHt@1&?XYgPC4V9$
zr$nw}s23FBszOrPk_<EB7<R&N59gd@OE-$d%}+yqz`nNnc4Q{gx=KZ6ab+Y<k@Ljy
zJM(J6oy=!)B|pY%9^+OYF48JE%?kc({C%h?Z3kL)aj6@)RmSQNm|j)hkS>IY>>*>@
z;94;2G?j`U^tSv24s}z#QL=Mpa!mv8us=xZx>M#DuD^*+k#zv>&A`n{>f6PE?cyB?
z{$En%xB%F)0lB^^`CuL6Rq|P$Qf^DhWh)tbrpHNUbK8S13L-iSBpU0^;q%u1Ve9$9
zPTOtoJZrg!t%KH+qi?@cNaY4QmJ*Rp{0^SDNBhrO>J0MJ<1f|Q)61h|JU8%{c&fg1
n#qECV4@2<<7eT^rub^=_?P}DkI;Y>(myK1kVpi5G=4$yrZRbu5

diff --git a/ofu_app/data_collectors/events/parser/__pycache__/univis-eventpage-parser.cpython-35.pyc b/ofu_app/data_collectors/events/parser/__pycache__/univis-eventpage-parser.cpython-35.pyc
deleted file mode 100644
index 86ed6033a57968352bfffb34c7cba87dfed58017..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1825
zcmZux-EJF26h5;*{_8qU3ZZqcP$eU|B3W^Tgi<IXsEUNFDkfA}skOE{W5>y^*PU61
zBucKr1N0HN<pFpMUSMyz;uW~!JF|{S0_&ainKLtIzVpp@=25%dI==qn@OPi+PrCJ>
zPcP8SulPv3f>NSrWebYLjo+cjxv^b}T$1p3q<oUFJ(50saOf8-uaU%Cw|1RW!_H}t
zY?5rz2iN+W?3WKn1|-`z3tJ@DNOtT546T#gur}rh8ulOl1(Y<n`0}VI=3j;3Vm3XU
znr-}Ty^FJVN>8?>3g>$AjZv{qj-IPiH7m?#<|zO9`B|3sMd>bdng|YqhyNY4@6gOT
zJ_XUSpi81_LB|eu6obB7Hne)bP^K`YJ5fbcPx4uTxP75{@o%J=#lO?=D9==wO_QVP
zWD@S?CyNZTRQPi5$8a2*Vl+-;b22IrDa^-<Q9PfAGA`m#lBcOkid>tp0vyg`ZIoW-
zw`HC4c%rr{|MvX6Y@~TCU%}U6?2LniuH&1qdGoB2`ve|N&gOTGFHTZ$mcza?xCnaR
ze*S4sZuhe7-XSLpSgM$2D)Nh5#@Njiddv=+>a9-=amyN5*^STFVBa8NRDGxP<TNQt
zXDSnm5Ked5EahLIbM}n+2AD47)ZKmagsvRA1U#3zmx4|l(jD#(-*@OW6gupCgR*vj
zliwRg-hQ5E7v75#b#6iRUHt$tb%0OlX$;=SS_f8M^bj))qbIQ`)&=$eU}0CU<iW@4
zp;@dm7-y5aSYOi>s>3D5S+h88w<|sBA`27*fG<aEw~M;yUb%b}Ncz&HYlp5py2QI$
zxwA^NKG1FKTKeC!j3b}(F`8+PniT>2YFuRx=r#l2W>ET8GIna|f}E%=RS{29B}e~9
z%7#`ZPfryGof-r+kFkm2otU0Ltl8EP`XhK&{4h5weirDQ&F=E^mibx9?%x!VH4D&Z
z0amA7jqTi-3#vfmow=aevJD#lLzCtLj+&;3b;0_*X!H)Zdf8S_!dhxOs;imgK?tS6
z(^=SaE9@q^eXsP6O+M2bJho;-jaIb~VC|}RUsu7B!d(P6PqEx^2{3z4MGH-DqL;9X
zpF36X1`Z@%*m}Hz0d|n3y@Z%QkB%XvYSgja8tba!uBb0<Q8efpngXwac9x6mEH3dV
zz}-`f)R{^a$i8W>igN8>u=ms6aJ2vG<>+Alhq8$~5(ST%jr{7W`54$rUoNt_DSf_j
zj7>z_`gS9aZzU_asL8}JJ@I{Nnl=>QRnHKuQk4^kj?)nxaMKq03H<%GW>)O6=tpev
z-kLA2(#0uR#CG4R#98iEjujvdacg5PU2QL?#!i;YMXJ8$%ieIz0Aj|^t+|_C;61Kw
Hwt~h#q-JjR

diff --git a/ofu_app/data_collectors/events/parser/__pycache__/univis-json-prettifier.cpython-35.pyc b/ofu_app/data_collectors/events/parser/__pycache__/univis-json-prettifier.cpython-35.pyc
deleted file mode 100644
index a86e1323a6f81eb1886914ee79ce24ff034d0b85..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3764
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

diff --git a/ofu_app/data_collectors/food/__pycache__/__init__.cpython-35.pyc b/ofu_app/data_collectors/food/__pycache__/__init__.cpython-35.pyc
deleted file mode 100644
index f105376a2c171faec9ce260d1ede6fc3f78dfe4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 167
zcmWgV<>fMsI2XwP1dl-k3@`#24nSPY0whux7=kq!{Z=v*frJsnuMqu={M=Oi+|1;R
z%=C19m;CI~+|<01RDE~P5dE~o;*$8ZoW$bn_>$D(68-$N()h%J0{xW4lEnDr{G6QB
q<dXcNV*RxI{1pB8_{_Y_lK6PNg34PQHo5sJr8%i~Alr(8m;nF@5iDT<

diff --git a/ofu_app/data_collectors/food/__pycache__/migrate-data.cpython-35.pyc b/ofu_app/data_collectors/food/__pycache__/migrate-data.cpython-35.pyc
deleted file mode 100644
index 10f207c77c318b5e6a5efbbde08f4af74f60d523..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2336
zcmZuy&2Jk;6o0e3{{D!QhL)r)M3sy%5L+C$R28C-q)A1cf`ihmR9Rc^#93!Q+}Sma
zt>hH$-1r;dinwt`;)29^uZTlWh#TsO-<wU7eyu&TZ{C}o_vZb6^X5veR{rC|Klgqp
z5&cCkJSODN(Bj|Gx%dn6iR?@^$QKj{vIPmYndBQ37-SpS7;{as&F9})WLsLc$j?!b
zCp(XMIg%EQ3gqVLmNaQpq*Ka1FOXlNpiFj|f(qFc3aVsRVJnhdBez6unZ83Xb#g1@
zR<%4wE=+YTH^{}Xq2+m!^V!0Jdae1V*bQ}CA}zX3A`>r=kn`iQ^1=jCeJf1lP<hF8
zU8zXT8qxlw?~KRoSSE=V4rBZB+TGjTJKO!<`p(W)_fD^WZ+q>VFV|aUTJB+jFE^sd
zO|5$}oTQ~qd^+8XCTh044|Qi0M`3>`L#do3QhFG727+V4W1s;B`T{Nf09`_KtTTUV
z(D#dUA}A3wGU!;)DR#4q)PME$1N6O?(M^Ry5LPsnVQR6X)bb<8Z5gRGc9MhC+V_0<
z6RA2Des;fe5CyUmc!L9PIP9!Nhm$~J>zzAWJ00wK6@l}c_ufIKoc<v4eK|nXaYt_@
z@P^ogTxDZ>JWc0@GPw({8!8Gm;Ax&WVWA_jAXEeI^L^$psG;e7{s-ac-?M!#tv&pk
zw>cy_G3aQ(J9Q0$dY4X2ny%2XK_etar(pzwnRILdUV(gw-N!e`N-R1olR6?H#7mQN
zFHhdX<OgWG(}$GgnTJVHyR&Esi-Da;`Uq6ZYjc@7G^((x6N{26!@&LvI&zbiT#Jq^
zm<@yvzX-fvqus}q^N9Z8i0<z}^8k&p>$QqqyZA)PL*#yvT3H`DflMuC=PciJ+s&Yz
zT2tw$wCG0zC-I`NRZsK4MTV~8RHlXK(FoAQX?~z2zEhm`)C3@kDU}xEM2(s1sR=19
zC^`0>fwXf;<T_Keh&d|H9b?wYY3Gg}*hR+L_u|B^#G2iGR;Wunn~9WlbCA;ICpb2;
zmrPtHQusuw!!>YYD_r~hGVJj+bR_0Q9?cXhq9&Sne=IJG66Bhp-hus`BPIqMnC8f@
z5RQJi;K+~qDBy5p>;PONNI(Ms02V`|CzwLhAtfj+s55{+Lo!3G0K`ymFtwzYDPdgJ
zQW;X^j1mA6<z)$#g=f}Z(9S*Ao>C6PW0;GYct5`Z=0?{pA8;u+Kq-h*i?MhnR#JK<
zR&_3I6F|(W&D$TXWRN%a)LYoJU2$bRP#(~WLc0_vjzSp<q~ek>%QZJ|Ht*R55P_9X
zS=lP7t9U8ScAAUFzL%&1E3R<&Hh0Vkwagv!q-Cn>c-i&y0Q-ET)w?|56^Jish&SY+
z=gQ~UzK?nF0y@T)5xpT6f$3F7v<dBiP5f|l>`){68w6B0oZ|$E6?6p{;x8_A#v63z
z8+6u%E?X?86(?96wSlr#ar*%L+!=n^O#^rARiI$t6tl6!Rp51FQ5(yz8}$(`b!QD6
z+}K%lCOBPfuDr9xz}c55j#52xGR?x7CUDf@B+hhm*?0TMXQo&_$6z=?idWg<%FI^1
zxLt0p%<}h8G4QUO-!L~<S`~eSbgfMn@AkI4{f(_J*L(f@w|6%C8{6A!8W6=tD<cV4
z4^50TH;5)-l2rkwOH0@deOd8w?`Ltm$_6WNyzmoD&fqr|0X%+2LzKmJ{1j88wV=xE
zMU##_+j)27gu^H`qS&6x<hJ{$JxM%2&MFrO{jH}!_#AHC$=Gh-=)`S~q#Z=A#55ha
zE?Jt}@39BIVzLA<?X>e3BGydSb*gv^i%fj^DHBpxrK)I%hEWxG8#M%f&CHwCTy>#Z
HtJePqJ`n$2

diff --git a/ofu_app/data_collectors/food/json_generator/__init__.pyc b/ofu_app/data_collectors/food/json_generator/__init__.pyc
deleted file mode 100644
index a0befb4a58092c8fe543144fa335ee99aef98a7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 176
zcmZ9Gy$ZrW5QI;(5W)9I<-UN3g&;OI+608<xS!<AT{gIzA}{I7_yTUg%7OU?rWj`V
z*>0xCyLRTMh2~MsD}^`aR?W?|QkXw*tsS&f0+i(1)HHCSZY-gf0O!jcqGiFDEq5q^
t1t^YahXK45i;i**PUyuDi99@+dO%El62#pw$y(R<h5VSqVgA5s^92&kESUfR

diff --git a/ofu_app/data_collectors/food/json_generator/__pycache__/__init__.cpython-35.pyc b/ofu_app/data_collectors/food/json_generator/__pycache__/__init__.cpython-35.pyc
deleted file mode 100644
index 8fca6c8843e556a86f9013131b64fe9fd36f598f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 172
zcmWgV<>ji3ITy(Q1dl-k3@`#24nSPY0whux7=kq!{Z=v*frJsnuSorj{M=Oi+|1;R
z%=C19m;CI~+|<01RDE~P5dE~o;*$8ZoW$bn_>$D(68-$N()h%J0{xW4lEnDr{G6QB
v<dXcNV*RxI{1pAH;`}`Q`1s7c%#!$cy@JYH95%W6DWy57b|5Q@ftUdREY&WT

diff --git a/ofu_app/data_collectors/food/json_generator/__pycache__/controller-json-food.cpython-35.pyc b/ofu_app/data_collectors/food/json_generator/__pycache__/controller-json-food.cpython-35.pyc
deleted file mode 100644
index b6c8bcabb7bb6b8dce8c99ba0dc1d7d6a3340089..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2425
zcmcf?U2hskaP|%`V5mP6S84lFDN&IEXN)O!m9%vNP8~NmHCRdR<#ZnloPj&Ew}=?o
zQYE*~{TWsNO`rO3FMa4s`xpAu**$FVhoVaTxMPQzxtX1hota(BX4Ahs{Q1rIX@K8g
z=1~y;5?Amo0tbHtdH^~A1vn<)C~!_dS1w3ZlIjH+lVl8>IOuV35}+r*nFD<eoFwQ;
za8jVBz)6Fi24^0e419;1Ba#K@J&9+4X5buvpy5Vt;Sclz>f^j)a?`N=UXR+`XF;Lm
z`%YnCvVgKepL&6rADC^5Kyb!|cZu6(i*g}4mEU@oe2aEnhvqxxU~tm$hwO^xhXqZz
zq8$gmXSAtDnTh^MGSJ4qcQ_vepK01?G%5sq=unSSZ$w!)KN_N+){wOe4%IBPZ&B9P
zXb?~@&zb9Wsiy@4>IQVsGjZEOhxdD5@V5r<$Z!!1je)yyzx+hd)Vp7<J}y1DRlu~l
z>q~*4<Bx8av3-v-kzOV?YFt?M9@t-*LFchuYSA*atWuelTb5a>Y;U&Ki(8c~TG`&R
zD)#>!>Bj9*{0otmi$%J=S=la^C@q#M>vqZ7+OUg7bA9vEjZMoMyZ`J=eb1q6_GGoF
z9+_+ADYMMHi>KL>$2~s&?@aYg)*S{|TYMbZ`e@dcD0xwrmo;yzq7U(j;Y#6piYq7}
z-~gutP8C?ghCNr{hgCRJ;ZzmF;uOR<Ag^$Yd~^63VI!y1Lo&)KVay*;FN}|v%V{pA
zCq@6X+#U^M%=dYi6u4*hkrvobz>;X|&$ia_`&8?@cE@eEwW{A8V)b*XJ=<$)eruS=
z9u@zF_`lZExAy6@?DN8dd^A>0!g=Xf)89qoD<V`8H;}u8;k*P}5aNmBdWcJAqelQv
zRzyNDbS~%Q8Ne&=V~BATx@lk)AcSz7j+iOTiwl4PZ#)98r+RVm>5N>_^Ka^rsa`_b
zo0EFV6}=yC>M7Utl2T8-qW9}fJ$0&=lJ?S4FLp(54a2(@Uo6t&^P(7dM&2JP5J6*-
zkj4vSLMxKS8)QPOlE!>Y=$NDvl9shJR}bSg#(XwjkTWqa%T}D@crjv_!+^6w#F>nJ
z(PI&3dBTZWA>!S;toZg&4E<>K%Wt`CxD;J4hNu!lTF_IH^%C!raN+B{`o6JS+ut)@
z)as3$FujMp{#JSz#s@gmdAKNLc8(g&!->%H?4FTF6RFzalO5yf&Tg$)3zwzdi=D&$
zqs9gAgIUeU(M#{crAue3HRIXQUbQAGH(Y(*IH(&3N6nW<O{2PZXzU&wRC95CRU~O9
zFhgvp-?`3}37us}9vdR7`r1@_!j4j_-<y88=4T-LIs#&>gt5Nqdha6^JVF3OB`Zpn
zq{+O382KBRx=5mzt)V_1TFUJYe8zjO6=oyU==;tPZ@LT$uq6Rj1-L6fR)9qTmIV;K
s&+Z5y`d)51<FS}YOuC(X6z%yr&HxC6{~2|G;HxIo1ev^QCZ74^FXwr=<p2Nx

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
deleted file mode 100644
index 1edcae9..0000000
--- a/ofu_app/data_collectors/food/json_generator/jsons/cafete-erba.json
+++ /dev/null
@@ -1 +0,0 @@
-{"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
deleted file mode 100644
index f044229..0000000
--- a/ofu_app/data_collectors/food/json_generator/jsons/cafete-markus.json
+++ /dev/null
@@ -1 +0,0 @@
-{"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
deleted file mode 100644
index f13912c..0000000
--- a/ofu_app/data_collectors/food/json_generator/jsons/happyhourguide-fekide.json
+++ /dev/null
@@ -1 +0,0 @@
-{"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
deleted file mode 100644
index 898de57..0000000
--- a/ofu_app/data_collectors/food/json_generator/jsons/mensa-austr.json
+++ /dev/null
@@ -1 +0,0 @@
-{"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
deleted file mode 100644
index 35117fc..0000000
--- a/ofu_app/data_collectors/food/json_generator/jsons/mensa-feki.json
+++ /dev/null
@@ -1 +0,0 @@
-{"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/data_collectors/food/parser/__pycache__/__init__.cpython-35.pyc b/ofu_app/data_collectors/food/parser/__pycache__/__init__.cpython-35.pyc
deleted file mode 100644
index 05819d11b8a085e1e0df8a3fcfa9472ab39cc8fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 174
zcmWgV<>lHFbuN+t2p)q77+?f49Dul(1xTbYFa&Ed`mJOr0tq9CU(xy*`MIh3xtYls
znd#~JF8SG|xv6<2srv4oA^K^F#U=4+If=#D@g=FnCHnbkrSXXc1^Ow8C5iFL`8heM
x$tC$k#rkRa`6>DZiABY!Mf&manR%Hd@$q^EmA5!-a`RJ4b5iX<mKFms0|37xFRcIo

diff --git a/ofu_app/data_collectors/food/parser/__pycache__/cafete-page-parser.cpython-35.pyc b/ofu_app/data_collectors/food/parser/__pycache__/cafete-page-parser.cpython-35.pyc
deleted file mode 100644
index c843e2e77a433829b51e995f4c5b7fbe5f6d8cb5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1834
zcmZWp%}ygn5U!pddw?-)vI|+H{E(GMVkt0}Jvu04A<0I>p!G_tMOs;dr)|bN_L%Or
z0?59E9COHP<Qeh?k@5n4%_*;tQ@-i}#FEiWcXf4FPu2HT)d!8n;-AyMUh5js-*o2*
zAb*Wd|B4~QE2tnku4Io2K_icjJrdV@J{|iv=K?woD1#;>S)&YcNLh`3^XL~`QKt-V
z<m8C51<Dqk3}K0~*vX4Gh7HP=Zw#?3sMB2e2Od$oDQx2#nNCgKpB9~RI=O6a_jGS7
zll^pBm<_i$m1!nbCHHfs&G$|LTYsvGp5UAC@a*AxhEG4hV2Fl-W<*zlh8}(@+D+d^
zN}f%nHro0FX>7e$j*T3frcgd?ekWDO^sh`#%aKe*dG9nI43fR_?R11wGWqWL%cP%b
z)9n|je%m#;DJlEYZaSGHS!&X5uPh4LGo{i=zbvz4k}54#(o6f&$gN2_;DJ@!lM5Ra
zWtts9x4=%b_aqd{w^6a~HmZ-XKs-alCO9fUxsJ%Lh~@~CarN4YaX_3kE!hwIxO24s
zyt99Fu-opocYoaPcJ>eUpS?VMVe5$hr93xH&juRU+Xg#4DbjIwoQ|Xeq8cJxX;*Ok
z+v@{u>^Gp)oM9x^g<8S<j?;{$qv9!q^DSnhqGIpOC+sdFfX5Xzhy#LZxERhF^eSVz
z{PtzoI#J1v<#>W3*T(wVC>wWy^4O&LSa-YdJ}mOF)O=$6Kd)nW{URTnngeXU4_7n?
zL*k)W6_HSDkZ;{);5i`Y_8$-i6|fHR%E!6q90%rt<~|vZX1)sob>oyn2$cpE6S!jm
zofk9<Xzxu%^N?~}T6316v&113WJv4t`W<aZGZa{jt~|n(I5Ce{GearXsWppe0Q|6s
zut0j(cmbcp*&)4hnXu5lTzj{cPRi`UfbYvkt;t3Y>8rnba-(~)bLq8`YrI_wDJ~%!
zAg84bko(hST`fZ8AXAK_4M9de!89pyRFaa&ou0Hc)Pfvm%>@uzU2&n+BQ{;da2#@$
zfi0eFElV#BPlndVd>pZgQ|o@}HLg?dNUFW`VjZ{W#~4V|#EOW;=b`~=O?)gCA-yNm
zr`Wq?mHGDZIaYs$zyu)wZt@Y7vIb-VQIBg1n9l>pMMYpp#%BVVa|bjy2ivU~NOE+y
zOh7}tAQZXcx+Tu?UPvudry;m=NdbyMVy9VaBU{f$g^hla@-3rl1FpHtcyss5jm>O(
zbF{tr+Ahm;*+X+I$6b?;BoO5kRoo9;!MQ+f#2oRy4NVCgZ3JHWP7w@sIksUo9ZhsI
zavjbtaSyugdN$yNU4aKW?M!5@nZvOoPA&6qxaHV~_x69lt@k-va9xdi*%vU;Tv*_z
z9#<TBF}PV2AA&EHV5b=?t~BeP=%-aYO)S-CJS_3R306hRoux`Trqx;B`8RiK<@!_9
d8kO0!kUQJ}HQUGH0kR|ZYW`{vhjBe#`45=Nl5zk5

diff --git a/ofu_app/data_collectors/food/parser/__pycache__/fekide-happyhour-page-parser.cpython-35.pyc b/ofu_app/data_collectors/food/parser/__pycache__/fekide-happyhour-page-parser.cpython-35.pyc
deleted file mode 100644
index da7c657f42c8f5624c840f53d0ff7b792a780585..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1605
zcmZ8h&2A$_5U!pXkH?O^*$o5`L=b6}!$>5)aEuTkiO5QeiEt#emXI|&-FC(qd%WE}
zQW7~5Qg{GfgE!#F8HpEYapS}*a6o+3-h_ntsi~=|?yjou>wdr6ZU0vP{_39w(Vz6-
zilBdi*Zcq>@dzr3hATawQqU}*VL;-oFQj337Z=emA_+@_R7?_jgJeuU1@t4PXp+Q}
zcs(K6BH8wO>n?bWWalop%?l6G?qA4)`l)c;FI86CVqBMls$N{Dd%4MXr5a~-X}A5)
zxyq!{D}7vOV^6#RW5ZgPx!{>_@i)MGh}S%YutZZqOQKsr(*TQ#ej2(&t2ebW*0^w@
ztZU}g+^V@vg$^<1XVOi4{;qoG)lBtfMSfmPCcUHTqMjj2^}c#>)*ENWj>ctXE=CqJ
z^{R0_$`*^B%xpHwtFlzNt+eTlt4j73nKnxI#_FPwYWEy*SLao&cNf`2L9lagapjV-
z%H%0*El!{7AfZ{$S-rdN>w6CtuFscv3mI@<QRpBI`q!PEgHN}2<lfF~Z|4=)jLeiR
zX38~eB{QsMtRAz$SNlLDnAgQ<%u#mLg?^U_>-U}Jv_P*_r~iO5A-eIMMn0=FZUVae
zm6ib=eg6yHgj66RA}h!Sv<x{>8PIJ&Hw{`gXbPs`@w_TfMnKbuP}NQR*c;O$Z}YLY
z`PiHIwGxkh!_St`5)=AW_Lmq8EvEe?%+Q+9z!M*U^u(Jj`VNLcn)I*NpEH!(dp3Jr
zs%@)XR9?<X7g*^UIe1_gzC5!<HFuHk^O{s9*TsTOY173<F)1|T=R!2!MdM;FT@#%?
zQ<v5?U@I0b20heVrY#p4>;~7q=ZhJx|EK#rhAsaoi@6%M?tR0A4Ln#s!(w`a#XBsR
z*DK*c?qcZ^X5$IiXgJnvL6C^Wy68e~ijV!h5wr#0&xGcHdltm_;VpBB*IYp`#=>(U
zU~aB99<T@MfSh>&yg>pm0O$$=M?ett7*yD|AO*(YC&W+01eki%fCz|zaP~FeYtj^m
zd9ttAGf3mUeu4z_M-VOq!5{Ac_e5Q)9EVIbA2B*<%kM0YhObF8y>*+#8jB9k6HN`^
zY{+`HFlp>h2e-z%_U(zWS}kIW{tyF(2@l{i;Qy^|`EAad`#IvwyAWt|6bBu&x`Wns
z#a6H`G<(xE%_p@BUz^WX3Hr1?VcQ3T)8iL|<I|T1{Zaqm>*LYj_~r58**D+nO}JMz
p`AQfkKih*$Jp3N{WPeu4x>TR@iRn+uj(CbZIzb$6MxCg$@h>;AT(STF

diff --git a/ofu_app/data_collectors/food/parser/__pycache__/mensa-page-parser.cpython-35.pyc b/ofu_app/data_collectors/food/parser/__pycache__/mensa-page-parser.cpython-35.pyc
deleted file mode 100644
index a07a1cfcf47a912a2b4b5b62cf60247214c3edd8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1819
zcmZ8i&2HO95T50qC|R<Trgq@gX_W#7N}!d3qP+=5e~cC_P&I%86d@1@jJUETQzE^)
zOl(8GG)0d^d+rnT*ca&o@Y+*e!KZ$+^iN`gI~vZ;EN8y?c6`6nY5nu!-=`n@ME}tn
ze;)KNvGi{cDIP%?QC#Z|Wr7wC#SV$fJ(ptl%Fm<NBk5BLi$|$Xe>n6jf&)tNG_2mB
zG^Dg?_3+BMMd{j=bCc3Gr5)=4yP#3D{u;T^FcMYgYnha0HZ8MJUKTL8rOGCPxADin
z4%RnV`VNF4nhRPHy%IEcaFQ5CZWStdTuN<p<sL{AHzxVg$fb#dauM@4sQ^D0Y5y=^
z$o^tBIh-9F^!M|lase;d|L*%I{b{1jc$y{pXl!s&KcAN4q$v7nVv_MB&oVhNxzhb<
zo~QjHQCg}#qIL3VksL?}w)BeAD$MdEeGFTJbLQkps1Wk4qPQuxs4f(gGq-(79Y%U4
z=#|4|qQKOn?NQ_pV>g|>sQd{MM3HH7su&uS?oDUQG<FWZsKU#tH9+(<z_eA@f^(@_
zz~)D}EccVsHN0QtwhsL|HwNlDx4-amKy)tX<oBB-f&Binb2@iuhCP>zAmh-=;g+BP
zq<-#^acSkT1#UHYKpR-NPM_`jyyxFU&Oxuh9?_uf73dbyVC55QO=tkaz932*Z_&>%
zjH1@?>~3#TDuph-l=7(C12C1Boh)t`#0_8)jIi`hT@dho_70cD$AU^ke>!v=(8z)X
z_!>a!i99ipQ#rjym5{ffyl4%wnKqMrQS5E<!TgmbojpX{w;;%4sQ_|skmZvk(|b^^
zyw7%eU`_c_B}Lb2-CicArrR?!lgSIwea(H1J<v|Z9=k?C6==!yQ~Z_6)kZ1qS>@{@
zo0%#AP31C;0@YzFLQl17@hJh+pPtX-2Ae<#t1ts@l~Z-z%6kK``dtVTf!M;@6m7BN
zJP<8$SE%=4pIqHf<~5^hsr(BRri8H4;k#O2)S4vRO3Q4f2MANs0~ENXN<b?-AdFM@
z-cn~^z#2SY4Xz2Mj*Vk4p9ZEu^YD^;=M7plz=~j~xPmxjN-%<zw@eoDtiAiyC*9q&
zx4Y==K8@GqiJV~Y<jb*{Eo9WRceI9h;}VV{OO``~+M277d&0i4Z*m|Shv>wV4V5?7
z`LgoUa#83gv_mIe<GFBoCF2d`p_5S|XIk>9vB$f0!#X@t*f{1i)q9-#y<7f2;QZT7
zYucH^ljZ?J^cDmf76fS4238yGYKa}_>Lcu2w~R@|%eIUoucr_07Leb@-~rP0?HEPw
z@T|i`)yQpGb`L+R2alupdx}SL<k&jYLpJdIs0EK4#pgf5(mYd0Yzu3N))c?T?sNUQ
zMO=M|SM>pl`z)ANmg5$Ao4*Zw<9PcaJJ!O%B2UXq?lCFtKZ&-u!vMIOUfXN0Z{GVK
DLs5Mm

diff --git a/ofu_app/db.sqlite3 b/ofu_app/db.sqlite3
index 5caf5e2904ae0c906be39f8094db974fb5761432..2a36bacca27a50f0ce4d50f872ee37cb472ddebb 100644
GIT binary patch
delta 6361
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

delta 716
zcmYk1Ur19?9LMkZ-Mc&8&N+9R^v8QA+eD)f+f~<cK~(e*ICay3WLVq6X_MR}HHwKS
zfxW0qB#uN6k}#o{oO`&?L)b$Q1mZ)lMLsGed*~$$>)zdx4u|vo{XV}R=lA{1tdf~k
zl2_2clKVOuC?*OX(Ff9=^r?iszv)u`q|4#u8&T?EDl;)2uSj~i&0imi)tu(f!B93k
z7#~e#CMyqGkmjX%&dL3Mu#NXrB_}8D#V5y84>)dl(SHhsmka*$Cu)Fit{NOkW`?uz
z<ltyJ6ThDwF75f1#F~&$*Mu!^Nl5(iyc}~J-_0?>u`WbWRPXSv3tPxhX)!QgYu|ll
zg|_1Cx?S6~!!|`Rwjo0Z^|F0KdRT*^OO)L)B*Ip7k-7!W7im>nE;hHQ&1#T2-B54o
zG9WvUL1twIT&R-;+@M;*6`aid#g>jr{z5Txr}o|rSNNcAgOe8QyO@yAq#wVfb#xIw
zl7?uJTIs&@2CtAD9l<}yYe^vuxKD~nLF_YKH-Q)tV<EwpM8^1l*lWgT6$t452XYV+
zqbAbF2J|I%a-gDahNeIjyHvp!L9E>kO_ok0W{Dgq#tKd`Y}Ss=iXG-RPLJ;1QwOqk
zGzDS}f5vvmta<Qx>0Nq(x=5LPB>kj7o|0A~<L`I_f53}4jeE75d3aJ?%&SN{d=Ax(
ze2~h_x&@=f*#gnzZP-U9+WCjRm}rh!zZ%FzwYdYBHoA0Fh8}jS3~rMj!SprRZfobH
qG5V8^lW*iU-o`iV@9dXsC0l!OR<>Clr>nTj>}r^=)%rU4SC&5upUSEL

diff --git a/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc b/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc
index 1cd8bd7f67c084a29145580d9eb07701d30e068a..b8818deda14c16520c6e55297919bb351a57de12 100644
GIT binary patch
delta 371
zcmYk1$xZ@65Qe`QP-Fx_Q5L}!7jOmCxFjaNg7IXZe==bbPhL$(^ybA7AH#zOP9A*)
zU%|W2U=0Zg-Cdn8T~+C?K8jz(dMTR?{vLkr8wL1fVr7hPEFND6_1hVx2ot#U;HlDA
zo-mCI&^%f|1+<8kP!W{~Q@B}F#$`|iEu$)`5qf9^CDAHcL+fY*ZK671lAcE|8P~Wh
z+QQADZM1`SQG>2W<P+uSPNRO47oVOTtIo%1?Zq6!{umC%a2SJq;LP;`XS&BYGj8Eb
z+TP8(jWc!Q66)Z}qubO^aAtpst4<o2`&n!d%hpD1Hr6H1#`3vqUJXCJH!n!HJLg9&
R+wI|X;yLB#rry7U=pV8MKkNVi

delta 357
zcmY+9%}PRH5Qd*~5>3;7td5!XYh_mS57i>*0@_5In)NG(<F;)e;i6?om(ea)T}99>
zbRW?iL8y=UhKFHbp7$eqiyD<usc?7sb^lX_Z~nZZ^OgUH=YHd6JPxru%Jm<s-8hdG
z&@`GsWi*TC&^(HWbJzr`U`4cms%R0_hyzqd8MK6!(F$5cYiOM~LlTf=(j6<I1~!Q{
z&?eeKP1*sSkj@nCEZU~m4N1Iw+YOqim2wI@BiJ3mUJ8D|T=Wcc*L}=&4=^|Oxl12n
z(U2?X2y<!g?tP58`UzJ1Z*W?t7Y=2Ify@J)W1cDGwskRh4_<=7_1IG`EM{Ln3!Pt1
C-aV-R

diff --git a/ofu_app/ofu_app/settings.py b/ofu_app/ofu_app/settings.py
index e11c0da..249d803 100644
--- a/ofu_app/ofu_app/settings.py
+++ b/ofu_app/ofu_app/settings.py
@@ -23,8 +23,7 @@ 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', 'localhost', '127.0.0.1', ]
 
 # Application definition
 
@@ -162,4 +161,4 @@ STATICFILES_DIRS = [
 USE_X_FORWARDED_HOST = True
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 
-FORCE_SCRIPT_NAME = "app"
+# FORCE_SCRIPT_NAME = "app"