From dabdf514baa22aab3c23665733861e7a16de11a5 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sun, 14 Mar 2021 16:54:19 +0100
Subject: [PATCH] Move register objects table stuff to own template file
---
.../alsijil/class_register/all_objects.html | 44 +------------------
.../alsijil/class_register/person.html | 13 +-----
.../alsijil/partials/objects_table.html | 43 ++++++++++++++++++
3 files changed, 47 insertions(+), 53 deletions(-)
create mode 100644 aleksis/apps/alsijil/templates/alsijil/partials/objects_table.html
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/all_objects.html b/aleksis/apps/alsijil/templates/alsijil/class_register/all_objects.html
index 6a22b8a91..b5e57e0ee 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/all_objects.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/all_objects.html
@@ -14,46 +14,6 @@
{% endblock %}
{% block content %}
- <div class="card">
- <div class="card-content">
- <div class="card-title">{% trans "Lesson filter" %}</div>
- <form action="" method="get">
- {% form form=filter_form %}{% endform %}
- <button type="submit" class="btn waves-effect waves-light">
- <i class="material-icons left">refresh</i>
- {% trans "Update filters" %}
- </button>
- </form>
- </div>
- </div>
-
- {% if table %}
- <div class="card">
- <div class="card-content">
- <form action="" method="post">
- {% csrf_token %}
- <div class="row">
- <div class="col s12 m4 l4 xl6">
- <div class="card-title">{% trans "Lesson table" %}</div>
- </div>
- <div class="col s12 m8 l8 xl6">
- <div class="col s12 m8">
- {% form form=action_form %}{% endform %}</div>
- <div class="col s12 m4">
-
- <button type="submit" class="btn waves-effect waves-primary">
- {% trans "Execute" %}
- <i class="material-icons right">send</i>
- </button>
- </div>
- </div>
- </div>
- {% render_table table %}
-
- </form>
- </div>
- </div>
- {% endif %}
-
+ {% include "alsijil/partials/objects_table.html" %}
<script src="{% static "js/multi_select.js" %}"></script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/person.html b/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
index 5302e2489..96729befb 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
@@ -9,7 +9,7 @@
{% has_perm "alsijil.view_my_students" user as has_students %}
{% if has_students %}
<a href="{% url "my_students" %}"
- class="btn-flat primary-color-text waves-light waves-effect">
+ class="btn-flat primary-color-text waves-light waves-effect">
<i class="material-icons left">chevron_left</i> {% trans "Back" %}
</a>
{% endif %}
@@ -34,16 +34,7 @@
</div>
{% if register_object_table %}
<div class="col s12" id="lesson-documentations">
- <h5>{% trans "Lesson filter" %}</h5>
- <form action="" method="get">
- {% form form=filter_form %}{% endform %}
- <button type="submit" class="btn waves-effect waves-light">
- <i class="material-icons left">refresh</i>
- {% trans "Update filters" %}
- </button>
- </form>
- <h5>{% trans "Lesson table" %}</h5>
- {% render_table register_object_table %}
+ {% include "alsijil/partials/objects_table.html" with table=register_object_table filter_form=filter_form %}
</div>
{% endif %}
<div class="col s12" id="personal-notes">
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/objects_table.html b/aleksis/apps/alsijil/templates/alsijil/partials/objects_table.html
new file mode 100644
index 000000000..f13e60439
--- /dev/null
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/objects_table.html
@@ -0,0 +1,43 @@
+{% load i18n material_form django_tables2 %}
+<div class="card">
+ <div class="card-content">
+ <div class="card-title">{% trans "Lesson filter" %}</div>
+ <form action="" method="get">
+ {% form form=filter_form %}{% endform %}
+ <button type="submit" class="btn waves-effect waves-light">
+ <i class="material-icons left">refresh</i>
+ {% trans "Update filters" %}
+ </button>
+ </form>
+ </div>
+</div>
+
+{% if table %}
+ <div class="card">
+ <div class="card-content">
+ <form action="" method="post">
+ {% csrf_token %}
+ <div class="row">
+ <div class="col s12 {% if action_form %}m4 l4 xl6{% endif %}">
+ <div class="card-title">{% trans "Lesson table" %}</div>
+ </div>
+ {% if action_form %}
+ <div class="col s12 m8 l8 xl6">
+ <div class="col s12 m8">
+ {% form form=action_form %}{% endform %}
+ </div>
+ <div class="col s12 m4">
+ <button type="submit" class="btn waves-effect waves-primary">
+ {% trans "Execute" %}
+ <i class="material-icons right">send</i>
+ </button>
+ </div>
+ </div>
+ {% endif %}
+ </div>
+ {% render_table table %}
+
+ </form>
+ </div>
+ </div>
+{% endif %}
--
GitLab