Skip to content
Snippets Groups Projects
Commit c6fa54d7 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Include UNTIS DB

parent f519a074
No related branches found
No related tags found
1 merge request!86Merge school-apps
Showing
with 2408 additions and 151 deletions
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="3a000256-1023-4a19-a046-bde25cb853cc" name="Default" comment="" />
<list default="true" id="3a000256-1023-4a19-a046-bde25cb853cc" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/schoolapps/schoolapps/settings.py" afterPath="$PROJECT_DIR$/schoolapps/schoolapps/settings.py" />
<change beforePath="$PROJECT_DIR$/schoolapps/schoolapps/urls.py" afterPath="$PROJECT_DIR$/schoolapps/schoolapps/urls.py" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -17,8 +21,8 @@
<file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/schoolapps/schoolapps/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="21" column="15" lean-forward="false" selection-start-line="21" selection-start-column="15" selection-end-line="21" selection-end-column="15" />
<state relative-caret-position="153">
<caret line="9" column="49" lean-forward="false" selection-start-line="9" selection-start-column="49" selection-end-line="9" selection-end-column="49" />
<folding />
</state>
</provider>
......@@ -27,8 +31,18 @@
<file leaf-file-name="settings.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/schoolapps/schoolapps/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="456">
<caret line="134" column="13" lean-forward="false" selection-start-line="134" selection-start-column="13" selection-end-line="134" selection-end-column="13" />
<state relative-caret-position="129">
<caret line="79" column="27" lean-forward="false" selection-start-line="79" selection-start-column="27" selection-end-line="79" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="models.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/schoolapps/untisconnect/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -47,7 +61,7 @@
<file leaf-file-name="mailer.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/schoolapps/mailer.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<state relative-caret-position="27">
<caret line="3" column="39" lean-forward="false" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
<folding>
<element signature="e#0#38#0" expanded="true" />
......@@ -56,31 +70,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="email.txt" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/schoolapps/templates/mail/email.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="4" lean-forward="false" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="email.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/schoolapps/templates/mail/email.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="27" lean-forward="false" selection-start-line="0" selection-start-column="27" selection-end-line="0" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="views.py" pinned="false" current-in-tab="true">
<file leaf-file-name="views.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="65">
<caret line="12" column="58" lean-forward="false" selection-start-line="12" selection-start-column="58" selection-end-line="12" selection-end-column="58" />
<state relative-caret-position="458">
<caret line="35" column="0" lean-forward="false" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
<folding>
<element signature="e#0#57#0" expanded="true" />
</folding>
......@@ -111,7 +105,7 @@
<file leaf-file-name="views.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/schoolapps/aub/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="612">
<state relative-caret-position="714">
<caret line="48" column="36" lean-forward="false" selection-start-line="48" selection-start-column="36" selection-end-line="48" selection-end-column="36" />
<folding>
<element signature="e#0#78#0" expanded="true" />
......@@ -172,7 +166,6 @@
<option value="$PROJECT_DIR$/schoolapps/dashboard/templates/index.html" />
<option value="$PROJECT_DIR$/schoolapps/templates/registration/login.html" />
<option value="$PROJECT_DIR$/schoolapps/aub/templates/index.html" />
<option value="$PROJECT_DIR$/schoolapps/schoolapps/urls.py" />
<option value="$PROJECT_DIR$/schoolapps/aub/urls.py" />
<option value="$PROJECT_DIR$/schoolapps/aub/templates/aub/applied_for.html" />
<option value="$PROJECT_DIR$/schoolapps/aub/admin.py" />
......@@ -185,10 +178,11 @@
<option value="$PROJECT_DIR$/schoolapps/aub/views.py" />
<option value="$PROJECT_DIR$/schoolapps/dashboard/urls.py" />
<option value="$PROJECT_DIR$/schoolapps/templates/mail/email.txt" />
<option value="$PROJECT_DIR$/schoolapps/schoolapps/settings.py" />
<option value="$PROJECT_DIR$/schoolapps/templates/mail/email.html" />
<option value="$PROJECT_DIR$/schoolapps/mailer.py" />
<option value="$PROJECT_DIR$/schoolapps/dashboard/views.py" />
<option value="$PROJECT_DIR$/schoolapps/schoolapps/urls.py" />
<option value="$PROJECT_DIR$/schoolapps/schoolapps/settings.py" />
</list>
</option>
</component>
......@@ -263,6 +257,12 @@
<item name="templates" type="462c0819:PsiDirectoryNode" />
<item name="mail" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="school-apps" type="b2602c69:ProjectViewProjectNode" />
<item name="school-apps" type="462c0819:PsiDirectoryNode" />
<item name="schoolapps" type="462c0819:PsiDirectoryNode" />
<item name="untisconnect" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
......@@ -278,16 +278,16 @@
<property name="DefaultHtmlFileTemplate" value="HTML File" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/schoolapps/aub/templates/aub" />
<recent name="$PROJECT_DIR$/schoolapps/static/common" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/schoolapps/untisconnect" />
<recent name="$PROJECT_DIR$/schoolapps/dashboard/templates/dashboard" />
<recent name="$PROJECT_DIR$/schoolapps/aub/templates/aub" />
<recent name="$PROJECT_DIR$/schoolapps/static/common" />
<recent name="$PROJECT_DIR$/schoolapps/aub" />
<recent name="$PROJECT_DIR$/schoolapps/templates" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/schoolapps/aub/templates/aub" />
<recent name="$PROJECT_DIR$/schoolapps/static/common" />
</key>
</component>
<component name="RunDashboard">
......@@ -302,8 +302,35 @@
</list>
</option>
</component>
<component name="RunManager">
<component name="RunManager" selected="Django server.Start">
<configuration name="header.html" type="JavascriptDebugType" factoryName="JavaScript Debug" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/school-apps/schoolapps/templates/partials/header.html" />
<configuration name="Start" type="Python.DjangoServer" factoryName="Django server">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
<env name="DJANGO_SETTINGS_MODULE" value="schoolapps.settings" />
</envs>
<option name="SDK_HOME" value="/usr/bin/python3.5" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<module name="school-apps" />
<option name="launchJavascriptDebuger" value="false" />
<option name="port" value="8000" />
<option name="host" value="" />
<option name="additionalOptions" value="" />
<option name="browserUrl" value="" />
<option name="runTestServer" value="false" />
<option name="runNoReload" value="false" />
<option name="useCustomRunCommand" value="false" />
<option name="customRunCommand" value="" />
</configuration>
<list size="2">
<item index="0" class="java.lang.String" itemvalue="Django server.Start" />
<item index="1" class="java.lang.String" itemvalue="JavaScript Debug.header.html" />
</list>
<recent_temporary>
<list size="1">
<item index="0" class="java.lang.String" itemvalue="JavaScript Debug.header.html" />
......@@ -490,26 +517,27 @@
</component>
<component name="ToolWindowManager">
<frame x="-3" y="33" width="1372" height="729" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="TODO" 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="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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32852563" 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="true" weight="0.27083334" 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.33" sideWeight="0.5" order="2" 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="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24963397" 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.24963397" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Docker" 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="8" side_tool="false" 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="Find" 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="1" side_tool="false" content_ui="tabs" />
<window_info id="SciView" 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="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="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="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" />
<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="false" show_stripe_button="true" weight="0.33" 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" />
<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" />
</layout>
......@@ -558,20 +586,13 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/schoolapps/todos/templates/index.html" />
<entry file="file://$PROJECT_DIR$/schoolapps/todos/views.py" />
<entry file="file://$PROJECT_DIR$/schoolapps/templates/registration/password_reset_form.html" />
<entry file="file://$PROJECT_DIR$/schoolapps/teachers/models.py" />
<entry file="file://$PROJECT_DIR$/schoolapps/teachers/admin.py" />
<entry file="file://$PROJECT_DIR$/schoolapps/aub/migrations/0007_auto_20171220_1230.py" />
<entry file="file://$PROJECT_DIR$/schoolapps/aub/migrations/0006_auto_20171220_1229.py" />
<entry file="file://$PROJECT_DIR$/schoolapps/aub/migrations/__init__.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$/schoolapps/aub/migrations/__init__.py" />
<entry file="file://$PROJECT_DIR$/schoolapps/static/jquery/build/release.js" />
<entry file="file://$PROJECT_DIR$/schoolapps/static/jquery/build/release/dist.js" />
<entry file="file://$PROJECT_DIR$/schoolapps/static/jquery/README.md" />
......@@ -598,11 +619,6 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider 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>
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="0">
......@@ -611,6 +627,11 @@
<second_editor />
</state>
</provider>
<provider 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$/schoolapps/dashboard/models.py">
<provider selected="true" editor-type-id="text-editor">
......@@ -658,11 +679,6 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/aub/README.md">
<provider 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>
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="170">
......@@ -671,64 +687,21 @@
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/aub/migrations/0007_auto_20171222_1738.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-74">
<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$/schoolapps/aub/migrations/0006_auto_20171222_1736.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$/schoolapps/aub/migrations/0005_auto_20171222_1723.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$/schoolapps/aub/migrations/0003_auto_20171221_1206.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-102">
<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$/schoolapps/aub/migrations/0001_initial.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="9" column="18" lean-forward="false" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/aub/migrations/0002_remove_aub_x.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$/schoolapps/aub/migrations/0004_auto_20171222_1722.py">
<provider selected="true" editor-type-id="text-editor">
<provider 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$/schoolapps/aub/migrations/0007_auto_20171222_1738.py" />
<entry file="file://$PROJECT_DIR$/schoolapps/aub/migrations/0006_auto_20171222_1736.py" />
<entry file="file://$PROJECT_DIR$/schoolapps/aub/migrations/0005_auto_20171222_1723.py" />
<entry file="file://$PROJECT_DIR$/schoolapps/aub/migrations/0003_auto_20171221_1206.py" />
<entry file="file://$PROJECT_DIR$/schoolapps/aub/migrations/0001_initial.py" />
<entry file="file://$PROJECT_DIR$/schoolapps/aub/migrations/0002_remove_aub_x.py" />
<entry file="file://$PROJECT_DIR$/schoolapps/aub/migrations/0004_auto_20171222_1722.py" />
<entry file="file://$PROJECT_DIR$/schoolapps/aub/migrations/0010_auto_20180101_1622.py" />
<entry file="file://$PROJECT_DIR$/schoolapps/aub/migrations/0009_aub_status.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$/schoolapps/aub/migrations/0009_aub_status.py" />
<entry file="file://$PROJECT_DIR$/schoolapps/aub/admin.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
......@@ -761,7 +734,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="10" column="21" lean-forward="false" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
......@@ -769,7 +741,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="595">
<caret line="37" column="9" lean-forward="false" selection-start-line="37" selection-start-column="9" selection-end-line="37" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
......@@ -777,7 +748,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>
......@@ -785,7 +755,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="18" lean-forward="false" selection-start-line="17" selection-start-column="18" selection-end-line="17" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
......@@ -793,15 +762,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1360">
<caret line="80" column="27" lean-forward="false" selection-start-line="80" selection-start-column="27" selection-end-line="80" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/schoolapps/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="21" column="15" lean-forward="false" selection-start-line="21" selection-start-column="15" selection-end-line="21" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
......@@ -815,7 +775,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/aub/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="612">
<state relative-caret-position="714">
<caret line="48" column="36" lean-forward="false" selection-start-line="48" selection-start-column="36" selection-end-line="48" selection-end-column="36" />
<folding>
<element signature="e#0#78#0" expanded="true" />
......@@ -823,22 +783,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/schoolapps/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="456">
<caret line="134" column="13" lean-forward="false" selection-start-line="134" selection-start-column="13" selection-end-line="134" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/aub/templates/aub/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
......@@ -863,9 +807,27 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="458">
<caret line="35" column="0" lean-forward="false" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
<folding>
<element signature="e#0#57#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/schoolapps/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="9" column="49" lean-forward="false" selection-start-line="9" selection-start-column="49" selection-end-line="9" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/mailer.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<state relative-caret-position="27">
<caret line="3" column="39" lean-forward="false" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
<folding>
<element signature="e#0#38#0" expanded="true" />
......@@ -873,13 +835,27 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/views.py">
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="65">
<caret line="12" column="58" lean-forward="false" selection-start-line="12" selection-start-column="58" selection-end-line="12" selection-end-column="58" />
<folding>
<element signature="e#0#57#0" expanded="true" />
</folding>
<state relative-caret-position="102">
<caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/schoolapps/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<caret line="79" column="27" lean-forward="false" selection-start-line="79" selection-start-column="27" selection-end-line="79" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/untisconnect/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......
......@@ -30,7 +30,7 @@ ALLOWED_HOSTS = []
INSTALLED_APPS = [
'dashboard.apps.DashboardConfig',
# 'aub.apps.AubConfig',
'aub.apps.AubConfig',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
......@@ -80,6 +80,14 @@ DATABASES = {
'PASSWORD': 'grummelPASS1531',
'HOST': '',
'PORT': ''
},
'untis': {
'ENGINE': 'django.db.backends.mysql',
'NAME': 'untis',
'USER': 'www-data',
'PASSWORD': 'grummelPASS1531',
'HOST': '',
'PORT': ''
}
}
......
......@@ -33,7 +33,7 @@ urlpatterns = [
#######
# AUB #
#######
# path('aub/', include('aub.urls')),
path('aub/', include('aub.urls')),
#########
# Admin #
......
from django.contrib import admin
# Register your models here.
from django.apps import AppConfig
class TimetableConfig(AppConfig):
name = 'timetable'
from django.db import models
# Create your models here.
from django.test import TestCase
# Create your tests here.
from django.shortcuts import render
# Create your views here.
from django.contrib import admin
# Register your models here.
from django.apps import AppConfig
class UntisconnectConfig(AppConfig):
name = 'untisconnect'
This diff is collapsed.
from django.test import TestCase
# Create your tests here.
from django.shortcuts import render
# Create your views here.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment