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

Work copy

parent 41a46f17
No related branches found
No related tags found
1 merge request!86Merge school-apps
......@@ -69,43 +69,67 @@
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>
{% for sub in subs %}
<div class="card ">
<div class="card-content">
<span class="card-title">{% for class_ in sub.classes %}
{{ class_.name }}
{% endfor %}</span>
<p>
<strong>{{ sub.lesson }}. Stunde</strong>
{% if sub.teacher_new %}
<s>{{ sub.teacher_old.shortcode }}</s><strong>{{ sub.teacher_new.shortcode }}</strong>
{% else %}
<strong>{{ sub.teacher_old.shortcode }}</strong>
{% endif %}
·
{% if sub.subject_new %}
<s>{{ sub.subject_old.shortcode }}</s><strong>{{ sub.subject_new.shortcode }}</strong>
{% else %}
<strong>{{ sub.subject_old.shortcode }}</strong>
{% endif %}
·
{% if sub.room_new %}
<s>{{ sub.room_old.shortcode }}</s><strong>{{ sub.room_new.shortcode }}</strong>
{% else %}
<strong>{{ sub.room_old.shortcode }}</strong>
{% endif %}
·
<em>{{ sub.text|default:"" }}</em>
</p>
<p>
<small>{{ sub.id }} {{ sub.lesson_id }}</small>
</p>
</div>
<div class="row">
<div class="col s12 m6">
<table>
<thead>
<tr>
<th><i class="material-icons">access_time</i></th>
<th><i class="material-icons">people</i></th>
<th>Lehrer</th>
<th>Fach</th>
<th>Raum</th>
<th><i class="material-icons">info</i></th>
<th>i</th>
</tr>
</thead>
<tbody>
{% for sub in subs %}
<tr>
<td>
<strong>{{ sub.lesson }}.</strong>
</td>
<td>
{% for class_ in sub.classes %}
{{ class_.name }}
{% endfor %}
</td>
<td>
{% if sub.teacher_new %}
<s>{{ sub.teacher_old.shortcode }}</s>
<strong>{{ sub.teacher_new.shortcode }}</strong>
{% else %}
<strong>{{ sub.teacher_old.shortcode }}</strong>
{% endif %}
</td>
<td>
{% if sub.subject_new %}
<s>{{ sub.subject_old.shortcode }}</s>
<strong>{{ sub.subject_new.shortcode }}</strong>
{% else %}
<strong>{{ sub.subject_old.shortcode }}</strong>
{% endif %}
</td>
<td>
{% if sub.room_new %}
<s>{{ sub.room_old.shortcode }}</s><strong>{{ sub.room_new.shortcode }}</strong>
{% else %}
<strong>{{ sub.room_old.shortcode }}</strong>
{% endif %}
</td>
<td>
<em>{{ sub.text|default:"" }}</em>
</td>
<td>
<small>{{ sub.id }} {{ sub.lesson_id }}</small>
</td>
</tr>
{# {{ sub.date }}#}
{% endfor %}
</tbody>
</table>
</div>
{# {{ sub.date }}#}
{% endfor %}
</div>
</main>
{% include 'partials/footer.html' %}
......@@ -83,7 +83,7 @@ class Substitution(object):
def get_substitutions_by_date():
subs_raw = run_default_filter(
run_using(models.Substitution.objects.filter(date="20180821").order_by("classids", "lesson")),
run_using(models.Substitution.objects.filter(date="20180901").order_by("classids", "lesson")),
filter_term=False)
# print(subs_raw)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment