mgoetz/basta-server
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gui update, introduce jinja2 macros

Browse Source
This commit is contained in:
Götz 2017-10-08 00:43:53 +02:00
parent a1d570c2fb
commit 9272880180
35 changed files with 14790 additions and 568 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

647
ofu_app/.idea/workspace.xml generated
View File

@ -23,56 +23,14 @@
<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)" />
</component>
<component name="DockManager">
<window id="2">
<content type="file-editors">
<state>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="models.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/apps/events/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="13" column="49" lean-forward="true" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</state>
</content>
</window>
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="migrate_data.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/apps/food/utils/migrate_data.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="20">
<caret line="23" column="6" lean-forward="false" selection-start-line="23" selection-start-column="6" selection-end-line="23" selection-end-column="6" />
<folding>
<element signature="e#0#11#0" expanded="true" />
</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="140">
<caret line="21" column="42" lean-forward="false" selection-start-line="21" selection-start-column="42" selection-end-line="21" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="home.jinja" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/home.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="316">
<caret line="33" column="46" lean-forward="false" selection-start-line="33" selection-start-column="46" selection-end-line="33" selection-end-column="46" />
<state relative-caret-position="300">
<caret line="39" column="54" lean-forward="false" selection-start-line="39" selection-start-column="54" selection-end-line="39" selection-end-column="54" />
<folding />
</state>
</provider>
@ -81,8 +39,50 @@
<file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/ofu_app/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="433">
<caret line="26" column="11" lean-forward="true" selection-start-line="26" selection-start-column="11" selection-end-line="26" selection-end-column="11" />
<state relative-caret-position="540">
<caret line="27" column="39" lean-forward="false" selection-start-line="27" selection-start-column="39" selection-end-line="27" selection-end-column="49" />
<folding>
<element signature="e#641#682#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="views.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/ofu_app/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="11" column="34" lean-forward="false" selection-start-line="11" selection-start-column="34" selection-end-line="11" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="home.jinja" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/templates/links/home.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="18" column="12" lean-forward="false" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="overview_pages.jinja" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/macros/overview_pages.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="food_macros.jinja" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/macros/food_macros.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="33" column="50" lean-forward="false" selection-start-line="33" selection-start-column="50" selection-end-line="33" selection-end-column="50" />
<folding />
</state>
</provider>
@ -91,61 +91,39 @@
<file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/apps/food/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="22" column="55" lean-forward="false" selection-start-line="22" selection-start-column="45" selection-end-line="22" selection-end-column="55" />
<state relative-caret-position="440">
<caret line="24" column="46" lean-forward="false" selection-start-line="24" selection-start-column="16" selection-end-line="24" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="food.jinja" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/templates/food/food.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="21" column="47" lean-forward="false" selection-start-line="21" selection-start-column="47" selection-end-line="21" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="events.jinja" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/events/events.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="516">
<caret line="27" column="10" lean-forward="true" selection-start-line="5" selection-start-column="4" selection-end-line="27" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="daily_food.jinja" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/food/daily_food.jinja">
<file leaf-file-name="home.jinja" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/food/home.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="26" lean-forward="true" selection-start-line="0" selection-start-column="26" selection-end-line="0" selection-end-column="26" />
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="12" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="mensa_page_parser.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/apps/food/utils/parser/mensa_page_parser.py">
<file leaf-file-name="home.jinja" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/events/home.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="303">
<caret line="45" column="28" lean-forward="false" selection-start-line="45" selection-start-column="28" selection-end-line="45" selection-end-column="28" />
<state relative-caret-position="160">
<caret line="8" column="50" lean-forward="false" selection-start-line="8" selection-start-column="50" selection-end-line="8" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="cafete_page_parser.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/apps/food/utils/parser/cafete_page_parser.py">
<file leaf-file-name="home.jinja" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/home.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="33" column="19" lean-forward="true" selection-start-line="33" selection-start-column="19" selection-end-line="33" selection-end-column="19" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
<state relative-caret-position="220">
<caret line="11" column="69" lean-forward="false" selection-start-line="11" selection-start-column="69" selection-end-line="11" selection-end-column="69" />
<folding />
</state>
</provider>
</entry>
@ -164,17 +142,12 @@
<find>PIP</find>
<find>Cajónbau Workshop'</find>
<find>Frau</find>
<find>url</find>
</findStrings>
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/events/models.py" />
<option value="$PROJECT_DIR$/events/urls.py" />
<option value="$PROJECT_DIR$/events/views.py" />
<option value="$PROJECT_DIR$/food/views.py" />
<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/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" />
@ -185,16 +158,8 @@
<option value="$PROJECT_DIR$/apps/events/admin.py" />
<option value="$PROJECT_DIR$/apps/food/admin.py" />
<option value="$PROJECT_DIR$/apps/events/urls.py" />
<option value="$PROJECT_DIR$/ofu_app/views.py" />
<option value="$PROJECT_DIR$/templates/food/food_home.jinja" />
<option value="$PROJECT_DIR$/apps/food/urls.py" />
<option value="$PROJECT_DIR$/apps/food/views.py" />
<option value="$PROJECT_DIR$/templates/events/week_events.jinja" />
<option value="$PROJECT_DIR$/templates/events/events.jinja" />
<option value="$PROJECT_DIR$/donar/models.py" />
<option value="$PROJECT_DIR$/templates/food/daily_food.jinja" />
<option value="$PROJECT_DIR$/apps/donar/management/commands/import_events.py" />
<option value="$PROJECT_DIR$/ofu_app/urls.py" />
<option value="$PROJECT_DIR$/apps/donar/views.py" />
<option value="$PROJECT_DIR$/apps/donar/utils/migrate_data.py" />
<option value="$PROJECT_DIR$/apps/donar/models.py" />
@ -202,13 +167,10 @@
<option value="$PROJECT_DIR$/apps/donar/utils/parser/univis_rooms_parser.py" />
<option value="$PROJECT_DIR$/apps/events/management/commands/import_events.py" />
<option value="$PROJECT_DIR$/apps/food/models.py" />
<option value="$PROJECT_DIR$/ofu_app/settings.py" />
<option value="$PROJECT_DIR$/apps/events/utils/parser/univis_eventpage_parser.py" />
<option value="$PROJECT_DIR$/apps/events/models.py" />
<option value="$PROJECT_DIR$/apps/events/utils/parser/fekide_eventpage_parser.py" />
<option value="$PROJECT_DIR$/templates/events/all_events.jinja" />
<option value="$PROJECT_DIR$/apps/events/utils/migrate_data.py" />
<option value="$PROJECT_DIR$/apps/events/views.py" />
<option value="$PROJECT_DIR$/apps/food/utils/parser/fekide_happyhour_page_parser.py" />
<option value="$PROJECT_DIR$/apps/food/utils/json_generator/controller_json_food.py" />
<option value="$PROJECT_DIR$/apps/food/management/commands/import_food.py" />
@ -216,10 +178,27 @@
<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$/templates/food/isTest.jinja" />
<option value="$PROJECT_DIR$/templates/base.jinja" />
<option value="$PROJECT_DIR$/templates/home.jinja" />
<option value="$PROJECT_DIR$/apps/donar/urls.py" />
<option value="$PROJECT_DIR$/ofu_app/settings.py" />
<option value="$PROJECT_DIR$/ofu_app/jinja2.py" />
<option value="$PROJECT_DIR$/templates/food/food.jinja" />
<option value="$PROJECT_DIR$/templates/base.jinja" />
<option value="$PROJECT_DIR$/apps/events/views.py" />
<option value="$PROJECT_DIR$/templates/events/all_events.jinja" />
<option value="$PROJECT_DIR$/templates/events/week_events.jinja" />
<option value="$PROJECT_DIR$/templates/food/daily_food.jinja" />
<option value="$PROJECT_DIR$/templates/food/weekly_food.jinja" />
<option value="$PROJECT_DIR$/apps/food/urls.py" />
<option value="$PROJECT_DIR$/templates/macros/food_macros.jinja" />
<option value="$PROJECT_DIR$/apps/food/views.py" />
<option value="$PROJECT_DIR$/templates/food/food_home.jinja" />
<option value="$PROJECT_DIR$/templates/events/events.jinja" />
<option value="$PROJECT_DIR$/templates/events/home.jinja" />
<option value="$PROJECT_DIR$/ofu_app/views.py" />
<option value="$PROJECT_DIR$/templates/macros/overview_pages.jinja" />
<option value="$PROJECT_DIR$/ofu_app/urls.py" />
<option value="$PROJECT_DIR$/templates/home.jinja" />
<option value="$PROJECT_DIR$/templates/links/home.jinja" />
</list>
</option>
</component>
@ -249,6 +228,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
@ -289,7 +269,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="food" />
<option name="myItemId" value="macros" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@ -306,78 +286,77 @@
<option name="myItemId" value="templates" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="links" />
<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="apps" />
<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_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="apps" />
<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="templates" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="donar" />
<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="apps" />
<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_ELEMENT>
<option name="myItemId" value="food" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
@ -745,19 +724,18 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="0" y="27" width="1920" height="1053" extended-state="6" />
<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.123931624" 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="false" show_stripe_button="true" weight="0.3180328" 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="10" 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.32896176" sideWeight="0.5" order="8" 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.32896176" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18963675" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<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="Find" 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="1" 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.32896176" sideWeight="0.5" order="9" 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="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="4" side_tool="false" content_ui="tabs" />
@ -766,6 +744,7 @@
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" 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="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" 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="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" 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" />
</layout>
</component>
@ -782,37 +761,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<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$/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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ofu_app/settings.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/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" />
<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/collect_and_migrate.py" />
<entry file="file://$PROJECT_DIR$/ofu_app/wsgi.py">
<provider selected="true" editor-type-id="text-editor">
@ -828,40 +776,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ofu_app/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="7" column="11" lean-forward="false" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
<folding>
<element signature="e#24#63#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/food/food_home.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206">
<caret line="12" column="51" lean-forward="false" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/apps/food/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="517">
<caret line="58" column="21" lean-forward="false" selection-start-line="58" selection-start-column="21" selection-end-line="58" selection-end-column="21" />
<folding>
<element signature="e#24#63#0" expanded="false" />
</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="200">
<caret line="10" column="81" lean-forward="true" selection-start-line="10" selection-start-column="32" selection-end-line="10" selection-end-column="81" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/apps/donar/management/commands/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@ -908,9 +822,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="20">
<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>
<element signature="e#0#15#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@ -925,7 +836,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="7" column="1" lean-forward="false" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
@ -933,7 +843,6 @@
<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>
@ -949,7 +858,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="320">
<caret line="16" column="15" lean-forward="false" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
@ -961,19 +869,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ofu_app/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="860">
<caret line="43" column="13" lean-forward="false" selection-start-line="42" selection-start-column="2" selection-end-line="50" selection-end-column="3" />
<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="340">
<caret line="19" column="38" lean-forward="false" selection-start-line="19" selection-start-column="38" selection-end-line="19" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
@ -989,7 +888,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="880">
<caret line="49" column="97" lean-forward="false" selection-start-line="49" selection-start-column="97" selection-end-line="49" selection-end-column="97" />
<folding />
</state>
</provider>
</entry>
@ -997,7 +895,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="35" lean-forward="true" selection-start-line="0" selection-start-column="35" selection-end-line="0" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
@ -1009,22 +906,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/apps/events/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="13" column="49" lean-forward="true" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/events/all_events.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="20" column="56" lean-forward="false" selection-start-line="20" selection-start-column="56" selection-end-line="20" selection-end-column="56" />
<folding />
</state>
</provider>
</entry>
<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="1060">
@ -1045,14 +926,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/apps/events/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="560">
<caret line="32" column="0" lean-forward="true" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
<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">
@ -1069,20 +942,13 @@
</state>
</provider>
</entry>
<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="100">
<caret line="5" column="1" lean-forward="false" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/apps/food/utils/json_generator/controller_json_food.py" />
<entry file="file://$PROJECT_DIR$/apps/food/management/commands/import_food.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="40">
<caret line="2" column="40" lean-forward="true" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
<folding>
<element signature="e#0#65#0" expanded="true" />
<element signature="e#0#65#0" expanded="false" />
</folding>
</state>
</provider>
@ -1092,61 +958,28 @@
<state relative-caret-position="0">
<caret line="33" column="19" lean-forward="true" selection-start-line="33" selection-start-column="19" selection-end-line="33" selection-end-column="19" />
<folding>
<element signature="e#0#15#0" expanded="true" />
<element signature="e#0#15#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<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="303">
<state relative-caret-position="840">
<caret line="45" column="28" lean-forward="false" selection-start-line="45" selection-start-column="28" selection-end-line="45" selection-end-column="28" />
<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="20">
<state relative-caret-position="360">
<caret line="23" column="6" lean-forward="false" selection-start-line="23" selection-start-column="6" selection-end-line="23" selection-end-column="6" />
<folding>
<element signature="e#0#11#0" expanded="true" />
<element signature="e#0#11#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/food/isTest.jinja">
<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$/templates/food/daily_food.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="26" lean-forward="true" selection-start-line="0" selection-start-column="26" selection-end-line="0" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/base.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="21" column="42" lean-forward="false" selection-start-line="21" selection-start-column="42" selection-end-line="21" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/home.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="316">
<caret line="33" column="46" lean-forward="false" selection-start-line="33" selection-start-column="46" selection-end-line="33" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/apps/donar/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
@ -1155,34 +988,174 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ofu_app/urls.py">
<entry file="file://$PROJECT_DIR$/apps/events/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="433">
<caret line="26" column="11" lean-forward="true" selection-start-line="26" selection-start-column="11" selection-end-line="26" selection-end-column="11" />
<state relative-caret-position="220">
<caret line="13" column="49" lean-forward="true" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/events/events.jinja">
<entry file="file://$PROJECT_DIR$/ofu_app/jinja2.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="516">
<caret line="27" column="10" lean-forward="true" selection-start-line="5" selection-start-column="4" selection-end-line="27" selection-end-column="10" />
<state relative-caret-position="180">
<caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<folding>
<element signature="e#0#66#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="1240">
<caret line="62" column="35" lean-forward="false" selection-start-line="62" selection-start-column="35" selection-end-line="62" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/base.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="44" column="45" lean-forward="true" selection-start-line="44" selection-start-column="45" selection-end-line="44" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/food/isTest.jinja">
<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="200">
<caret line="14" column="20" lean-forward="false" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
<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="360">
<caret line="18" column="29" lean-forward="false" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/events/all_events.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="20" column="40" lean-forward="true" selection-start-line="20" selection-start-column="40" selection-end-line="20" selection-end-column="40" />
<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="420">
<caret line="21" column="45" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="47" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/food/weekly_food.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="280">
<caret line="14" column="77" lean-forward="false" selection-start-line="14" selection-start-column="77" selection-end-line="14" selection-end-column="77" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/food/food_home.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="237">
<caret line="12" column="51" lean-forward="false" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/events/home.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160">
<caret line="8" column="50" lean-forward="false" selection-start-line="8" selection-start-column="50" selection-end-line="8" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/apps/food/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="22" column="55" lean-forward="false" selection-start-line="22" selection-start-column="45" selection-end-line="22" selection-end-column="55" />
<state relative-caret-position="440">
<caret line="24" column="46" lean-forward="false" selection-start-line="24" selection-start-column="16" selection-end-line="24" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/food/food.jinja">
<entry file="file://$PROJECT_DIR$/ofu_app/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="21" column="47" lean-forward="false" selection-start-line="21" selection-start-column="47" selection-end-line="21" selection-end-column="47" />
<state relative-caret-position="180">
<caret line="11" column="34" lean-forward="false" selection-start-line="11" selection-start-column="34" selection-end-line="11" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/food/home.jinja">
<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="12" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/macros/overview_pages.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
<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="300">
<caret line="39" column="54" lean-forward="false" selection-start-line="39" selection-start-column="54" selection-end-line="39" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/macros/food_macros.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="33" column="50" lean-forward="false" selection-start-line="33" selection-start-column="50" selection-end-line="33" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ofu_app/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<caret line="27" column="39" lean-forward="false" selection-start-line="27" selection-start-column="39" selection-end-line="27" selection-end-column="49" />
<folding>
<element signature="e#641#682#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/home.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="11" column="69" lean-forward="false" selection-start-line="11" selection-start-column="69" selection-end-line="11" selection-end-column="69" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/links/home.jinja">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="18" column="12" lean-forward="false" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="12" />
<folding />
</state>
</provider>

