diff --git a/.idea/modules.xml b/.idea/modules.xml
index 44a3e213af7a8816be26cbe736630d7eb3625af1..dfea16ff8e1e7177bf23ca639995803556600378 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,6 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/../bwinf-36-2/.idea/bwinf-36-2.iml" filepath="$PROJECT_DIR$/../bwinf-36-2/.idea/bwinf-36-2.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/school-apps.iml" filepath="$PROJECT_DIR$/.idea/school-apps.iml" />
</modules>
</component>
diff --git a/.idea/school-apps.iml b/.idea/school-apps.iml
index 7a659e6a1dd3f53fe85212644a0641b06acd9951..96505904ed5d8c0e68e5910b64fa65f7233ef412 100644
--- a/.idea/school-apps.iml
+++ b/.idea/school-apps.iml
@@ -8,11 +8,14 @@
<option name="manageScript" value="manage.py" />
<option name="environment" value="<map/>" />
<option name="doNotUseTestRunner" value="false" />
+ <option name="trackFilePattern" value="migrations" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager">
- <content url="file://$MODULE_DIR$" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/schoolapps" isTestSource="false" />
+ </content>
<orderEntry type="jdk" jdkName="Python 3.5 (school-apps)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="jquery-3.2.1" level="application" />
@@ -20,6 +23,15 @@
</component>
<component name="TemplatesService">
<option name="TEMPLATE_CONFIGURATION" value="Django" />
+ <option name="TEMPLATE_FOLDERS">
+ <list>
+ <option value="$MODULE_DIR$/schoolapps/templates" />
+ <option value="$MODULE_DIR$/schoolapps/timetable/templates" />
+ <option value="$MODULE_DIR$/schoolapps/untisconnect/templates" />
+ <option value="$MODULE_DIR$/schoolapps/aub/templates" />
+ <option value="$MODULE_DIR$/schoolapps/dashboard/templates" />
+ </list>
+ </option>
</component>
<component name="TestRunnerService">
<option name="PROJECT_TEST_RUNNER" value="Unittests" />
diff --git a/.idea/webResources.xml b/.idea/webResources.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7e3b5239243b557da3316c5ecb85895739810eca
--- /dev/null
+++ b/.idea/webResources.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="WebResourcesPaths">
+ <contentEntries>
+ <entry url="file://$PROJECT_DIR$">
+ <entryData>
+ <resourceRoots>
+ <path value="file://$PROJECT_DIR$/schoolapps/static" />
+ </resourceRoots>
+ </entryData>
+ </entry>
+ </contentEntries>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 12b15d02cac4e617b92b132018c765a9940bab48..2b90ec9b2bccaf0334827acd7c25de3bd6a12110 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,17 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="3a000256-1023-4a19-a046-bde25cb853cc" name="Default" comment="">
- <change beforePath="" afterPath="$PROJECT_DIR$/schoolapps/schoolapps/example_secure_settings.py" />
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
- <change beforePath="$PROJECT_DIR$/schoolapps/schoolapps/settings.py" afterPath="$PROJECT_DIR$/schoolapps/schoolapps/settings.py" />
+ <change afterPath="$PROJECT_DIR$/.idea/webResources.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/schoolapps/timetable/templates/timetable/quicklaunch.html" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/schoolapps/timetable/templates/timetable/substitution.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/school-apps.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/school-apps.iml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/schoolapps/static/common/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/schoolapps/static/common/style.css" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/schoolapps/templates/partials/header.html" beforeDir="false" afterPath="$PROJECT_DIR$/schoolapps/templates/partials/header.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/schoolapps/timetable/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/schoolapps/timetable/urls.py" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/schoolapps/timetable/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/schoolapps/timetable/views.py" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
@@ -22,79 +29,71 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="views.py" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/schoolapps/aub/views.py">
+ <file leaf-file-name="secure_settings.py" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/schoolapps/schoolapps/secure_settings.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="239">
- <caret line="122" column="29" lean-forward="false" selection-start-line="122" selection-start-column="29" selection-end-line="122" selection-end-column="29" />
- <folding>
- <element signature="e#0#78#0" expanded="true" />
- </folding>
+ <state relative-caret-position="204">
+ <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/.gitignore">
+ <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="34">
- <caret line="2" column="5" lean-forward="true" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="5" />
- <folding />
+ <state relative-caret-position="303">
+ <caret line="134" column="24" selection-start-line="134" selection-start-column="24" selection-end-line="134" selection-end-column="24" />
+ <folding>
+ <element signature="e#309#318#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="secure_settings.py" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/schoolapps/schoolapps/secure_settings.py">
+ <file leaf-file-name="substitution.html" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/schoolapps/timetable/templates/timetable/substitution.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="204">
- <caret line="12" column="22" lean-forward="false" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
- <folding />
+ <state relative-caret-position="187">
+ <caret line="11" selection-start-line="11" selection-end-line="11" />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="settings.py" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/schoolapps/schoolapps/settings.py">
+ <file leaf-file-name="views.py" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/schoolapps/timetable/views.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2388">
- <caret line="145" column="11" lean-forward="true" selection-start-line="145" selection-start-column="11" selection-end-line="145" selection-end-column="11" />
+ <state relative-caret-position="294">
+ <caret line="19" column="27" lean-forward="true" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
<folding>
- <element signature="e#309#318#0" expanded="true" />
+ <element signature="e#0#57#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="example_secure_settings.py" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/schoolapps/schoolapps/example_secure_settings.py">
+ <file leaf-file-name="quicklaunch.html" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/schoolapps/timetable/templates/timetable/quicklaunch.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="178">
- <caret line="20" column="35" lean-forward="true" selection-start-line="20" selection-start-column="35" selection-end-line="20" selection-end-column="35" />
- <folding />
+ <state relative-caret-position="170">
+ <caret line="10" column="43" lean-forward="true" selection-start-line="10" selection-start-column="43" selection-end-line="10" selection-end-column="43" />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/README.md">
- <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
- <state split_layout="SPLIT">
- <first_editor relative-caret-position="212">
- <caret line="27" column="54" lean-forward="false" selection-start-line="27" selection-start-column="54" selection-end-line="27" selection-end-column="54" />
- <folding />
- </first_editor>
- <second_editor />
+ <file leaf-file-name="style.css" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/schoolapps/static/common/style.css">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="583">
+ <caret line="137" column="15" lean-forward="true" selection-start-line="137" selection-start-column="15" selection-end-line="137" selection-end-column="15" />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="notification.html" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/schoolapps/templates/mail/notification.html">
+ <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/schoolapps/timetable/urls.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="187">
- <caret line="11" column="44" lean-forward="false" selection-start-line="11" selection-start-column="44" selection-end-line="11" selection-end-column="44" />
- <folding />
+ <state relative-caret-position="102">
+ <caret line="7" column="26" selection-start-line="7" selection-start-column="26" selection-end-line="7" selection-end-column="26" />
</state>
</provider>
</entry>
@@ -102,31 +101,29 @@
<file leaf-file-name="header.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/schoolapps/templates/partials/header.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="170">
- <caret line="10" column="4" lean-forward="false" selection-start-line="10" selection-start-column="4" selection-end-line="16" selection-end-column="97" />
- <folding />
+ <state relative-caret-position="1399">
+ <caret line="109" column="16" lean-forward="true" selection-start-line="109" selection-start-column="16" selection-end-line="109" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="notification.txt" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/schoolapps/templates/mail/notification.txt">
+ <file leaf-file-name="example_secure_settings.py" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/schoolapps/schoolapps/example_secure_settings.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="204">
- <caret line="12" column="19" lean-forward="false" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
- <folding />
+ <state relative-caret-position="340">
+ <caret line="20" column="35" selection-start-line="20" selection-start-column="35" selection-end-line="20" selection-end-column="35" />
</state>
</provider>
</entry>
</file>
- <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="612">
- <caret line="41" column="0" lean-forward="false" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
- <folding>
- <element signature="e#0#57#0" expanded="true" />
- </folding>
+ <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/README.md">
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+ <state split_layout="SPLIT">
+ <first_editor relative-caret-position="373">
+ <caret line="39" column="18" selection-start-line="39" selection-start-column="18" selection-end-line="39" selection-end-column="18" />
+ </first_editor>
+ <second_editor />
</state>
</provider>
</entry>
@@ -166,9 +163,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <option value="$PROJECT_DIR$/schoolapps/templates/registration/logged_out.html" />
- <option value="$PROJECT_DIR$/schoolapps/aub/apps.py" />
- <option value="$PROJECT_DIR$/schoolapps/dashboard/apps.py" />
<option value="$PROJECT_DIR$/schoolapps/dashboard/admin.py" />
<option value="$PROJECT_DIR$/schoolapps/dashboard/README.md" />
<option value="$PROJECT_DIR$/schoolapps/dashboard/templates/index.html" />
@@ -191,7 +185,6 @@
<option value="$PROJECT_DIR$/schoolapps/untisconnect/views.py" />
<option value="$PROJECT_DIR$/schoolapps/untisconnect/models.py" />
<option value="$PROJECT_DIR$/schoolapps/timetable/parser/parse.py" />
- <option value="$PROJECT_DIR$/schoolapps/templates/partials/header.html" />
<option value="$PROJECT_DIR$/schoolapps/untisconnect/api.py" />
<option value="$PROJECT_DIR$/schoolapps/templates/partials/impress.html" />
<option value="$PROJECT_DIR$/schoolapps/timetable/models.py" />
@@ -199,11 +192,8 @@
<option value="$PROJECT_DIR$/schoolapps/timetable/parse.py" />
<option value="$PROJECT_DIR$/schoolapps/templates/partials/footer.html" />
<option value="$PROJECT_DIR$/schoolapps/schoolapps/urls.py" />
- <option value="$PROJECT_DIR$/schoolapps/static/common/style.css" />
<option value="$PROJECT_DIR$/schoolapps/timetable/templates/timetable/plan.html" />
<option value="$PROJECT_DIR$/schoolapps/timetable/templates/timetable/admin/all.html" />
- <option value="$PROJECT_DIR$/schoolapps/timetable/views.py" />
- <option value="$PROJECT_DIR$/schoolapps/timetable/urls.py" />
<option value="$PROJECT_DIR$/schoolapps/aub/forms.py" />
<option value="$PROJECT_DIR$/schoolapps/dashboard/migrations/0003_notification_user.py" />
<option value="$PROJECT_DIR$/schoolapps/dashboard/urls.py" />
@@ -215,8 +205,15 @@
<option value="$PROJECT_DIR$/schoolapps/aub/views.py" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/schoolapps/schoolapps/secure_settings.py" />
- <option value="$PROJECT_DIR$/schoolapps/schoolapps/settings.py" />
+ <option value="$PROJECT_DIR$/schoolapps/schoolapps/example_secure_settings.py" />
<option value="$PROJECT_DIR$/README.md" />
+ <option value="$PROJECT_DIR$/schoolapps/schoolapps/settings.py" />
+ <option value="$PROJECT_DIR$/schoolapps/timetable/templates/timetable/substitution.html" />
+ <option value="$PROJECT_DIR$/schoolapps/timetable/views.py" />
+ <option value="$PROJECT_DIR$/schoolapps/templates/partials/header.html" />
+ <option value="$PROJECT_DIR$/schoolapps/timetable/urls.py" />
+ <option value="$PROJECT_DIR$/schoolapps/static/common/style.css" />
+ <option value="$PROJECT_DIR$/schoolapps/timetable/templates/timetable/quicklaunch.html" />
</list>
</option>
</component>
@@ -226,6 +223,11 @@
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
+ <component name="NodePackageJsonFileManager">
+ <packageJsonPaths>
+ <path value="$PROJECT_DIR$/schoolapps/static/materialize/package.json" />
+ </packageJsonPaths>
+ </component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-3" />
<option name="y" value="33" />
@@ -234,20 +236,11 @@
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
- <navigator currentView="ProjectPane" proportions="" version="1">
- <flattenPackages />
- <showMembers />
- <showModules />
- <showLibraryContents />
- <hideEmptyPackages />
- <abbreviatePackageNames />
- <autoscrollToSource />
- <autoscrollFromSource />
- <sortByType />
- <manualOrder />
+ <navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -305,27 +298,46 @@
<item name="templates" type="462c0819:PsiDirectoryNode" />
<item name="partials" 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="timetable" 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="timetable" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" 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="timetable" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="timetable" type="462c0819:PsiDirectoryNode" />
+ </path>
</expand>
<select />
</subPane>
</pane>
- <pane id="Scope" />
- <pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
- <property name="last_opened_file_path" value="$PROJECT_DIR$/schoolapps" />
- <property name="WebServerToolWindowFactoryState" value="false" />
- <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
+ <property name="WebServerToolWindowFactoryState" value="false" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/schoolapps" />
+ <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PythonContentEntriesConfigurable" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$/schoolapps/timetable/templates/timetable" />
<recent name="$PROJECT_DIR$/schoolapps/schoolapps" />
<recent name="$PROJECT_DIR$/schoolapps/templates/mail" />
<recent name="$PROJECT_DIR$" />
<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/timetable/templates/timetable" />
@@ -350,6 +362,7 @@
<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="PARSE" type="PythonConfigurationType" factoryName="Python">
+ <module name="school-apps" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
@@ -360,8 +373,7 @@
<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" />
- <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+ <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/schoolapps/timetable/parse.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
@@ -369,6 +381,7 @@
<option name="MODULE_MODE" value="false" />
</configuration>
<configuration name="Start" type="Python.DjangoServer" factoryName="Django server">
+ <module name="school-apps" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
@@ -380,7 +393,6 @@
<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="" />
@@ -391,20 +403,17 @@
<option name="useCustomRunCommand" value="false" />
<option name="customRunCommand" value="" />
</configuration>
- <list size="3">
- <item index="0" class="java.lang.String" itemvalue="Django server.Start" />
- <item index="1" class="java.lang.String" itemvalue="Python.PARSE" />
- <item index="2" class="java.lang.String" itemvalue="JavaScript Debug.header.html" />
+ <list>
+ <item itemvalue="Django server.Start" />
+ <item itemvalue="Python.PARSE" />
+ <item itemvalue="JavaScript Debug.header.html" />
</list>
<recent_temporary>
- <list size="1">
- <item index="0" class="java.lang.String" itemvalue="JavaScript Debug.header.html" />
+ <list>
+ <item itemvalue="JavaScript Debug.header.html" />
</list>
</recent_temporary>
</component>
- <component name="ShelveChangesManager" show_recycled="false">
- <option name="remove_strategy" value="false" />
- </component>
<component name="SvnConfiguration">
<configuration />
</component>
@@ -661,34 +670,42 @@
<option name="project" value="LOCAL" />
<updated>1523783419731</updated>
</task>
- <option name="localTasksCounter" value="36" />
+ <task id="LOCAL-00036" summary="Change infrastructure for server">
+ <created>1524911299888</created>
+ <option name="number" value="00036" />
+ <option name="presentableId" value="LOCAL-00036" />
+ <option name="project" value="LOCAL" />
+ <updated>1524911299889</updated>
+ </task>
+ <option name="localTasksCounter" value="37" />
<servers />
</component>
<component name="ToolWindowManager">
- <frame x="-3" y="33" width="1372" height="738" extended-state="6" />
+ <frame x="-3" y="33" width="1926" height="1041" 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="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="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.3294509" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23770492" 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="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.25" 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="11" 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="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="5" 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.39933443" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <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.3294509" 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="4" side_tool="false" content_ui="tabs" />
+ <window_info anchor="bottom" id="TODO" order="6" />
+ <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50053364" side_tool="true" visible="true" weight="0.23710209" />
+ <window_info anchor="bottom" id="Database Changes" order="8" />
+ <window_info anchor="bottom" id="Version Control" order="10" weight="0.27083334" />
+ <window_info anchor="bottom" id="Python Console" order="8" weight="0.3294509" />
+ <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4994664" weight="0.23710209" />
+ <window_info anchor="bottom" id="Terminal" order="9" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2620064" />
+ <window_info anchor="bottom" id="Docker" order="11" show_stripe_button="false" />
+ <window_info anchor="right" id="Database" order="3" />
+ <window_info anchor="bottom" id="Find" order="1" sideWeight="0.4994664" weight="0.32930845" />
+ <window_info anchor="right" id="SciView" order="5" />
+ <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+ <window_info id="Favorites" order="2" side_tool="true" />
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.39933443" />
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+ <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+ <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+ <window_info anchor="right" id="Data View" order="4" />
+ <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+ <window_info anchor="bottom" id="Message" order="0" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -701,7 +718,6 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
- <MESSAGE value="Finish basic design (header, footer, etc.)" />
<MESSAGE value="Translate login/logout | Comment header" />
<MESSAGE value="Add dashboard with last activities (look at README)" />
<MESSAGE value="Add dashboard with last activities (look at README) [ADD UNVERSIONED FILES, MISTAKE]" />
@@ -726,7 +742,8 @@
<MESSAGE value="Remove activity registering [DASHBOARD]" />
<MESSAGE value="First notification with email in AUB" />
<MESSAGE value="Finish AUB notification" />
- <option name="LAST_COMMIT_MESSAGE" value="Finish AUB notification" />
+ <MESSAGE value="Change infrastructure for server" />
+ <option name="LAST_COMMIT_MESSAGE" value="Change infrastructure for server" />
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
<option name="REARRANGE_BEFORE_PROJECT_COMMIT" value="true" />
</component>
@@ -734,306 +751,236 @@
<breakpoint-manager>
<option name="time" value="4" />
</breakpoint-manager>
- <watches-manager />
</component>
<component name="editorHistoryManager">
- <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">
- <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/schoolapps/aub/templates/aub/details.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
- <caret line="10" column="7" lean-forward="false" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
+ <caret line="10" column="7" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/templates/registration/login.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="29" lean-forward="false" selection-start-line="0" selection-start-column="29" selection-end-line="0" selection-end-column="29" />
+ <state>
+ <caret column="29" selection-start-column="29" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/aub/templates/aub/applied_for.html">
<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" />
+ <caret line="10" column="21" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/aub/templates/aub/apply_for.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
- <caret line="12" column="34" lean-forward="false" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="34" />
+ <caret line="12" column="34" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="34" />
</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">
- <caret line="9" column="32" lean-forward="false" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
+ <caret line="9" column="32" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/mailer.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
- <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+ <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/untisconnect/templates/untisconnect/test.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
- <caret line="4" column="14" lean-forward="false" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
+ <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/untisconnect/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
- <caret line="4" column="50" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+ <caret line="4" column="50" selection-end-line="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/untisconnect/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
- <caret line="13" column="28" lean-forward="false" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+ <caret line="13" column="28" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/timetable-old/apps.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>
+ <provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/static/common/logo.png">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
+ <provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/untisconnect/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="18462">
- <caret line="1086" column="0" lean-forward="false" selection-start-line="1086" selection-start-column="0" selection-end-line="1086" selection-end-column="0" />
+ <caret line="1086" selection-start-line="1086" selection-end-line="1086" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/untisconnect/api.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3179">
- <caret line="187" column="37" lean-forward="false" selection-start-line="187" selection-start-column="37" selection-end-line="187" selection-end-column="37" />
+ <caret line="187" column="37" selection-start-line="187" selection-start-column="37" selection-end-line="187" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/timetable/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84">
- <caret line="5" column="28" lean-forward="false" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
+ <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/templates/partials/impress.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="321">
- <caret line="19" column="8" lean-forward="false" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="8" />
+ <caret line="19" column="8" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test.py" />
- <entry file="file://$PROJECT_DIR$/schoolapps/timetable/views.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="357">
- <caret line="25" column="57" lean-forward="false" selection-start-line="25" selection-start-column="57" selection-end-line="25" selection-end-column="57" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/schoolapps/templates/partials/footer.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
- <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+ <caret line="10" selection-start-line="10" selection-end-line="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/schoolapps/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="383">
- <caret line="29" column="26" lean-forward="false" selection-start-line="29" selection-start-column="26" selection-end-line="29" selection-end-column="26" />
+ <caret line="29" column="26" selection-start-line="29" selection-start-column="26" selection-end-line="29" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/timetable/parse.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="383">
- <caret line="225" column="52" lean-forward="false" selection-start-line="225" selection-start-column="52" selection-end-line="225" selection-end-column="52" />
+ <caret line="225" column="52" selection-start-line="225" selection-start-column="52" selection-end-line="225" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/timetable/templates/timetable/plan.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
- <caret line="78" column="89" lean-forward="false" selection-start-line="78" selection-start-column="89" selection-end-line="78" selection-end-column="89" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/schoolapps/static/common/style.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="60">
- <caret line="110" column="28" lean-forward="false" selection-start-line="110" selection-start-column="28" selection-end-line="110" selection-end-column="28" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/schoolapps/timetable/urls.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="85">
- <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
+ <caret line="78" column="89" selection-start-line="78" selection-start-column="89" selection-end-line="78" selection-end-column="89" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/timetable/templates/timetable/all.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
- <caret line="19" column="28" lean-forward="false" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
+ <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/apps.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>
+ <provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/aub/apps.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>
+ <provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/aub/forms.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
- <caret line="15" column="22" lean-forward="false" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
- <folding>
- <element signature="e#0#24#0" expanded="false" />
- </folding>
+ <caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/aub/templates/aub/check.html">
- <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>
+ <provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/migrations/0002_auto_20180412_1122.py" />
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/migrations/0002_remove_notification_to.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>
+ <provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/migrations/0004_auto_20180412_1129.py" />
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/migrations/0003_notification_user.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
- <caret line="15" column="28" lean-forward="false" selection-start-line="15" selection-start-column="28" selection-end-line="15" selection-end-column="28" />
+ <caret line="15" column="28" selection-start-line="15" selection-start-column="28" selection-end-line="15" selection-end-column="28" />
</state>
</provider>
</entry>
<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" />
+ <state>
+ <caret column="27" selection-start-column="27" selection-end-column="27" />
</state>
</provider>
</entry>
<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" />
+ <caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/aub/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
- <caret line="7" column="61" lean-forward="false" selection-start-line="7" selection-start-column="61" selection-end-line="7" selection-end-column="61" />
- <folding />
+ <caret line="7" column="61" selection-start-line="7" selection-start-column="61" selection-end-line="7" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
- <caret line="6" column="31" lean-forward="false" selection-start-line="6" selection-start-column="31" selection-end-line="6" selection-end-column="31" />
- <folding />
+ <caret line="6" column="31" selection-start-line="6" selection-start-column="31" selection-end-line="6" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/aub/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
- <caret line="11" column="4" lean-forward="false" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="4" />
- <folding />
+ <caret line="11" column="4" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
- <caret line="4" column="5" lean-forward="false" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
- <folding />
+ <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/templates/dashboard/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="748">
- <caret line="44" column="32" lean-forward="false" selection-start-line="44" selection-start-column="32" selection-end-line="44" selection-end-column="32" />
- <folding />
+ <caret line="44" column="32" selection-start-line="44" selection-start-column="32" selection-end-line="44" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/templates/mail/notification.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
- <caret line="11" column="44" lean-forward="false" selection-start-line="11" selection-start-column="44" selection-end-line="11" selection-end-column="44" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/schoolapps/templates/partials/header.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="170">
- <caret line="10" column="4" lean-forward="false" selection-start-line="10" selection-start-column="4" selection-end-line="16" selection-end-column="97" />
- <folding />
+ <caret line="11" column="44" selection-start-line="11" selection-start-column="44" selection-end-line="11" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/templates/mail/notification.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
- <caret line="12" column="19" lean-forward="false" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
- <folding />
+ <caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="612">
- <caret line="41" column="0" lean-forward="false" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
+ <caret line="41" selection-start-line="41" selection-end-line="41" />
<folding>
<element signature="e#0#57#0" expanded="true" />
</folding>
@@ -1042,8 +989,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/aub/views.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="239">
- <caret line="122" column="29" lean-forward="false" selection-start-line="122" selection-start-column="29" selection-end-line="122" selection-end-column="29" />
+ <state relative-caret-position="1938">
+ <caret line="122" column="29" selection-start-line="122" selection-start-column="29" selection-end-line="122" selection-end-column="29" />
<folding>
<element signature="e#0#78#0" expanded="true" />
</folding>
@@ -1053,45 +1000,87 @@
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34">
- <caret line="2" column="5" lean-forward="true" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="5" />
- <folding />
+ <caret line="2" column="5" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/schoolapps/secure_settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
- <caret line="12" column="22" lean-forward="false" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
- <folding />
+ <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/schoolapps/settings.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2388">
- <caret line="145" column="11" lean-forward="true" selection-start-line="145" selection-start-column="11" selection-end-line="145" selection-end-column="11" />
+ <state relative-caret-position="303">
+ <caret line="134" column="24" selection-start-line="134" selection-start-column="24" selection-end-line="134" selection-end-column="24" />
<folding>
<element signature="e#309#318#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/schoolapps/timetable/views.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="294">
+ <caret line="19" column="27" lean-forward="true" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
+ <folding>
+ <element signature="e#0#57#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/schoolapps/timetable/templates/timetable/substitution.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="187">
+ <caret line="11" selection-start-line="11" selection-end-line="11" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/schoolapps/timetable/urls.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="102">
+ <caret line="7" column="26" selection-start-line="7" selection-start-column="26" selection-end-line="7" selection-end-column="26" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/schoolapps/schoolapps/example_secure_settings.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="340">
+ <caret line="20" column="35" selection-start-line="20" selection-start-column="35" selection-end-line="20" selection-end-column="35" />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
- <first_editor relative-caret-position="212">
- <caret line="27" column="54" lean-forward="false" selection-start-line="27" selection-start-column="54" selection-end-line="27" selection-end-column="54" />
- <folding />
+ <first_editor relative-caret-position="373">
+ <caret line="39" column="18" selection-start-line="39" selection-start-column="18" selection-end-line="39" selection-end-column="18" />
</first_editor>
<second_editor />
</state>
</provider>
+ <provider editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/schoolapps/schoolapps/example_secure_settings.py">
+ <entry file="file://$PROJECT_DIR$/schoolapps/static/common/style.css">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="178">
- <caret line="20" column="35" lean-forward="true" selection-start-line="20" selection-start-column="35" selection-end-line="20" selection-end-column="35" />
- <folding />
+ <state relative-caret-position="583">
+ <caret line="137" column="15" lean-forward="true" selection-start-line="137" selection-start-column="15" selection-end-line="137" selection-end-column="15" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/schoolapps/templates/partials/header.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1399">
+ <caret line="109" column="16" lean-forward="true" selection-start-line="109" selection-start-column="16" selection-end-line="109" selection-end-column="16" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/schoolapps/timetable/templates/timetable/quicklaunch.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="170">
+ <caret line="10" column="43" lean-forward="true" selection-start-line="10" selection-start-column="43" selection-end-line="10" selection-end-column="43" />
</state>
</provider>
</entry>
diff --git a/README.md b/README.md
index 092383911ce05356a203cdb28aa52e4eff5a1420..4481cfb76bcda77c0e6fb798cf638c9a45f17de2 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ keine
### Ideen (unbestätigt)
- Elternsprechtag
- Bundesjungendspiele
+- Chat
## Installation
### Grundsystem
```
@@ -38,6 +39,7 @@ python3 -m venv env
source env/bin/activate
pip install mysqlclient
pip install django
+pip install django-cors-headers
```
- `example_secure_settings.py` zu `secure_settings.py` kopieren und anpassen
diff --git a/schoolapps/static/common/style.css b/schoolapps/static/common/style.css
index 9815aa9ff4b887461b4a21c0a8a1ecc8efad8018..216d528d79fb8ebfe03c816298c68ed6fcf9f826 100644
--- a/schoolapps/static/common/style.css
+++ b/schoolapps/static/common/style.css
@@ -130,4 +130,9 @@ span.badge.new::after {
}
.btn-flat-medium i {
font-size: 2rem;
-}
\ No newline at end of file
+}
+
+.btn-timetable-quicklaunch {
+ margin: 1%;
+ width: 30%;
+}
\ No newline at end of file
diff --git a/schoolapps/templates/partials/header.html b/schoolapps/templates/partials/header.html
index 4eda23cbb398d078ef8496396ad28acf78dc632f..dc56633342cf21dbe57a01f60c9911d9da5e290f 100644
--- a/schoolapps/templates/partials/header.html
+++ b/schoolapps/templates/partials/header.html
@@ -112,6 +112,8 @@
</li>
<li><a class="subheader grey lighten-3">Stundenplan</a></li>
<li><a href="{% url 'timetable_admin_all' %}">Ãœbersicht</a></li>
+ <li><a href="{% url 'timetable_quicklaunch' %}">Schnellzugriff</a></li>
+ <li><a href="{% url 'timetable_substitutions' %}">Vertretungsplan</a></li>
<li>
<div class="divider"></div>
</li>
diff --git a/schoolapps/timetable/templates/timetable/quicklaunch.html b/schoolapps/timetable/templates/timetable/quicklaunch.html
new file mode 100644
index 0000000000000000000000000000000000000000..ca213ff63d1384b96a1e06f8080b7e80e73b7f01
--- /dev/null
+++ b/schoolapps/timetable/templates/timetable/quicklaunch.html
@@ -0,0 +1,43 @@
+{% include 'partials/header.html' %}
+
+<main>
+ <h3>Ãœbersicht</h3>
+ <div class="row">
+ <div class="col s12 m4">
+ <h4>Lehrkräfte</h4>
+ {% for teacher in teachers %}
+ <a class="waves-effect waves-light btn btn-timetable-quicklaunch"
+ href="{% url 'timetable_plan' 'teacher' teacher.id %}">
+ {{ teacher.shortcode }}
+ </a><!-- Shortcode -->
+ {% endfor %}
+ </div>
+
+ <div class="col s12 m4">
+ <h4>Klassen</h4>
+
+ {% for class in classes %}
+ <a class="waves-effect waves-light btn btn-timetable-quicklaunch"
+ href="{% url 'timetable_plan' 'class' class.id %}">
+ {{ class.name }}
+ </a>
+ {% endfor %}
+
+ </div>
+
+ <div class="col s12 m4">
+ <h4>Räume</h4>
+ {% for room in rooms %}
+ <a class="waves-effect waves-light btn btn-timetable-quicklaunch"
+ href="{% url 'timetable_plan' 'room' room.id %}">
+ {{ room.shortcode }}
+ </a>
+ {% endfor %}
+ </div>
+
+
+ </div>
+
+</main>
+
+{% include 'partials/footer.html' %}
diff --git a/schoolapps/timetable/templates/timetable/substitution.html b/schoolapps/timetable/templates/timetable/substitution.html
new file mode 100644
index 0000000000000000000000000000000000000000..02e8f2719198462fb91addfe7f92451ce4709be5
--- /dev/null
+++ b/schoolapps/timetable/templates/timetable/substitution.html
@@ -0,0 +1,12 @@
+{% include 'partials/header.html' %}
+
+<main>
+ <h3>Vertretungen</h3>
+
+ <p class="flow-text">
+ Leider ist der Vertretungsplan noch nicht in Betrieb. Nutzen Sie solange die <a
+ href="https://info.katharineum.de/aktuell.pdf">alte Version</a>. Vielen Dank!
+ </p>
+</main>
+
+{% include 'partials/footer.html' %}
diff --git a/schoolapps/timetable/urls.py b/schoolapps/timetable/urls.py
index ffc1159b7057cc6ccbad0dbd96cc0abea25f0be5..3b79722e07404fe38765e97a9a13233e2acd46b6 100644
--- a/schoolapps/timetable/urls.py
+++ b/schoolapps/timetable/urls.py
@@ -2,6 +2,8 @@ from django.urls import path
from . import views
urlpatterns = [
- path('', views.admin_all, name='timetable_admin_all'),
- path('<str:plan_type>/<int:plan_id>', views.plan, name='timetable_plan')
+ path('', views.all, name='timetable_admin_all'),
+ path('quick', views.quicklaunch, name='timetable_quicklaunch'),
+ path('<str:plan_type>/<int:plan_id>', views.plan, name='timetable_plan'),
+ path('substitutions', views.substitutions, name='timetable_substitutions'),
]
diff --git a/schoolapps/timetable/views.py b/schoolapps/timetable/views.py
index f46a4f65e5453570eebaa1025a0c11aa51c71201..f03f66a3b0dded4d34df7e794937c9cd1ad485b7 100644
--- a/schoolapps/timetable/views.py
+++ b/schoolapps/timetable/views.py
@@ -10,9 +10,7 @@ except Exception:
pass
-# Create your views here.
-@login_required
-def admin_all(request):
+def get_all_context():
teachers = get_all_teachers()
classes = get_all_classes()
rooms = get_all_rooms()
@@ -23,9 +21,21 @@ def admin_all(request):
'rooms': rooms,
'subjects': subjects
}
+ return context
+
+
+@login_required
+def all(request):
+ context = get_all_context()
return render(request, 'timetable/all.html', context)
+@login_required
+def quicklaunch(request):
+ context = get_all_context()
+ return render(request, 'timetable/quicklaunch.html', context)
+
+
@login_required
def plan(request, plan_type, plan_id):
if plan_type == 'teacher':
@@ -49,3 +59,8 @@ def plan(request, plan_type, plan_id):
}
return render(request, 'timetable/plan.html', context)
+
+
+@login_required
+def substitutions(request):
+ return render(request, 'timetable/substitution.html')