diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 69d90257d55049f0d5dd4e0c82f585e40a5b4afe..d79aa8018221b1cda1cf2bb5a8725169207bf3eb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,8 @@
<component name="ChangeListManager">
<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/aub/forms.py" afterPath="$PROJECT_DIR$/schoolapps/aub/forms.py" />
+ <change beforePath="$PROJECT_DIR$/schoolapps/aub/templates/aub/check1.html" afterPath="" />
+ <change beforePath="$PROJECT_DIR$/schoolapps/aub/templates/aub/check2.html" afterPath="$PROJECT_DIR$/schoolapps/aub/templates/aub/check.html" />
<change beforePath="$PROJECT_DIR$/schoolapps/aub/views.py" afterPath="$PROJECT_DIR$/schoolapps/aub/views.py" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -24,18 +25,18 @@
<file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
<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="true" selection-start-line="7" selection-start-column="61" selection-end-line="7" selection-end-column="61" />
+ <state relative-caret-position="0">
+ <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 />
</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/aub/views.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="153">
- <caret line="9" column="0" lean-forward="true" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
+ <state relative-caret-position="-697">
+ <caret line="51" column="60" lean-forward="true" selection-start-line="51" selection-start-column="60" selection-end-line="51" selection-end-column="60" />
<folding>
<element signature="e#0#78#0" expanded="true" />
</folding>
@@ -43,6 +44,26 @@
</provider>
</entry>
</file>
+ <file leaf-file-name="check.html" pinned="false" current-in-tab="true">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="models.py" pinned="false" current-in-tab="false">
+ <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 />
+ </state>
+ </provider>
+ </entry>
+ </file>
<file leaf-file-name="apps.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/apps.py">
<provider selected="true" editor-type-id="text-editor">
@@ -56,7 +77,7 @@
<file leaf-file-name="models.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/models.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="298">
+ <state relative-caret-position="374">
<caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
<folding />
</state>
@@ -67,7 +88,7 @@
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="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>
<element signature="e#0#57#0" expanded="true" />
</folding>
@@ -78,8 +99,8 @@
<file leaf-file-name="forms.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/schoolapps/aub/forms.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="85">
- <caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+ <state relative-caret-position="255">
+ <caret line="15" column="22" lean-forward="true" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
<folding>
<element signature="e#0#24#0" expanded="true" />
</folding>
@@ -87,16 +108,6 @@
</provider>
</entry>
</file>
- <file leaf-file-name="apps.py" pinned="false" current-in-tab="false">
- <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" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@@ -232,6 +243,21 @@
<item name="schoolapps" type="462c0819:PsiDirectoryNode" />
<item name="aub" 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="aub" 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="aub" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="aub" type="462c0819:PsiDirectoryNode" />
+ </path>
<path>
<item name="school-apps" type="b2602c69:ProjectViewProjectNode" />
<item name="school-apps" type="462c0819:PsiDirectoryNode" />
@@ -295,8 +321,8 @@
<select />
</subPane>
</pane>
- <pane id="Scope" />
<pane id="Scratches" />
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -610,7 +636,14 @@
<option name="project" value="LOCAL" />
<updated>1523371770196</updated>
</task>
- <option name="localTasksCounter" value="31" />
+ <task id="LOCAL-00031" summary="Tidy (comment out not used code) | Use timezone.datetime instead of datetime | Register activity in apply for aub">
+ <created>1523459119047</created>
+ <option name="number" value="00031" />
+ <option name="presentableId" value="LOCAL-00031" />
+ <option name="project" value="LOCAL" />
+ <updated>1523459119047</updated>
+ </task>
+ <option name="localTasksCounter" value="32" />
<servers />
</component>
<component name="ToolWindowManager">
@@ -623,7 +656,7 @@
<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="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.23106061" 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.23484848" 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" />
@@ -650,7 +683,6 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
- <MESSAGE value="Implement aub model completely" />
<MESSAGE value="Bug fix in login module" />
<MESSAGE value="Init static files" />
<MESSAGE value="Include Materialize" />
@@ -675,7 +707,8 @@
<MESSAGE value="Comment in urls" />
<MESSAGE value="Refactor CSS for timetable (> flex) | Show classes on teacher and room plans" />
<MESSAGE value="Some changes in timetable app" />
- <option name="LAST_COMMIT_MESSAGE" value="Some changes in timetable app" />
+ <MESSAGE value="Tidy (comment out not used code) | Use timezone.datetime instead of datetime | Register activity in apply for aub" />
+ <option name="LAST_COMMIT_MESSAGE" value="Tidy (comment out not used code) | Use timezone.datetime instead of datetime | Register activity in apply for aub" />
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
<option name="REARRANGE_BEFORE_PROJECT_COMMIT" value="true" />
</component>
@@ -686,16 +719,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/schoolapps/dashboard/README.md">
- <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
- <state split_layout="SPLIT">
- <first_editor relative-caret-position="272">
- <caret line="16" column="8" lean-forward="false" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" />
- </first_editor>
- <second_editor />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/schoolapps/static/materialize/js/datepicker.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-918">
@@ -872,14 +895,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/schoolapps/aub/models.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="918">
- <caret line="59" column="28" lean-forward="false" selection-start-line="59" selection-start-column="28" selection-end-line="59" selection-end-column="28" />
- <folding />
- </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">
@@ -895,7 +910,6 @@
<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" />
- <folding />
</state>
</provider>
</entry>
@@ -911,7 +925,6 @@
<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" />
- <folding />
</state>
</provider>
</entry>
@@ -927,7 +940,6 @@
<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" />
- <folding />
</state>
</provider>
</entry>
@@ -935,7 +947,6 @@
<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" />
- <folding />
</state>
</provider>
</entry>
@@ -951,19 +962,18 @@
<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" />
- <folding />
</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="true" selection-start-line="7" selection-start-column="61" selection-end-line="7" selection-end-column="61" />
+ <state relative-caret-position="0">
+ <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 />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/schoolapps/aub/apps.py">
+ <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" />
@@ -971,27 +981,33 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/schoolapps/aub/forms.py">
+ <entry file="file://$PROJECT_DIR$/schoolapps/dashboard/models.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="85">
- <caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
- <folding>
- <element signature="e#0#24#0" expanded="true" />
- </folding>
+ <state relative-caret-position="374">
+ <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+ <folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/dashboard/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="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>
<element signature="e#0#57#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/schoolapps/dashboard/apps.py">
+ <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 />
+ </state>
+ </provider>
+ </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" />
@@ -999,23 +1015,33 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/schoolapps/dashboard/models.py">
+ <entry file="file://$PROJECT_DIR$/schoolapps/aub/forms.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="298">
- <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
- <folding />
+ <state relative-caret-position="255">
+ <caret line="15" column="22" lean-forward="true" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
+ <folding>
+ <element signature="e#0#24#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/schoolapps/aub/views.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="153">
- <caret line="9" column="0" lean-forward="true" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
+ <state relative-caret-position="-697">
+ <caret line="51" column="60" lean-forward="true" selection-start-line="51" selection-start-column="60" selection-end-line="51" selection-end-column="60" />
<folding>
<element signature="e#0#78#0" expanded="true" />
</folding>
</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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/schoolapps/aub/templates/aub/check2.html b/schoolapps/aub/templates/aub/check.html
similarity index 100%
rename from schoolapps/aub/templates/aub/check2.html
rename to schoolapps/aub/templates/aub/check.html
diff --git a/schoolapps/aub/templates/aub/check1.html b/schoolapps/aub/templates/aub/check1.html
deleted file mode 100644
index 7a5d674f6e6dfec16c0536e49188c84aa72b6236..0000000000000000000000000000000000000000
--- a/schoolapps/aub/templates/aub/check1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-{% include 'partials/header.html' %}
-
-<main>
- <h5>Ausstehende Anträge</h5>
-
-
- <ul class="collection">
- {% for aub in aubs %}
- <li class="collection-item">
- <div class="row">
- <div class="col s12 m8">
- <p class="title">
- <i class="material-icons left">access_time</i>
- {{ aub.from_dt }} bis {{ aub.to_dt }}
- </p>
- <p><a href="{% url 'aub_details' aub.id %}">{{ aub.description }}</a></p>
- </div>
- <div class="col s12 m4">
- <p>
- <form action="" method="POST" class="right">
- {% csrf_token %}
- <input type="hidden" value="{{ aub.id }}" name="aub-id">
- <button type="submit" name="semi-allow" class="waves-effect waves-light btn-flat btn-flat-large">
- <i class="material-icons center green-text">check_circle</i>
- </button>
- <button type="submit" name="deny" class="waves-effect waves-light btn-flat btn-flat-large">
- <i class="material-icons center red-text">cancel</i>
- </button>
- </form>
- </p>
- </div>
- </div>
- </li>
- {% endfor %}
- </ul>
-</main>
-
-{% include 'partials/footer.html' %}
diff --git a/schoolapps/aub/views.py b/schoolapps/aub/views.py
index 3b8961ed8710cd6f77c906e88fb222e4c7d41057..a9c10164fdafa1795d49892805e49544e70ac37a 100644
--- a/schoolapps/aub/views.py
+++ b/schoolapps/aub/views.py
@@ -50,8 +50,9 @@ def apply_for(request):
aub.save()
a = Activity(user=request.user, title="Antrag auf Unterrichtsbefreiung gestellt",
- description="Sie haben einen Antrag auf Unterrichtsbefreiung für den Zeitraum von {} bis {} gestellt.".format(
- aub.from_dt, aub.to_dt), app=AubConfig.verbose_name)
+ description="Sie haben einen Antrag auf Unterrichtsbefreiung " +
+ "für den Zeitraum von {} bis {} gestellt.".format(
+ aub.from_dt, aub.to_dt), app=AubConfig.verbose_name)
a.save()
return redirect(reverse('aub_applied_for'))
@@ -82,7 +83,7 @@ def check1(request):
if request.method == 'POST':
if 'aub-id' in request.POST:
aub_id = request.POST['aub-id']
- if 'semi-allow' in request.POST:
+ if 'allow' in request.POST:
Aub.objects.filter(id=aub_id).update(status=SEMI_ALLOWED_STATUS)
elif 'deny' in request.POST:
Aub.objects.filter(id=aub_id).update(status=NOT_ALLOWED_STATUS)
@@ -92,7 +93,7 @@ def check1(request):
'aubs': aubs
}
- return render(request, 'aub/check1.html', context)
+ return render(request, 'aub/check.html', context)
@login_required
@@ -111,4 +112,4 @@ def check2(request):
'aubs': aubs
}
- return render(request, 'aub/check2.html', context)
+ return render(request, 'aub/check.html', context)