add main controller
This commit is contained in:
parent
905db542c3
commit
e4a70fe3e8
528
ofu_app/.idea/workspace.xml
generated
528
ofu_app/.idea/workspace.xml
generated
@ -13,7 +13,8 @@
|
||||
<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$migrate_data.coverage" NAME="migrate-data Coverage Results" MODIFIED="1506734953380" 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$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$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" />
|
||||
</component>
|
||||
<component name="DjangoConsoleOptions" custom-start-script="import sys; print('Python %s on %s' % (sys.version, sys.platform)) import django; print('Django %s' % django.get_version()) sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS]) if 'setup' in dir(django): django.setup() import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)">
|
||||
@ -25,15 +26,15 @@
|
||||
<file leaf-file-name="settings.py" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/ofu_app/settings.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2980">
|
||||
<caret line="149" column="18" lean-forward="false" selection-start-line="149" selection-start-column="18" selection-end-line="149" selection-end-column="18" />
|
||||
<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>
|
||||
</file>
|
||||
<file leaf-file-name="models.py" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/food/models.py">
|
||||
<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" />
|
||||
@ -44,16 +45,56 @@
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="daily_food.jinja" pinned="false" current-in-tab="true">
|
||||
<file leaf-file-name="daily_food.jinja" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/templates/food/daily_food.jinja">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="20">
|
||||
<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>
|
||||
</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">
|
||||
@ -84,18 +125,6 @@
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="views.py" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/food/views.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="120">
|
||||
<caret line="13" column="35" lean-forward="false" selection-start-line="13" selection-start-column="35" selection-end-line="13" selection-end-column="35" />
|
||||
<folding>
|
||||
<element signature="e#24#63#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
</leaf>
|
||||
</component>
|
||||
<component name="FileTemplateManagerImpl">
|
||||
@ -116,13 +145,10 @@
|
||||
<option value="$PROJECT_DIR$/data_collectors/food/json/controller-json-food.py" />
|
||||
<option value="$PROJECT_DIR$/data_collectors/food/parser/mensa-page-parser.py" />
|
||||
<option value="$PROJECT_DIR$/templates/food/daily-food.jinja" />
|
||||
<option value="$PROJECT_DIR$/data_collectors/food/migrate-data.py" />
|
||||
<option value="$PROJECT_DIR$/food/urls.py" />
|
||||
<option value="$PROJECT_DIR$/data_collectors/events/parser/fekide-eventpage-parser.py" />
|
||||
<option value="$PROJECT_DIR$/data_collectors/events/json_generator/controller-json-events.py" />
|
||||
<option value="$PROJECT_DIR$/food/models.py" />
|
||||
<option value="$PROJECT_DIR$/events/models.py" />
|
||||
<option value="$PROJECT_DIR$/data_collectors/events/migrate-data.py" />
|
||||
<option value="$PROJECT_DIR$/events/urls.py" />
|
||||
<option value="$PROJECT_DIR$/ofu_app/urls.py" />
|
||||
<option value="$PROJECT_DIR$/events/views.py" />
|
||||
@ -132,6 +158,11 @@
|
||||
<option value="$PROJECT_DIR$/templates/events/week_events.jinja" />
|
||||
<option value="$PROJECT_DIR$/templates/food/daily_food.jinja" />
|
||||
<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$/data_collectors/events/json_generator/controller-json-events.py" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@ -161,8 +192,6 @@
|
||||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="Scratches" />
|
||||
<pane id="Scope" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<PATH>
|
||||
@ -175,98 +204,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="templates" />
|
||||
<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="templates" />
|
||||
<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="templates" />
|
||||
<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="ofu_app" />
|
||||
<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="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="events" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
<PATH>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="ofu_app" />
|
||||
@ -299,6 +236,54 @@
|
||||
<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" />
|
||||
@ -317,8 +302,46 @@
|
||||
<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" />
|
||||
<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="apps" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="Scope" />
|
||||
<pane id="Scratches" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
@ -327,6 +350,9 @@
|
||||
<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$/data_collectors/events/parser" />
|
||||
<recent name="$PROJECT_DIR$/food/static" />
|
||||
@ -345,7 +371,7 @@
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager" selected="Python.migrate-data">
|
||||
<component name="RunManager" selected="Python.collect_and_migrate">
|
||||
<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" />
|
||||
@ -365,25 +391,6 @@
|
||||
<option name="EMULATE_TERMINAL" value="false" />
|
||||
<method />
|
||||
</configuration>
|
||||
<configuration default="false" name="controller-json-food" 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="" />
|
||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/data_collectors/food/json_generator" />
|
||||
<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/food/json_generator/controller-json-food.py" />
|
||||
<option name="PARAMETERS" value="" />
|
||||
<option name="SHOW_COMMAND_LINE" value="false" />
|
||||
<option name="EMULATE_TERMINAL" value="false" />
|
||||
<method />
|
||||
</configuration>
|
||||
<configuration default="false" name="controller-json-events" type="PythonConfigurationType" factoryName="Python" temporary="true">
|
||||
<option name="INTERPRETER_OPTIONS" value="" />
|
||||
<option name="PARENT_ENVS" value="true" />
|
||||
@ -441,6 +448,25 @@
|
||||
<option name="EMULATE_TERMINAL" value="false" />
|
||||
<method />
|
||||
</configuration>
|
||||
<configuration default="false" name="collect_and_migrate" 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" />
|
||||
<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/collect_and_migrate.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" />
|
||||
@ -638,18 +664,18 @@
|
||||
<list size="6">
|
||||
<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-food" />
|
||||
<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="5" class="java.lang.String" itemvalue="Python.migrate-data (1)" />
|
||||
<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" />
|
||||
</list>
|
||||
<recent_temporary>
|
||||
<list size="5">
|
||||
<item index="0" class="java.lang.String" itemvalue="Python.migrate-data" />
|
||||
<item index="1" class="java.lang.String" itemvalue="Python.migrate-data (1)" />
|
||||
<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.controller-json-food" />
|
||||
<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" />
|
||||
</list>
|
||||
</recent_temporary>
|
||||
</component>
|
||||
@ -679,17 +705,17 @@
|
||||
<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.2596154" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
||||
<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="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="false" 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="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="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="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" />
|
||||
@ -721,7 +747,7 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/food/models.py">
|
||||
<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" />
|
||||
@ -755,16 +781,72 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/food/views.py">
|
||||
<entry file="file://$PROJECT_DIR$/apps/food/views.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="120">
|
||||
<caret line="13" column="35" lean-forward="false" selection-start-line="13" selection-start-column="35" selection-end-line="13" selection-end-column="35" />
|
||||
<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>
|
||||
<entry file="file://$PROJECT_DIR$/ofu_app/settings.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2980">
|
||||
<caret line="149" column="18" lean-forward="false" selection-start-line="149" selection-start-column="18" selection-end-line="149" selection-end-column="18" />
|
||||
<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/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$/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>
|
||||
<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>
|
||||
<entry file="file://$PROJECT_DIR$/apps/food/views.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="120">
|
||||
<caret line="13" column="35" lean-forward="false" selection-start-line="13" selection-start-column="35" selection-end-line="13" selection-end-column="35" />
|
||||
<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">
|
||||
@ -781,7 +863,7 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/food/models.py">
|
||||
<entry file="file://$PROJECT_DIR$/apps/food/models.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<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" />
|
||||
@ -813,7 +895,7 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/food/models.py">
|
||||
<entry file="file://$PROJECT_DIR$/apps/food/models.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<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" />
|
||||
@ -845,20 +927,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<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="false" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="32" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<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="416">
|
||||
<caret line="38" column="61" lean-forward="false" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="79" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/data_collectors/events/parser/fekide-eventpage-parser.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1136">
|
||||
@ -866,21 +934,14 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/data_collectors/food/migrate-data.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="420">
|
||||
<caret line="42" column="74" lean-forward="false" selection-start-line="42" selection-start-column="74" selection-end-line="42" selection-end-column="81" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/events/models.py">
|
||||
<entry file="file://$PROJECT_DIR$/apps/events/models.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="260">
|
||||
<caret line="13" column="12" lean-forward="false" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="12" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/food/urls.py">
|
||||
<entry file="file://$PROJECT_DIR$/apps/food/urls.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="478">
|
||||
<caret line="24" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
|
||||
@ -898,7 +959,7 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/events/urls.py">
|
||||
<entry file="file://$PROJECT_DIR$/apps/events/urls.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="436">
|
||||
<caret line="22" column="0" lean-forward="true" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
|
||||
@ -908,20 +969,11 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/events/views.py">
|
||||
<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>
|
||||
<element signature="e#0#35#0" expanded="false" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/data_collectors/events/migrate-data.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="236">
|
||||
<caret line="19" column="16" lean-forward="false" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="16" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -932,31 +984,11 @@
|
||||
</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">
|
||||
<caret line="149" column="18" lean-forward="false" selection-start-line="149" selection-start-column="18" selection-end-line="149" selection-end-column="18" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/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$/food/views.py">
|
||||
<entry file="file://$PROJECT_DIR$/apps/food/views.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="120">
|
||||
<caret line="13" column="35" lean-forward="false" selection-start-line="13" selection-start-column="35" selection-end-line="13" selection-end-column="35" />
|
||||
<folding>
|
||||
<element signature="e#24#63#0" expanded="true" />
|
||||
</folding>
|
||||
<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>
|
||||
@ -968,14 +1000,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<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$/templates/base.jinja">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="460">
|
||||
@ -984,13 +1008,81 @@
|
||||
</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="20">
|
||||
<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$/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/food/migrate-data.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" />
|
||||
<folding>
|
||||
<element signature="e#0#11#0" expanded="false" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<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>
|
||||
<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>
|
||||
<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>
|
||||
<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>
|
||||
</component>
|
||||
</project>
|
||||
BIN
ofu_app/apps/__pycache__/__init__.cpython-35.pyc
Normal file
BIN
ofu_app/apps/__pycache__/__init__.cpython-35.pyc
Normal file
Binary file not shown.
BIN
ofu_app/apps/events/__pycache__/__init__.cpython-35.pyc
Normal file
BIN
ofu_app/apps/events/__pycache__/__init__.cpython-35.pyc
Normal file
Binary file not shown.
BIN
ofu_app/apps/events/__pycache__/admin.cpython-35.pyc
Normal file
BIN
ofu_app/apps/events/__pycache__/admin.cpython-35.pyc
Normal file
Binary file not shown.
Binary file not shown.
@ -14,8 +14,8 @@ Including another URLconf
|
||||
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
|
||||
"""
|
||||
from django.conf.urls import url
|
||||
from django.contrib import admin
|
||||
from events import views
|
||||
|
||||
from apps.events import views
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^week/', views.week_events, name='week-events'),
|
||||
@ -1,7 +1,9 @@
|
||||
from django.shortcuts import render
|
||||
from events.models import Event
|
||||
import datetime
|
||||
|
||||
from django.shortcuts import render
|
||||
|
||||
from apps.events import Event
|
||||
|
||||
|
||||
# Create your views here.
|
||||
def week_events(request):
|
||||
BIN
ofu_app/apps/food/__pycache__/__init__.cpython-35.pyc
Normal file
BIN
ofu_app/apps/food/__pycache__/__init__.cpython-35.pyc
Normal file
Binary file not shown.
BIN
ofu_app/apps/food/__pycache__/admin.cpython-35.pyc
Normal file
BIN
ofu_app/apps/food/__pycache__/admin.cpython-35.pyc
Normal file
Binary file not shown.
Binary file not shown.
@ -5,4 +5,4 @@ from django.apps import AppConfig
|
||||
|
||||
|
||||
class FoodConfig(AppConfig):
|
||||
name = 'food'
|
||||
name = 'apps.food'
|
||||
@ -45,6 +45,6 @@ class Migration(migrations.Migration):
|
||||
migrations.AddField(
|
||||
model_name='menu',
|
||||
name='menu',
|
||||
field=models.ManyToManyField(to='food.SingleFood'),
|
||||
field=models.ManyToManyField(to='apps.food.SingleFood'),
|
||||
),
|
||||
]
|
||||
0
ofu_app/apps/food/migrations/__init__.py
Normal file
0
ofu_app/apps/food/migrations/__init__.py
Normal file
@ -14,8 +14,8 @@ Including another URLconf
|
||||
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
|
||||
"""
|
||||
from django.conf.urls import url
|
||||
from django.contrib import admin
|
||||
from food import views
|
||||
|
||||
from apps.food import views
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^all/', views.food, name='food'),
|
||||
@ -1,12 +1,11 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.shortcuts import render
|
||||
import datetime
|
||||
from food.models import Menu, HappyHour
|
||||
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.http import HttpResponse
|
||||
from django.shortcuts import render
|
||||
|
||||
from apps.food import Menu, HappyHour
|
||||
|
||||
|
||||
# Create your views here.
|
||||
7
ofu_app/data_collectors/collect_and_migrate.py
Normal file
7
ofu_app/data_collectors/collect_and_migrate.py
Normal file
@ -0,0 +1,7 @@
|
||||
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')
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -6,7 +6,7 @@ parser_event_univis_pretty = importlib.import_module('data_collectors.events.par
|
||||
parser_event_fekide = importlib.import_module('data_collectors.events.parser.fekide-eventpage-parser')
|
||||
|
||||
# CONFIG
|
||||
JSON_OUTPUT_DIR_EVENTS = "./jsons/"
|
||||
JSON_OUTPUT_DIR_EVENTS = "./events/json_generator/jsons/"
|
||||
|
||||
|
||||
def writeToFile(jsonfile, root, filename):
|
||||
@ -17,23 +17,23 @@ def writeToFile(jsonfile, root, filename):
|
||||
def main():
|
||||
try:
|
||||
json_events_univis = parser_event_univis.parsePage()
|
||||
except IndexError:
|
||||
except:
|
||||
print("Error")
|
||||
json_events_univis = {}
|
||||
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 IndexError:
|
||||
except:
|
||||
print("Error")
|
||||
json_events_univis_pretty = {}
|
||||
json_events_univis_pretty = "{}"
|
||||
|
||||
try:
|
||||
json_events_fekide = parser_event_fekide.parsePage()
|
||||
except IndexError:
|
||||
except:
|
||||
print("Error")
|
||||
json_events_fekide = {}
|
||||
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")
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,14 +1,17 @@
|
||||
import json
|
||||
from pprint import pprint
|
||||
import django, os
|
||||
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 events.models import Event
|
||||
from apps.events.models import Event
|
||||
|
||||
JSON_FILES_PATH_EVENTS = "json_generator/jsons/"
|
||||
# JSON_FILES_PATH_EVENTS = "json_generator/jsons/"
|
||||
JSON_FILES_PATH_EVENTS = "events/json_generator/jsons/"
|
||||
|
||||
|
||||
def getJsonFromFile(path):
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -6,7 +6,7 @@ parser_food_cafete = importlib.import_module('data_collectors.food.parser.cafete
|
||||
parser_food_fekidehappyhour = importlib.import_module('data_collectors.food.parser.fekide-happyhour-page-parser')
|
||||
|
||||
# CONFIG
|
||||
JSON_OUTPUT_DIR_FOOD = "./jsons/"
|
||||
JSON_OUTPUT_DIR_FOOD = "./food/json_generator/jsons/"
|
||||
|
||||
# CONFIG SERVICE LINKS
|
||||
LINK_FEKI_MENSA = "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"
|
||||
|
||||
@ -1 +1 @@
|
||||
{"weekmenu": [{"date": "24.07.", "menu": ["Rinderhacksteak an Cognacso\u00dfe und Sp\u00e4tzle"]}, {"date": "25.07.", "menu": ["Gem\u00fcseschnitzel mit Kr\u00e4utercreme und Kartoffeln"]}, {"date": "26.07.", "menu": ["Penne-Nudeln mit Hackfleischso\u00dfe"]}, {"date": "27.07.", "menu": ["Kaiserschmarrn mit Apfelmus"]}], "name": "Cafeteria Erba-Insel", "execution_time": "Friday, 29.09.2017"}
|
||||
{"execution_time": "Sunday, 01.10.2017", "name": "Cafeteria Erba-Insel", "weekmenu": [{"date": "24.07.", "menu": ["Rinderhacksteak an Cognacso\u00dfe und Sp\u00e4tzle"]}, {"date": "25.07.", "menu": ["Gem\u00fcseschnitzel mit Kr\u00e4utercreme und Kartoffeln"]}, {"date": "26.07.", "menu": ["Penne-Nudeln mit Hackfleischso\u00dfe"]}, {"date": "27.07.", "menu": ["Kaiserschmarrn mit Apfelmus"]}]}
|
||||
@ -1 +1 @@
|
||||
{"weekmenu": [{"date": "24.07.", "menu": ["Vegetarisches Chili sin Carne"]}, {"date": "25.07.", "menu": ["Gem\u00fcseschnitzel mit Kr\u00e4utercreme und Kartoffeln"]}, {"date": "26.07.", "menu": ["\u00dcberbackene Zucchini an Paprikaso\u00dfe mit P\u00fcree"]}, {"date": "27.07.", "menu": ["Kaiserschmarrn mit Apfelmus"]}], "name": "Cafeteria Markusplatz", "execution_time": "Friday, 29.09.2017"}
|
||||
{"execution_time": "Sunday, 01.10.2017", "name": "Cafeteria Markusplatz", "weekmenu": [{"date": "24.07.", "menu": ["Vegetarisches Chili sin Carne"]}, {"date": "25.07.", "menu": ["Gem\u00fcseschnitzel mit Kr\u00e4utercreme und Kartoffeln"]}, {"date": "26.07.", "menu": ["\u00dcberbackene Zucchini an Paprikaso\u00dfe mit P\u00fcree"]}, {"date": "27.07.", "menu": ["Kaiserschmarrn mit Apfelmus"]}]}
|
||||
@ -1 +1 @@
|
||||
{"execution_time": "Friday, 29.09.2017", "day": "Friday, 29.09.2017", "happyhours": [{"time": "16:00 - 20:00", "location": "Caff\u00e8bar Kranen", "description": "Aperitivo Italiano\u00a0incl. Antipasti"}, {"time": "17:00 - 21:00", "location": "Caf\u00e9 Esspress", "description": "Steakteller f\u00fcr 11,99 \u20ac"}]}
|
||||
{"execution_time": "Sunday, 01.10.2017", "day": "Sunday, 01.10.2017", "happyhours": []}
|
||||
@ -1 +1 @@
|
||||
{"weekmenu": [{"date": "25.09.", "menu": ["Pangasiusfilet an fr\u00e4nkischer Silvanerso\u00dfe mit Gem\u00fcsestreifen", "2 St\u00fcck H\u00e4hnchenschnitzel \"Wiener Art\"", "Kasseler mit gr\u00fcnem Bohnengem\u00fcse", "Waldpilzpfanne", "Wedges mit Kr\u00e4uterquark"]}, {"date": "26.09.", "menu": ["2 St\u00fcck H\u00e4hnchenschnitzel \"Wiener Art\"", "Saftiges Rindergulasch", "Ofenfrischer Schweinekammbraten in Bierso\u00dfe", "Mensa Vital : Bohnen-Zucchini-Chili mit Vollkornreis"]}, {"date": "27.09.", "menu": ["H\u00e4hnchenkeule \"Z\u00fcricher Art\"", "Ofenfrischer Schweinekammbraten in Bierso\u00dfe", "Pulled Pork Burger mit Coleslaw", "Griechischer Kartoffelgem\u00fcseauflauf mit Paprika, Zucchini & Auberginen"]}, {"date": "28.09.", "menu": ["Moussaka vom Rind", "H\u00e4hnchenkeule \"Z\u00fcricher Art\"", "Falafelb\u00e4llchen auf Couscous Gem\u00fcse", "Pulled Pork Burger mit Coleslaw", "Rustico Triangolo \"Spinaci\" an Sahneso\u00dfe"]}, {"date": "29.09.", "menu": ["Pennenudeln mit Lachs, Spinat und Kirschtomaten", "Falafelb\u00e4llchen auf Couscous Gem\u00fcse", "Feuerspie\u00df mit Barbecueso\u00dfe", "Rustico Triangolo \"Spinaci\" an Sahneso\u00dfe", "Vegane Knusperschnitte \"Hong Kong\" mit Chop suey"]}], "name": "Speiseplan f\u00fcr Austra\u00dfe Bamberg", "execution_time": "Friday, 29.09.2017"}
|
||||
{"execution_time": "Sunday, 01.10.2017", "name": "Speiseplan f\u00fcr Austra\u00dfe Bamberg", "weekmenu": [{"date": "25.09.", "menu": ["Pangasiusfilet an fr\u00e4nkischer Silvanerso\u00dfe mit Gem\u00fcsestreifen", "2 St\u00fcck H\u00e4hnchenschnitzel \"Wiener Art\"", "Kasseler mit gr\u00fcnem Bohnengem\u00fcse", "Waldpilzpfanne", "Wedges mit Kr\u00e4uterquark"]}, {"date": "26.09.", "menu": ["2 St\u00fcck H\u00e4hnchenschnitzel \"Wiener Art\"", "Saftiges Rindergulasch", "Ofenfrischer Schweinekammbraten in Bierso\u00dfe", "Mensa Vital : Bohnen-Zucchini-Chili mit Vollkornreis"]}, {"date": "27.09.", "menu": ["H\u00e4hnchenkeule \"Z\u00fcricher Art\"", "Ofenfrischer Schweinekammbraten in Bierso\u00dfe", "Pulled Pork Burger mit Coleslaw", "Griechischer Kartoffelgem\u00fcseauflauf mit Paprika, Zucchini & Auberginen"]}, {"date": "28.09.", "menu": ["Moussaka vom Rind", "H\u00e4hnchenkeule \"Z\u00fcricher Art\"", "Falafelb\u00e4llchen auf Couscous Gem\u00fcse", "Pulled Pork Burger mit Coleslaw", "Rustico Triangolo \"Spinaci\" an Sahneso\u00dfe"]}, {"date": "29.09.", "menu": ["Pennenudeln mit Lachs, Spinat und Kirschtomaten", "Feuerspie\u00df mit Barbecueso\u00dfe", "Falafelb\u00e4llchen auf Couscous Gem\u00fcse", "Vegane Knusperschnitte \"Hong Kong\" mit Chop suey", "Rustico Triangolo \"Spinaci\" an Sahneso\u00dfe"]}]}
|
||||
@ -1 +1 @@
|
||||
{"weekmenu": [{"date": "25.09.", "menu": ["Chili con Carne", "2 St\u00fcck H\u00e4hnchenschnitzel \"Wiener Art\"", "Kasseler mit gr\u00fcnem Bohnengem\u00fcse", "Waldpilzpfanne"]}, {"date": "26.09.", "menu": ["Pangasiusfilet an fr\u00e4nkischer Silvanerso\u00dfe mit Gem\u00fcsestreifen", "Saftiges Rindergulasch", "Kasseler mit gr\u00fcnem Bohnengem\u00fcse", "Ofenfrischer Schweinekammbraten in Bierso\u00dfe", "Blumenkohlk\u00e4semedaillon mit Pestoso\u00dfe", "Mensa Vital : Bohnen-Zucchini-Chili mit Vollkornreis"]}, {"date": "27.09.", "menu": ["Pangasiusfilet an fr\u00e4nkischer Silvanerso\u00dfe mit Gem\u00fcsestreifen", "H\u00e4hnchenkeule \"Z\u00fcricher Art\"", "Pulled Pork Burger mit Coleslaw", "Mensa Vital : Bohnen-Zucchini-Chili mit Vollkornreis", "Griechischer Kartoffelgem\u00fcseauflauf mit Paprika, Zucchini & Auberginen"]}, {"date": "28.09.", "menu": ["Moussaka vom Rind", "Falafelb\u00e4llchen auf Couscous Gem\u00fcse", "Ofenfrischer Schweinekammbraten in Bierso\u00dfe", "Rustico Triangolo \"Spinaci\" an Sahneso\u00dfe"]}, {"date": "29.09.", "menu": ["Pennenudeln mit Lachs, Spinat und Kirschtomaten", "Falafelb\u00e4llchen auf Couscous Gem\u00fcse", "Feuerspie\u00df mit Barbecueso\u00dfe", "Vegane Knusperschnitte \"Hong Kong\" mit Chop suey"]}], "name": "Speiseplan f\u00fcr Feldkirchenstra\u00dfe Bamberg", "execution_time": "Friday, 29.09.2017"}
|
||||
{"execution_time": "Sunday, 01.10.2017", "name": "Speiseplan f\u00fcr Feldkirchenstra\u00dfe Bamberg", "weekmenu": [{"date": "25.09.", "menu": ["Chili con Carne", "2 St\u00fcck H\u00e4hnchenschnitzel \"Wiener Art\"", "Kasseler mit gr\u00fcnem Bohnengem\u00fcse", "Waldpilzpfanne"]}, {"date": "26.09.", "menu": ["Pangasiusfilet an fr\u00e4nkischer Silvanerso\u00dfe mit Gem\u00fcsestreifen", "Saftiges Rindergulasch", "Kasseler mit gr\u00fcnem Bohnengem\u00fcse", "Ofenfrischer Schweinekammbraten in Bierso\u00dfe", "Blumenkohlk\u00e4semedaillon mit Pestoso\u00dfe", "Mensa Vital : Bohnen-Zucchini-Chili mit Vollkornreis"]}, {"date": "27.09.", "menu": ["Pangasiusfilet an fr\u00e4nkischer Silvanerso\u00dfe mit Gem\u00fcsestreifen", "H\u00e4hnchenkeule \"Z\u00fcricher Art\"", "Pulled Pork Burger mit Coleslaw", "Mensa Vital : Bohnen-Zucchini-Chili mit Vollkornreis", "Griechischer Kartoffelgem\u00fcseauflauf mit Paprika, Zucchini & Auberginen"]}, {"date": "28.09.", "menu": ["Moussaka vom Rind", "Falafelb\u00e4llchen auf Couscous Gem\u00fcse", "Ofenfrischer Schweinekammbraten in Bierso\u00dfe", "Rustico Triangolo \"Spinaci\" an Sahneso\u00dfe"]}, {"date": "29.09.", "menu": ["Pennenudeln mit Lachs, Spinat und Kirschtomaten", "Falafelb\u00e4llchen auf Couscous Gem\u00fcse", "Feuerspie\u00df mit Barbecueso\u00dfe", "Vegane Knusperschnitte \"Hong Kong\" mit Chop suey"]}]}
|
||||
@ -1,14 +1,17 @@
|
||||
import json
|
||||
from pprint import pprint
|
||||
import django, os
|
||||
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 food.models import SingleFood, Menu, HappyHour
|
||||
from apps.food.models import SingleFood, Menu, HappyHour
|
||||
|
||||
JSON_FILES_PATH_FOOD = "json_generator/jsons/"
|
||||
# JSON_FILES_PATH_FOOD = "json_generator/jsons/"
|
||||
JSON_FILES_PATH_FOOD = "food/json_generator/jsons/"
|
||||
|
||||
|
||||
def getJsonFromFile(path):
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -36,8 +36,8 @@ INSTALLED_APPS = [
|
||||
'django.contrib.messages',
|
||||
'django.contrib.staticfiles',
|
||||
'django_jinja',
|
||||
'food',
|
||||
'events',
|
||||
'apps.food',
|
||||
'apps.events',
|
||||
]
|
||||
|
||||
MIDDLEWARE = [
|
||||
|
||||
@ -20,6 +20,6 @@ urlpatterns = [
|
||||
url(r'^admin/', admin.site.urls),
|
||||
|
||||
# -- Apps --
|
||||
url(r'^food/', include('food.urls')),
|
||||
url(r'^events/', include('events.urls')),
|
||||
url(r'^food/', include('apps.food.urls')),
|
||||
url(r'^events/', include('apps.events.urls')),
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user