2
ofu_app/apps/events/views.py
View File

@ -7,7 +7,7 @@ from apps.events.models import Event
# Create your views here.
def events_main_page(request):
return render(request, "events/events.jinja")
return render(request, "events/home.jinja")
def all_events(request):

2
ofu_app/apps/food/urls.py
View File

@ -21,6 +21,6 @@ urlpatterns = [
url(r'^$', views.food, name='food'),
# Daily Menus
url(r'^daily/$', views.daily_food, name='daily-food'),
url(r'^weekly/$', views.daily_food, name='weekly-food'),
url(r'^weekly/$', views.weekly_food, name='weekly-food'),
url(r'^all/$', views.food, name='all-food'),
]

17
ofu_app/apps/food/views.py
View File

@ -12,12 +12,12 @@ from apps.food.models import Menu, HappyHour
def daily_food(request):
today = datetime.datetime.now()
daily_menus = Menu.objects.filter(date__exact=today)
feki_menu = daily_menus.filter(location__contains="Feldkirchenstraße").last()
austr_menu = daily_menus.filter(location__contains="Austraße").last()
erba_cafete = daily_menus.filter(location__contains="Erba").last()
markus_cafete = daily_menus.filter(location__contains="markus").last()
feki_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Feldkirchenstraße").last()
austr_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Austraße").last()
erba_cafete = Menu.objects.filter(date__exact=today).filter(location__contains="Erba").last()
markus_cafete = Menu.objects.filter(date__exact=today).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,
@ -30,15 +30,14 @@ def daily_food(request):
def weekly_food(request):
today = datetime.datetime.now()
lastday = datetime.datetime.now() + datetime.timedelta(7)
lastday = today + datetime.timedelta(7)
weekly_menus = Menu.objects.filter(date__gte=today, date__lte=lastday)
feki_menu = weekly_menus.filter(location__contains="Feldkirchenstraße")
austr_menu = weekly_menus.filter(location__contains="Austraße")
erba_cafete = weekly_menus.filter(location__contains="Erba")
markus_cafete = weekly_menus.filter(location__contains="markus")
happy_hours = HappyHour.objects.filter(date__gte=today, date__lte=lastday)
print(feki_menu.menu)
return render(request, "food/daily_food.jinja", {
return render(request, "food/weekly_food.jinja", {
'day': today,
'happy_hours': happy_hours,
'feki_menu': feki_menu,
@ -65,5 +64,5 @@ def all_food(request):
def food(request):
return render(request, "food/food.jinja", {
return render(request, "food/home.jinja", {
})

BIN
ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc
View File

Binary file not shown.

BIN
ofu_app/ofu_app/__pycache__/urls.cpython-35.pyc
View File

Binary file not shown.

14
ofu_app/ofu_app/jinja2.py Normal file
View File

@ -0,0 +1,14 @@
from django.contrib.staticfiles.storage import staticfiles_storage
from django.urls import reverse
from jinja2 import Environment
def environment(**options):
env = Environment(**options)
env.globals.update({
'static': staticfiles_storage.url,
'url': reverse,
})
return env

32
ofu_app/ofu_app/settings.py
View File

@ -53,28 +53,16 @@ INSTALLED_APPS = [
ROOT_URLCONF = 'ofu_app.urls'
TEMPLATES = [
# {
# "BACKEND": "django_jinja.backend.Jinja2",
# 'DIRS': [
# os.path.join(BASE_DIR, 'templates'),
# ],
# "APP_DIRS": True,
# "OPTIONS": {
# "match_extension": ".jinja",
# "match_regex": r"^(?!admin/).*",
# "app_dirname": "templates",
# "context_processors": [
# "django.contrib.auth.context_processors.auth",
# "django.template.context_processors.debug",
# "django.template.context_processors.i18n",
# "django.template.context_processors.media",
# "django.template.context_processors.static",
# "django.template.context_processors.tz",
# "django.contrib.messages.context_processors.messages",
# ],
# },
#
# },
{
'BACKEND': 'django_jinja.backend.Jinja2',
'DIRS': [
os.path.join(BASE_DIR, 'templates'),
],
'APP_DIRS': True,
'OPTIONS': {
'environment': 'ofu_app.jinja2.environment'
},
},
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': ['templates'],

1
ofu_app/ofu_app/urls.py
View File

@ -25,4 +25,5 @@ urlpatterns = [
url(r'^food/', include('apps.food.urls')),
url(r'^events/', include('apps.events.urls')),
url(r'^donar/', include('apps.donar.urls')),
url(r'^links/', views.links, name='links-home'),
]

3
ofu_app/ofu_app/views.py
View File

@ -7,3 +7,6 @@ from django.shortcuts import render
# Create your views here.
def home(request):
return render(request, "home.jinja", {})
def links(request):
return render(request, "links/home.jinja", {})

BIN
ofu_app/static/libs/leaflet/images/layers-2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
ofu_app/static/libs/leaflet/images/layers.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 696 B

BIN
ofu_app/static/libs/leaflet/images/marker-icon-2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
ofu_app/static/libs/leaflet/images/marker-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
ofu_app/static/libs/leaflet/images/marker-shadow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 618 B

13609
ofu_app/static/libs/leaflet/leaflet-src.js Normal file
View File

File diff suppressed because it is too large Load Diff

1
ofu_app/static/libs/leaflet/leaflet-src.js.map Normal file
View File

File diff suppressed because one or more lines are too long

632
ofu_app/static/libs/leaflet/leaflet.css Normal file
View File

@ -0,0 +1,632 @@
/* required styles */
.leaflet-pane,
.leaflet-tile,
.leaflet-marker-icon,
.leaflet-marker-shadow,
.leaflet-tile-container,
.leaflet-pane > svg,
.leaflet-pane > canvas,
.leaflet-zoom-box,
.leaflet-image-layer,
.leaflet-layer {
position: absolute;
left: 0;
top: 0;
}
.leaflet-container {
overflow: hidden;
}
.leaflet-tile,
.leaflet-marker-icon,
.leaflet-marker-shadow {
-webkit-user-select: none;
-moz-user-select: none;
user-select: none;
-webkit-user-drag: none;
}
/* Safari renders non-retina tile on retina better with this, but Chrome is worse */
.leaflet-safari .leaflet-tile {
image-rendering: -webkit-optimize-contrast;
}
/* hack that prevents hw layers "stretching" when loading new tiles */
.leaflet-safari .leaflet-tile-container {
width: 1600px;
height: 1600px;
-webkit-transform-origin: 0 0;
}
.leaflet-marker-icon,
.leaflet-marker-shadow {
display: block;
}
/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
.leaflet-container .leaflet-overlay-pane svg,
.leaflet-container .leaflet-marker-pane img,
.leaflet-container .leaflet-shadow-pane img,
.leaflet-container .leaflet-tile-pane img,
.leaflet-container img.leaflet-image-layer {
max-width: none !important;
}
.leaflet-container.leaflet-touch-zoom {
-ms-touch-action: pan-x pan-y;
touch-action: pan-x pan-y;
}
.leaflet-container.leaflet-touch-drag {
-ms-touch-action: pinch-zoom;
}
.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom {
-ms-touch-action: none;
touch-action: none;
}
.leaflet-container {
-webkit-tap-highlight-color: transparent;
}
.leaflet-container a {
-webkit-tap-highlight-color: rgba(51, 181, 229, 0.4);
}
.leaflet-tile {
filter: inherit;
visibility: hidden;
}
.leaflet-tile-loaded {
visibility: inherit;
}
.leaflet-zoom-box {
width: 0;
height: 0;
-moz-box-sizing: border-box;
box-sizing: border-box;
z-index: 800;
}
/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
.leaflet-overlay-pane svg {
-moz-user-select: none;
}
.leaflet-pane { z-index: 400; }
.leaflet-tile-pane { z-index: 200; }
.leaflet-overlay-pane { z-index: 400; }
.leaflet-shadow-pane { z-index: 500; }
.leaflet-marker-pane { z-index: 600; }
.leaflet-tooltip-pane { z-index: 650; }
.leaflet-popup-pane { z-index: 700; }
.leaflet-map-pane canvas { z-index: 100; }
.leaflet-map-pane svg { z-index: 200; }
.leaflet-vml-shape {
width: 1px;
height: 1px;
}
.lvml {
behavior: url(#default#VML);
display: inline-block;
position: absolute;
}
/* control positioning */
.leaflet-control {
position: relative;
z-index: 800;
pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
pointer-events: auto;
}
.leaflet-top,
.leaflet-bottom {
position: absolute;
z-index: 1000;
pointer-events: none;
}
.leaflet-top {
top: 0;
}
.leaflet-right {
right: 0;
}
.leaflet-bottom {
bottom: 0;
}
.leaflet-left {
left: 0;
}
.leaflet-control {
float: left;
clear: both;
}
.leaflet-right .leaflet-control {
float: right;
}
.leaflet-top .leaflet-control {
margin-top: 10px;
}
.leaflet-bottom .leaflet-control {
margin-bottom: 10px;
}
.leaflet-left .leaflet-control {
margin-left: 10px;
}
.leaflet-right .leaflet-control {
margin-right: 10px;
}
/* zoom and fade animations */
.leaflet-fade-anim .leaflet-tile {
will-change: opacity;
}
.leaflet-fade-anim .leaflet-popup {
opacity: 0;
-webkit-transition: opacity 0.2s linear;
-moz-transition: opacity 0.2s linear;
-o-transition: opacity 0.2s linear;
transition: opacity 0.2s linear;
}
.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
opacity: 1;
}
.leaflet-zoom-animated {
-webkit-transform-origin: 0 0;
-ms-transform-origin: 0 0;
transform-origin: 0 0;
}
.leaflet-zoom-anim .leaflet-zoom-animated {
will-change: transform;
}
.leaflet-zoom-anim .leaflet-zoom-animated {
-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
-moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
-o-transition: -o-transform 0.25s cubic-bezier(0,0,0.25,1);
transition: transform 0.25s cubic-bezier(0,0,0.25,1);
}
.leaflet-zoom-anim .leaflet-tile,
.leaflet-pan-anim .leaflet-tile {
-webkit-transition: none;
-moz-transition: none;
-o-transition: none;
transition: none;
}
.leaflet-zoom-anim .leaflet-zoom-hide {
visibility: hidden;
}
/* cursors */
.leaflet-interactive {
cursor: pointer;
}
.leaflet-grab {
cursor: -webkit-grab;
cursor: -moz-grab;
}
.leaflet-crosshair,
.leaflet-crosshair .leaflet-interactive {
cursor: crosshair;
}
.leaflet-popup-pane,
.leaflet-control {
cursor: auto;
}
.leaflet-dragging .leaflet-grab,
.leaflet-dragging .leaflet-grab .leaflet-interactive,
.leaflet-dragging .leaflet-marker-draggable {
cursor: move;
cursor: -webkit-grabbing;
cursor: -moz-grabbing;
}
/* marker & overlays interactivity */
.leaflet-marker-icon,
.leaflet-marker-shadow,
.leaflet-image-layer,
.leaflet-pane > svg path,
.leaflet-tile-container {
pointer-events: none;
}
.leaflet-marker-icon.leaflet-interactive,
.leaflet-image-layer.leaflet-interactive,
.leaflet-pane > svg path.leaflet-interactive {
pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
pointer-events: auto;
}
/* visual tweaks */
.leaflet-container {
background: #ddd;
outline: 0;
}
.leaflet-container a {
color: #0078A8;
}
.leaflet-container a.leaflet-active {
outline: 2px solid orange;
}
.leaflet-zoom-box {
border: 2px dotted #38f;
background: rgba(255,255,255,0.5);
}
/* general typography */
.leaflet-container {
font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
}
/* general toolbar styles */
.leaflet-bar {
box-shadow: 0 1px 5px rgba(0,0,0,0.65);
border-radius: 4px;
}
.leaflet-bar a,
.leaflet-bar a:hover {
background-color: #fff;
border-bottom: 1px solid #ccc;
width: 26px;
height: 26px;
line-height: 26px;
display: block;
text-align: center;
text-decoration: none;
color: black;
}
.leaflet-bar a,
.leaflet-control-layers-toggle {
background-position: 50% 50%;
background-repeat: no-repeat;
display: block;
}
.leaflet-bar a:hover {
background-color: #f4f4f4;
}
.leaflet-bar a:first-child {
border-top-left-radius: 4px;
border-top-right-radius: 4px;
}
.leaflet-bar a:last-child {
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
border-bottom: none;
}
.leaflet-bar a.leaflet-disabled {
cursor: default;
background-color: #f4f4f4;
color: #bbb;
}
.leaflet-touch .leaflet-bar a {
width: 30px;
height: 30px;
line-height: 30px;
}
.leaflet-touch .leaflet-bar a:first-child {
border-top-left-radius: 2px;
border-top-right-radius: 2px;
}
.leaflet-touch .leaflet-bar a:last-child {
border-bottom-left-radius: 2px;
border-bottom-right-radius: 2px;
}
/* zoom control */
.leaflet-control-zoom-in,
.leaflet-control-zoom-out {
font: bold 18px 'Lucida Console', Monaco, monospace;
text-indent: 1px;
}
.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out {
font-size: 22px;
}
/* layers control */
.leaflet-control-layers {
box-shadow: 0 1px 5px rgba(0,0,0,0.4);
background: #fff;
border-radius: 5px;
}
.leaflet-control-layers-toggle {
background-image: url(images/layers.png);
width: 36px;
height: 36px;
}
.leaflet-retina .leaflet-control-layers-toggle {
background-image: url(images/layers-2x.png);
background-size: 26px 26px;
}
.leaflet-touch .leaflet-control-layers-toggle {
width: 44px;
height: 44px;
}
.leaflet-control-layers .leaflet-control-layers-list,
.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
display: none;
}
.leaflet-control-layers-expanded .leaflet-control-layers-list {
display: block;
position: relative;
}
.leaflet-control-layers-expanded {
padding: 6px 10px 6px 6px;
color: #333;
background: #fff;
}
.leaflet-control-layers-scrollbar {
overflow-y: scroll;
overflow-x: hidden;
padding-right: 5px;
}
.leaflet-control-layers-selector {
margin-top: 2px;
position: relative;
top: 1px;
}
.leaflet-control-layers label {
display: block;
}
.leaflet-control-layers-separator {
height: 0;
border-top: 1px solid #ddd;
margin: 5px -10px 5px -6px;
}
/* Default icon URLs */
.leaflet-default-icon-path {
background-image: url(images/marker-icon.png);
}
/* attribution and scale controls */
.leaflet-container .leaflet-control-attribution {
background: #fff;
background: rgba(255, 255, 255, 0.7);
margin: 0;
}
.leaflet-control-attribution,
.leaflet-control-scale-line {
padding: 0 5px;
color: #333;
}
.leaflet-control-attribution a {
text-decoration: none;
}
.leaflet-control-attribution a:hover {
text-decoration: underline;
}
.leaflet-container .leaflet-control-attribution,
.leaflet-container .leaflet-control-scale {
font-size: 11px;
}
.leaflet-left .leaflet-control-scale {
margin-left: 5px;
}
.leaflet-bottom .leaflet-control-scale {
margin-bottom: 5px;
}
.leaflet-control-scale-line {
border: 2px solid #777;
border-top: none;
line-height: 1.1;
padding: 2px 5px 1px;
font-size: 11px;
white-space: nowrap;
overflow: hidden;
-moz-box-sizing: border-box;
box-sizing: border-box;
background: #fff;
background: rgba(255, 255, 255, 0.5);
}
.leaflet-control-scale-line:not(:first-child) {
border-top: 2px solid #777;
border-bottom: none;
margin-top: -2px;
}
.leaflet-control-scale-line:not(:first-child):not(:last-child) {
border-bottom: 2px solid #777;
}
.leaflet-touch .leaflet-control-attribution,
.leaflet-touch .leaflet-control-layers,
.leaflet-touch .leaflet-bar {
box-shadow: none;
}
.leaflet-touch .leaflet-control-layers,
.leaflet-touch .leaflet-bar {
border: 2px solid rgba(0,0,0,0.2);
background-clip: padding-box;
}
/* popup */
.leaflet-popup {
position: absolute;
text-align: center;
margin-bottom: 20px;
}
.leaflet-popup-content-wrapper {
padding: 1px;
text-align: left;
border-radius: 12px;
}
.leaflet-popup-content {
margin: 13px 19px;
line-height: 1.4;
}
.leaflet-popup-content p {
margin: 18px 0;
}
.leaflet-popup-tip-container {
width: 40px;
height: 20px;
position: absolute;
left: 50%;
margin-left: -20px;
overflow: hidden;
pointer-events: none;
}
.leaflet-popup-tip {
width: 17px;
height: 17px;
padding: 1px;
margin: -10px auto 0;
-webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg);
-ms-transform: rotate(45deg);
-o-transform: rotate(45deg);
transform: rotate(45deg);
}
.leaflet-popup-content-wrapper,
.leaflet-popup-tip {
background: white;
color: #333;
box-shadow: 0 3px 14px rgba(0,0,0,0.4);
}
.leaflet-container a.leaflet-popup-close-button {
position: absolute;
top: 0;
right: 0;
padding: 4px 4px 0 0;
border: none;
text-align: center;
width: 18px;
height: 14px;
font: 16px/14px Tahoma, Verdana, sans-serif;
color: #c3c3c3;
text-decoration: none;
font-weight: bold;
background: transparent;
}
.leaflet-container a.leaflet-popup-close-button:hover {
color: #999;
}
.leaflet-popup-scrolled {
overflow: auto;
border-bottom: 1px solid #ddd;
border-top: 1px solid #ddd;
}
.leaflet-oldie .leaflet-popup-content-wrapper {
zoom: 1;
}
.leaflet-oldie .leaflet-popup-tip {
width: 24px;
margin: 0 auto;
-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
}
.leaflet-oldie .leaflet-popup-tip-container {
margin-top: -1px;
}
.leaflet-oldie .leaflet-control-zoom,
.leaflet-oldie .leaflet-control-layers,
.leaflet-oldie .leaflet-popup-content-wrapper,
.leaflet-oldie .leaflet-popup-tip {
border: 1px solid #999;
}
/* div icon */
.leaflet-div-icon {
background: #fff;
border: 1px solid #666;
}
/* Tooltip */
/* Base styles for the element that has a tooltip */
.leaflet-tooltip {
position: absolute;
padding: 6px;
background-color: #fff;
border: 1px solid #fff;
border-radius: 3px;
color: #222;
white-space: nowrap;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
pointer-events: none;
box-shadow: 0 1px 3px rgba(0,0,0,0.4);
}
.leaflet-tooltip.leaflet-clickable {
cursor: pointer;
pointer-events: auto;
}
.leaflet-tooltip-top:before,
.leaflet-tooltip-bottom:before,
.leaflet-tooltip-left:before,
.leaflet-tooltip-right:before {
position: absolute;
pointer-events: none;
border: 6px solid transparent;
background: transparent;
content: "";
}
/* Directions */
.leaflet-tooltip-bottom {
margin-top: 6px;
}
.leaflet-tooltip-top {
margin-top: -6px;
}
.leaflet-tooltip-bottom:before,
.leaflet-tooltip-top:before {
left: 50%;
margin-left: -6px;
}
.leaflet-tooltip-top:before {
bottom: 0;
margin-bottom: -12px;
border-top-color: #fff;
}
.leaflet-tooltip-bottom:before {
top: 0;
margin-top: -12px;
margin-left: -6px;
border-bottom-color: #fff;
}
.leaflet-tooltip-left {
margin-left: -6px;
}
.leaflet-tooltip-right {
margin-left: 6px;
}
.leaflet-tooltip-left:before,
.leaflet-tooltip-right:before {
top: 50%;
margin-top: -6px;
}
.leaflet-tooltip-left:before {
right: 0;
margin-right: -12px;
border-left-color: #fff;
}
.leaflet-tooltip-right:before {
left: 0;
margin-left: -12px;
border-right-color: #fff;
}

5
ofu_app/static/libs/leaflet/leaflet.js Normal file
View File

File diff suppressed because one or more lines are too long

1
ofu_app/static/libs/leaflet/leaflet.js.map Normal file
View File

File diff suppressed because one or more lines are too long

8
ofu_app/templates/base.jinja
View File

@ -10,8 +10,7 @@
<meta name="author" content="Michael Götz"/>
{# {% javascript "main_js" %}#}
{# {% block js_head %}{% endblock %}#}
{% load staticfiles %}
<link rel="stylesheet" href="{% static 'libs/bootstrap-4.0.0-beta-dist/css/bootstrap.css' %}">
<link rel="stylesheet" href="{{ static('libs/bootstrap-4.0.0-beta-dist/css/bootstrap.css') }}">
{% block head_extra %}{% endblock %}
</head>
@ -19,7 +18,8 @@
<body>
{% block body %}
{% block test %}
<div class="text-center bg-warning"><h4>Hinweis: Diese Seite dient <strong>nur</strong> zu Testzwecken. Wir garantieren weder die
<div class="text-center bg-warning"><h4>Hinweis: Diese Seite dient <strong>nur</strong> zu Testzwecken. Wir
garantieren weder die
Vollständigkeit,
noch
die Korrektheit der dargestellten Daten.</h4>
@ -39,7 +39,7 @@
<div class="col m-2 p-3">
<p class="has-text-centered">Hast du einen Fehler gefunden?</p>
<p>Melde uns diesen einfach über den E-Mail Link</p>
<p></p><a href="mailto:mgoetz1995@gmail.com?subject=Bugreport">Bug Report</a></p>
<p></p><a href="mailto:info.mgserver@gmail.com?subject=Bugreport">Bug Report</a></p>
</div>
</div>
<div class="row text-center">

6
ofu_app/templates/events/all_events.jinja
View File

@ -1,7 +1,7 @@
{% extends 'base.jinja' %}
{% block headline %}
<h1 class="text-center">Alle Events an der OFU </h1>
<h2 class="text-center">{{ startdate }} bis {{ enddate }}</h2>
<h2 class="text-center">{{ startdate.strftime("%d.%m.%Y") }} bis {{ enddate.strftime("%d.%m.%Y") }}</h2>
{% endblock %}
{% block content %}
<div class="container">
@ -10,10 +10,10 @@
<div class="col-6 p-3">
<div class="p-3 border border-dark roundep-3 border border-dark rounded bg-light text-dark">
<h3>{{ event.title }}</h3>
<p>Wann: {{ event.date|date:"D, d.M" }} ab {{ event.time }}</p>
<p>Wann: {{ event.date.strftime("%d.%m.") }} ab {{ event.time.strftime("%H:%M") }}</p>
<p>Wo:</p>
<ul>
{% for location in event.locations.all %}
{% for location in event.locations.all() %}
<li>{{ location.name }}</li>
{% endfor %}
</ul>

29
ofu_app/templates/events/events.jinja
View File

@ -1,29 +0,0 @@
{% extends 'base.jinja' %}
{% block headline %}
<h1 class="text-center">Events in Bamberg</h1>
{% endblock %}
{% block content %}
<div class="container text-dark">
<div class="row">
<div class="col">
<div class="card">
<div class="card-body">
<h4 class="card-title">Events for a Week</h4>
<p class="card-text">Übersicht über alle Events an der Uni und Veranstaltungen der HSnGs</p>
<a href="{% url 'all-events' %}" class="btn btn-primary">Zur Gesamtübersicht</a>
</div>
</div>
</div>
<div class="col">
<div class="card">
<div class="card-body">
<h4 class="card-title">Events for a Week</h4>
<p class="card-text">Übersicht über alle Events an der Uni und Veranstaltungen der HSnGs in der
zukünftigen Woche.</p>
<a href="{% url 'week-events' %}" class="btn btn-primary">Zur Wochenübersicht</a>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

13
ofu_app/templates/events/home.jinja Normal file
View File

@ -0,0 +1,13 @@
{% extends 'base.jinja' %}
{% import '/macros/overview_pages.jinja' as macros %}
{% block headline %}
<h1 class="text-center">Events in Bamberg</h1>
{% endblock %}
{% block content %}
<div class="container text-dark">
<div class="row">
{{ macros.home_item(title='Week Events', url_id='week-events', description='Übersicht über alle Events an der Uni und Veranstaltungen der HSnGs in der zukünftigen Woche.') }}
{{ macros.home_item(title='All registered Events', url_id='all-events', description='Übersicht über alle Events an der Uni und Veranstaltungen der HSnGs') }}
</div>
</div>
{% endblock %}

11
ofu_app/templates/events/week_events.jinja
View File

@ -1,7 +1,7 @@
{% extends 'base.jinja' %}
{% block headline %}
<h1 class="text-center">Events an der OFU </h1>
<h2 class="text-center">{{ startdate }} bis {{ enddate }}</h2>
<h2 class="text-center">{{ startdate.strftime("%d.%m.%Y") }} bis {{ enddate.strftime("%d.%m.%Y") }}</h2>
{% endblock %}
{% block content %}
<div class="container">
@ -10,8 +10,13 @@
<div class="col-6 p-3">
<div class="p-3 border border-dark rounded bg-light text-dark">
<h3>{{ event.title }}</h3>
<p>Wann: {{ event.date|date:"D, d.M" }} ab {{ event.time }}</p>
<p>Wo: {{ event.location }}</p>
<p>Wann: {{ event.date.strftime("%d.%m.") }} ab {{ event.time.strftime("%H:%M") }}</p>
<p>Wo:</p>
<ul>
{% for location in event.locations.all() %}
<li>{{ location.name }}</li>
{% endfor %}
</ul>
<a href="{{ event.link }}">Details</a>
<p>Kategorie: {{ event.category }}</p>
</div>

66
ofu_app/templates/food/daily_food.jinja
View File

@ -1,70 +1,18 @@
{% extends 'base.jinja' %}
{% import '/macros/food_macros.jinja' as macros %}
{% block headline %}
<h1 class="text-center">Essen an der OFU für {{ day }}</h1>
<h1 class="text-center">Essen an der OFU </h1>
<h2 class="text-center">{{ day.strftime("%d.%m.%Y") }}</h2>
{% endblock %}
{% block content %}
<div class="container">
<div class="row">
<div class="col p-2">
<div class="p-3 border border-dark rounded bg-light text-dark">
{% if feki_menu %}
<h2>{{ feki_menu.location }}</h2>
<p>{{ feki_menu.date }}</p>
{% for single_food in feki_menu.menu.all %}
<p>{{ single_food.name }}</p>
{% endfor %}
{% else %}
<p>Die Feki Mensa hat heute geschlossen :(</p>
{% endif %}
</div>
</div>
<div class="col p-2">
<div class="p-3 border border-dark rounded bg-light text-dark">
{% if austr_menu %}
<h2>{{ austr_menu.location }}</h2>
<p>{{ austr_menu.date }}</p>
{% for single_food in austr_menu.menu.all %}
<p>{{ single_food.name }}</p>
{% endfor %}
{% else %}
<p>Die Austr Mensa hat heute geschlossen :(</p>
{% endif %}
</div>
</div>
{{ macros.day_menu(title='Speiseplan für Feldkirchenstraße Bamberg', location_menu=feki_menu, fail_text='Die Feki Mensa hat heute geschlossen.') }}
{{ macros.day_menu(title='Speiseplan für Austraße Bamberg', location_menu=austr_menu, fail_text='Die Austr Mensa hat heute geschlossen.') }}
</div>
<div class="row">
<div class="col p-2">
<div class="p-3 border border-dark rounded bg-light text-dark">
{% if erba_cafete %}
<h2>{{ erba_cafete.location }}</h2>
<p>{{ erba_cafete.date }}</p>
{% for single_food in erba_cafete.menu.all %}
<p>{{ single_food.name }}</p>
{% endfor %}
{% else %}
<p>Ist heute Freitag?</p>
<p> Nein? Dann ist die Erba Cafete wohl heute geschlossen :(</p>
{% endif %}
</div>
</div>
<div class="col p-2">
<div class="p-3 border border-dark rounded bg-light text-dark">
{% if markus_cafete %}
<h2>{{ markus_cafete.location }}</h2>
<p>{{ markus_cafete.date }}</p>
{% for single_food in markus_cafete.menu.all %}
<p>{{ single_food.name }}</p>
{% endfor %}
{% else %}
<p>Ist heute Freitag?</p>
<p> Nein? Dann ist die Markus Cafete wohl heute geschlossen :(</p>
{% endif %}
</div>
</div>
{{ macros.day_menu(title='Cafeteria Erba-Insel', location_menu=erba_cafete, fail_text='Aktuell gibt es keine warmen Speisen') }}
{{ macros.day_menu(title='Cafeteria Markusplatz', location_menu=markus_cafete, fail_text='Aktuell gibt es keine warmen Speisen') }}
</div>
<div class="row">
<div class="col p-2">

28
ofu_app/templates/food/food.jinja
View File

@ -1,28 +0,0 @@
{% extends "base.jinja" %}
{% block headline %}
<h1 class="text-center">Essen an der OFU</h1>
{% endblock %}
{% block content %}
<div class="container text-dark">
<div class="row">
<div class="col">
<div class="card">
<div class="card-body">
<h4 class="card-title">Daily Food</h4>
<p class="card-text">Übersicht über die heutigen Essensmöglichkeiten für Studenten</p>
<a href="{% url 'daily-food' %}" class="btn btn-primary">Zur Tagesübersicht</a>
</div>
</div>
</div>
<div class="col">
<div class="card">
<div class="card-body">
<h4 class="card-title">Weekly Food</h4>
<p class="card-text">Übersicht über die wöchentlichen Essensmöglichkeiten für Studenten.</p>
<a href="{% url 'weekly-food' %}" class="btn btn-primary">Zur Wochenübersicht</a>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

41
ofu_app/templates/food/food_home.jinja
View File

@ -1,41 +0,0 @@
{% extends 'base.jinja' %}
{% block headline %}
<h1 class="text-center">Übersicht Food</h1>
{% endblock %}
{% block content %}
<div class="container text-dark">
<div class="row">
<div class="col">
<div class="card">
<div class="card-body">
<h4 class="card-title">Daily</h4>
<p class="card-text">Übersicht über Essensmöglichkeiten des aktuellen Tages.</p>
<a href="{% url 'daily-food' %}" class="btn btn-primary">Zur Daily Page</a>
</div>
</div>
</div>
<div class="col">
<div class="card">
<div class="card-body">
<h4 class="card-title">Weekly</h4>
<p class="card-text">Übersicht über Essensmöglichkeiten der aktuellen Woche.</p>
<a href="{% url 'events-main' %}" class="btn btn-primary">Zur Weekly Page</a>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col">
<div class="card">
<div class="card-body">
<h4 class="card-title">All</h4>
<p class="card-text">Übersicht über alle zukünftigen Essensmöglichkeiten an der Universität
Bamberg. </p>
<a href="{% url 'food' %}" class="btn btn-primary">Zur All Page</a>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

13
ofu_app/templates/food/home.jinja Normal file
View File

@ -0,0 +1,13 @@
{% extends "base.jinja" %}
{% import 'macros/overview_pages.jinja' as macros %}
{% block headline %}
<h1 class="text-center">Essen an der OFU</h1>
{% endblock %}
{% block content %}
<div class="container text-dark">
<div class="row">
{{ macros.home_item(title='Daily Food', url_id='daily-food', description='Übersicht über die heutigen Essensmöglichkeiten für Studenten') }}
{{ macros.home_item(title='Weekly Food', url_id='weekly-food', description='Übersicht über die wöchentlichen Essensmöglichkeiten für Studenten.') }}
</div>
</div>
{% endblock %}

0
ofu_app/templates/food/isTest.jinja
View File

48
ofu_app/templates/food/weekly_food.jinja Normal file
View File

@ -0,0 +1,48 @@
{% extends 'base.jinja' %}
{% import '/macros/food_macros.jinja' as macros %}
{% block headline %}
<h1 class="text-center">Essen an der OFU </h1>
<h2 class="text-center">{{ day.strftime("%d.%m.%Y") }}</h2>
{% endblock %}
{% block content %}
<div class="container">
<div class="row">
{{ macros.week_menu(title='Speiseplan für Feldkirchenstraße Bamberg', location_menus=feki_menu, fail_text='Die Feki Mensa hat heute geschlossen.') }}
{{ macros.week_menu(title='Speiseplan für Austraße Bamberg', location_menus=austr_menu, fail_text='Die Austr Mensa hat heute geschlossen.') }}
</div>
<div class="row">
{{ macros.week_menu(title='Cafeteria Erba-Insel', location_menus=erba_cafete, fail_text='Aktuell gibt es keine warmen Speisen') }}
{{ macros.week_menu(title='Cafeteria Markusplatz', location_menus=markus_cafete, fail_text='Aktuell gibt es keine warmen Speisen') }}
</div>
<div class="row">
<div class="col p-2">
<div class="p-3 border border-dark rounded bg-light text-dark">
<h2>Happy Hour Guide von Feki.de</h2>
{% if happy_hours %}
<table class="table">
<thead class="thead-inverse">
<tr>
<th>Location</th>
<th>Time</th>
<th>Description</th>
</tr>
</thead>
<tbody>
{% for happy_hour in happy_hours %}
<tr>
<td>{{ happy_hour.location }}</td>
<td>{{ happy_hour.time }}</td>
<td>{{ happy_hour.description }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<p>Leider gibt es heute keine Happy Hours :(</p>
{% endif %}
</div>
</div>
</div>
</div>
{% endblock %}

37
ofu_app/templates/home.jinja
View File

@ -1,40 +1,15 @@
{% extends 'base.jinja' %}
{% import '/macros/overview_pages.jinja' as macros %}
{% block headline %}
<h1 class="text-center">App für die Uni Bamberg</h1>
<h1 class="text-center">App für Studenten der Universität Bamberg</h1>
{% endblock %}
{% block content %}
<div class="container text-dark">
<div class="row">
<div class="col">
<div class="card">
<div class="card-body">
<h4 class="card-title">Food</h4>
<p class="card-text">Übersicht über Essensmöglichkeiten für Studenten in der Stadt Bamberg </p>
<a href="{% url 'food' %}" class="btn btn-primary">Zur Mainpage</a>
</div>
</div>
</div>
<div class="col">
<div class="card">
<div class="card-body">
<h4 class="card-title">Events</h4>
<p class="card-text">Übersicht über alle Events an der Universität Bambergs und Veranstaltungen
der HSnGs.</p>
<a href="{% url 'events-main' %}" class="btn btn-primary">Zur Mainpage</a>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col">
<div class="card">
<div class="card-body">
<h4 class="card-title">Rooms</h4>
<p class="card-text">Übersicht über Räume an Universität Bamberg </p>
<a href="{% url 'donar' %}" class="btn btn-primary">Zur Mainpage</a>
</div>
</div>
</div>
{{ macros.home_item(title='Food', url_id='food', description='Übersicht über Essensmöglichkeiten') }}
{{ macros.home_item(title='Events', url_id='events-main', description='Übersicht über Events an der Universität Bambergs und Veranstaltungen der HSnGs.') }}
{{ macros.home_item(title='Nav', url_id='donar', description='Übersicht über Räume an Universität Bamberg') }}
{{ macros.home_item(title='Uni Pages', url_id='links-home', description='Linksammlung zu Services der Uni Bamberg') }}
</div>
</div>
{% endblock %}

28
ofu_app/templates/links/home.jinja Normal file
View File

@ -0,0 +1,28 @@
{% extends "base.jinja" %}
{% import 'macros/overview_pages.jinja' as macros %}
{% block headline %}
<h1 class="text-center">Essen an der OFU</h1>
{% endblock %}
{% block content %}
<div class="container text-dark">
<div class="row">
{{ macros.link_item(title='Roofis', url='https://suche.wiai.de/', description='Finde deinen Raum zum lernen.') }}
{{ macros.link_item(title='VC', url='https://vc.uni-bamberg.de/moodle/', description='Virtueller Campus') }}
</div>
<div class="row">
{{ macros.link_item(title='Flexnow2', url='https://www.uni-bamberg.de/pruefungsamt/flexnow/', description='') }}
{{ macros.link_item(title='Univis', url='http://univis.uni-bamberg.de/', description='') }}
</div>
<div class="row">
{{ macros.link_item(title='Bus und Bahn',
url='https://www.vgn.de/verbindungen/?to=de%3A09461%3A20080&td=coord%3A4418901%3A629758%3ANAV4%3ABamberg%2C%20An%20der%20Weberei%205',
description='') }}
{{ macros.link_item(title='Zuv Portal', url='https://zul.zuv.uni-bamberg.de/qisserver/rds?state=user&type=0', description='') }}
</div>
<div class="row">
{{ macros.link_item(title='WIAI Open', url='https://isfswiaiopen.wiai.de/',
description='Du willst der Fachschaft WIAI einen Besuch abstatten, aber weißt nicht, ob gerade jemand da ist? Dann kannst du jetzt hier nachschauen.') }}
{{ macros.link_item(title='RZ Störungen', url='https://www.uni-bamberg.de/rz/wir/itsm/reporting/', description='') }}
</div>
</div>
{% endblock %}

37
ofu_app/templates/macros/food_macros.jinja Normal file
View File

@ -0,0 +1,37 @@
{% macro day_menu(title, location_menu, fail_text) -%}
<div class="col p-2">
<div class="p-3 border border-dark rounded bg-light text-dark">
<h2>{{ title }}</h2>
{% if location_menu %}
<p>{{ location_menu.date.strftime('%d.%m.%Y') }}</p>
{{ get_menu(location_menu.menu.all()) }}
{% else %}
<p> {{ fail_text }}</p>
{% endif %}
</div>
</div>
{% endmacro %}
{% macro week_menu(title, location_menus, fail_text) -%}
<div class="col p-2">
<div class="p-3 border border-dark rounded bg-light text-dark">
<h2>{{ title }}</h2>
{% if location_menus %}
{% for menu in location_menus %}
<p><strong>{{ menu.date.strftime('%A.%m.%Y') }}</strong></p>
{{ get_menu(menu.menu.all()) }}
{% endfor %}
{% else %}
<p> {{ fail_text }}</p>
{% endif %}
</div>
</div>
{% endmacro %}
{% macro get_menu(menu) -%}
<ul>
{% for single_food in menu %}
<li><p>{{ single_food.name }}</p></li>
{% endfor %}
</ul>
{% endmacro %}

27
ofu_app/templates/macros/overview_pages.jinja Normal file
View File

@ -0,0 +1,27 @@
{% macro home_item(title, url_id, description='') -%}
<div class="col-6 p-3">
<div class="card">
<a href="{{ url(url_id) }}">
<div class="card-body">
<h4 class="card-title">{{ title }}</h4>
<p class="card-text">{{ description }}</p>
</div>
</a>
</div>
</div>
{% endmacro %}
{% macro link_item(title, url, description='') -%}
<div class="col-6 p-3">
<div class="card">
<a href="{{ url }}">
<div class="card-body">
<h4 class="card-title">{{ title }}</h4>
<p class="card-text">{{ description }}</p>
</div>
</a>
</div>
</div>
{% endmacro %}