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

Some changes in timetable app

parent d6e34c35
No related branches found
No related tags found
1 merge request!86Merge school-apps
Hide whitespace changes
Inline Side-by-side
.idea/workspace.xml
+ 75
− 51
View file @ 7bec660d
<?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="Refact">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/schoolapps/static/common/style.css" afterPath="$PROJECT_DIR$/schoolapps/static/common/style.css" />
<change beforePath="$PROJECT_DIR$/schoolapps/timetable/templates/timetable/plan.html" afterPath="$PROJECT_DIR$/schoolapps/timetable/templates/timetable/plan.html" />
<change beforePath="$PROJECT_DIR$/schoolapps/timetable/templates/timetable/admin/all.html" afterPath="$PROJECT_DIR$/schoolapps/timetable/templates/timetable/all.html" />
<change beforePath="$PROJECT_DIR$/schoolapps/timetable/urls.py" afterPath="$PROJECT_DIR$/schoolapps/timetable/urls.py" />
<change beforePath="$PROJECT_DIR$/schoolapps/timetable/views.py" afterPath="$PROJECT_DIR$/schoolapps/timetable/views.py" />
<change beforePath="$PROJECT_DIR$/timetable-old/views.py" afterPath="$PROJECT_DIR$/timetable-old/views.py" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -24,8 +26,8 @@
<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="440">
<caret line="40" column="19" lean-forward="false" selection-start-line="40" selection-start-column="19" selection-end-line="40" selection-end-column="19" />
<state relative-caret-position="-121">
<caret line="25" column="57" lean-forward="true" selection-start-line="25" selection-start-column="57" selection-end-line="25" selection-end-column="57" />
<folding>
<element signature="e#0#57#0" expanded="true" />
</folding>
......@@ -83,10 +85,10 @@
</provider>
</entry>
</file>
<file leaf-file-name="plan.html" pinned="false" current-in-tab="true">
<file leaf-file-name="plan.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/schoolapps/timetable/templates/timetable/plan.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<state relative-caret-position="355">
<caret line="78" column="89" lean-forward="false" selection-start-line="78" selection-start-column="89" selection-end-line="78" selection-end-column="89" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#main#0;n#!!top" expanded="true" />
......@@ -105,21 +107,21 @@
</provider>
</entry>
</file>
<file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
<file leaf-file-name="urls.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/schoolapps/timetable/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="5" column="36" lean-forward="false" selection-start-line="5" selection-start-column="36" selection-end-line="5" selection-end-column="36" />
<caret line="5" column="32" lean-forward="false" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="all.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/schoolapps/timetable/templates/timetable/admin/all.html">
<entry file="file://$PROJECT_DIR$/schoolapps/timetable/templates/timetable/all.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="36" lean-forward="true" selection-start-line="6" selection-start-column="36" selection-end-line="6" selection-end-column="36" />
<state relative-caret-position="-203">
<caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
<folding />
</state>
</provider>
......@@ -194,10 +196,7 @@
<option value="$PROJECT_DIR$/schoolapps/timetable/templates/timetable/admin/teachers.html" />
<option value="$PROJECT_DIR$/schoolapps/untisconnect/views.py" />
<option value="$PROJECT_DIR$/schoolapps/untisconnect/models.py" />
<option value="$PROJECT_DIR$/schoolapps/timetable/urls.py" />
<option value="$PROJECT_DIR$/schoolapps/timetable/parser/parse.py" />
<option value="$PROJECT_DIR$/schoolapps/timetable/templates/timetable/admin/all.html" />
<option value="$PROJECT_DIR$/schoolapps/timetable/views.py" />
<option value="$PROJECT_DIR$/schoolapps/templates/partials/header.html" />
<option value="$PROJECT_DIR$/schoolapps/untisconnect/api.py" />
<option value="$PROJECT_DIR$/schoolapps/dashboard/views.py" />
......@@ -211,6 +210,9 @@
<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" />
</list>
</option>
</component>
......@@ -293,6 +295,21 @@
<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>
......@@ -307,17 +324,17 @@
<property name="DefaultHtmlFileTemplate" value="HTML File" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<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" />
<recent name="$PROJECT_DIR$/schoolapps/timetable" />
<recent name="$PROJECT_DIR$/schoolapps/timetable/templates/timetable/admin" />
<recent name="$PROJECT_DIR$/schoolapps/untisconnect" />
<recent name="$PROJECT_DIR$/schoolapps/dashboard/templates/dashboard" />
<recent name="$PROJECT_DIR$/schoolapps/aub/templates/aub" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$" />
<recent name="$PROJECT_DIR$/schoolapps/aub/templates/aub" />
<recent name="$PROJECT_DIR$/schoolapps/static/common" />
</key>
</component>
<component name="RunDashboard">
......@@ -597,7 +614,14 @@
<option name="project" value="LOCAL" />
<updated>1523358682678</updated>
</task>
<option name="localTasksCounter" value="29" />
<task id="LOCAL-00029" summary="Refactor CSS for timetable (&gt; flex) | Show classes on teacher and room plans">
<created>1523363478852</created>
<option name="number" value="00029" />
<option name="presentableId" value="LOCAL-00029" />
<option name="project" value="LOCAL" />
<updated>1523363478852</updated>
</task>
<option name="localTasksCounter" value="30" />
<servers />
</component>
<component name="ToolWindowManager">
......@@ -637,7 +661,6 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Delete teacher app" />
<MESSAGE value="Update Aub model" />
<MESSAGE value="Implement aub model completely" />
<MESSAGE value="Bug fix in login module" />
......@@ -662,7 +685,8 @@
<MESSAGE value="A working timetable [NOT FINISHED]" />
<MESSAGE value="A working timetable" />
<MESSAGE value="Comment in urls" />
<option name="LAST_COMMIT_MESSAGE" value="Comment in urls" />
<MESSAGE value="Refactor CSS for timetable (&gt; flex) | Show classes on teacher and room plans" />
<option name="LAST_COMMIT_MESSAGE" value="Refactor CSS for timetable (&gt; flex) | Show classes on teacher and room plans" />
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
<option name="REARRANGE_BEFORE_PROJECT_COMMIT" value="true" />
</component>
......@@ -931,24 +955,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/timetable/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="5" column="36" lean-forward="false" selection-start-line="5" selection-start-column="36" selection-end-line="5" selection-end-column="36" />
<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="440">
<caret line="40" column="19" lean-forward="false" selection-start-line="40" selection-start-column="19" selection-end-line="40" selection-end-column="19" />
<folding>
<element signature="e#0#57#0" expanded="true" />
</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="287">
......@@ -981,14 +987,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/timetable/templates/timetable/admin/all.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="36" lean-forward="true" selection-start-line="6" selection-start-column="36" selection-end-line="6" selection-end-column="36" />
<folding />
</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="338">
......@@ -999,7 +997,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/timetable/templates/timetable/plan.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<state relative-caret-position="355">
<caret line="78" column="89" lean-forward="false" selection-start-line="78" selection-start-column="89" selection-end-line="78" selection-end-column="89" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#main#0;n#!!top" expanded="true" />
......@@ -1007,5 +1005,31 @@
</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="-203">
<caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
<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="-121">
<caret line="25" column="57" lean-forward="true" selection-start-line="25" selection-start-column="57" selection-end-line="25" selection-end-column="57" />
<folding>
<element signature="e#0#57#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/timetable/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="5" column="32" lean-forward="false" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
schoolapps/timetable/templates/timetable/admin/all.html → schoolapps/timetable/templates/timetable/all.html
+ 7
− 17
View file @ 7bec660d
......@@ -3,8 +3,8 @@
<main>
<h3>Übersicht</h3>
<div class="row">
<div class="col s12 m3">
<h4>Alle Lehrkräfte</h4>
<div class="col s12 m4">
<h4>Lehrkräfte</h4>
<ul class="collection">
{% for teacher in teachers %}
<li class="collection-item avatar">
......@@ -16,8 +16,8 @@
</ul>
</div>
<div class="col s12 m3">
<h4>Alle Klassen</h4>
<div class="col s12 m4">
<h4>Klassen</h4>
<ul class="collection">
{% for class in classes %}
<li class="collection-item avatar">
......@@ -32,8 +32,8 @@
</ul>
</div>
<div class="col s12 m3">
<h4>Alle Räume</h4>
<div class="col s12 m4">
<h4>Räume</h4>
<ul class="collection">
{% for room in rooms %}
<li class="collection-item avatar">
......@@ -44,17 +44,7 @@
</ul>
</div>
<div class="col s12 m3">
<h4>Alle Fächer</h4>
<ul class="collection">
{% for subject in subjects %}
<li class="collection-item avatar">
<i class="circle">{{ subject.shortcode }}</i>
<strong>{{ subject.shortcode }}</strong>
</li>
{% endfor %}
</ul>
</div>
</div>
</main>
......
schoolapps/timetable/urls.py
+ 2
− 2
View file @ 7bec660d
......@@ -2,6 +2,6 @@ from django.urls import path
from . import views
urlpatterns = [
path('admin/all/', views.admin_all, name='timetable_admin_all'),
path('plan/<str:plan_type>/<int:plan_id>', views.plan, name='timetable_plan')
path('', views.admin_all, name='timetable_admin_all'),
path('<str:plan_type>/<int:plan_id>', views.plan, name='timetable_plan')
]
schoolapps/timetable/views.py
+ 1
− 1
View file @ 7bec660d
......@@ -23,7 +23,7 @@ def admin_all(request):
'rooms': rooms,
'subjects': subjects
}
return render(request, 'timetable/admin/all.html', context)
return render(request, 'timetable/all.html', context)
@login_required
......
timetable-old/views.py
+ 1
− 1
View file @ 7bec660d
......@@ -20,7 +20,7 @@ def admin_all(request):
'classes': classes,
'rooms': rooms
}
return render(request, 'timetable/admin/all.html', context)
return render(request, 'timetable/admin/../schoolapps/timetable/templates/timetable/all.html', context)
@login_required
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment