Skip to content
Snippets Groups Projects
Verified Commit 4e7004ce authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

[Mobile week view] Add support for events and extra lessons

parent 9857982b
No related branches found
No related tags found
1 merge request!120Resolve "Support events and extra lessons in class register"
Pipeline #5364 passed
Stage: test
Stage: build
Hide whitespace changes
Inline Side-by-side
aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
+ 54
− 14
View file @ 4e7004ce
......@@ -119,10 +119,7 @@
{% if register_object.period %}
{{ register_object.period.period }}.
{% else %}
{{ register_object.date_start|date:"SHORT_DATE_FORMAT" }}
{{ register_object.period_from.period }}.–<br/>
{{ register_object.date_end|date:"SHORT_DATE_FORMAT" }}
{{ register_object.period_to.period }}.
{{ register_object.period_from_on_day }}.–{{ register_object.period_to_on_day }}.
{% endif %}
</a>
</td>
......@@ -188,7 +185,8 @@
<ul class="collapsible hide-on-extra-large-only">
<li class="">
<div class="collapsible-header flow-text">
{{ weekday }}, {{ advanced_weekday.date }} <i class="material-icons collapsible-icon-right">expand_more</i>
{{ advanced_weekday.name }}, {{ advanced_weekday.date }} <i
class="material-icons collapsible-icon-right">expand_more</i>
</div>
<div class="collapsible-body">
<div class="collection">
......@@ -201,17 +199,42 @@
<table class="hide-on-med-and-down">
<tr>
<th>{% trans "Subject" %}</th>
<td>{{ register_object.period.period }}. {{ register_object.get_subject.name }}</td>
<td>
{% if register_object.period %}
{{ register_object.period.period }}.
{% else %}
{{ register_object.period_from_on_day }}.–{{ register_object.period_to_on_day }}.
{% endif %}
{% if register_object.get_subject %}
{{ register_object.get_subject.name }}
{% elif register_object.subject %}
{{ register_object.subject }}
{% else %}
{% trans "Event" %}
{% endif %}
</td>
</tr>
{% if not group %}
<tr>
<th>{% trans "Group" %}</th>
<td>{{ register_object.lesson.group_names }}</td>
<th>{% trans "Groups" %}</th>
<td>
{% if register_object.lesson %}
{{ register_object.lesson.group_names }}
{% else %}
{{ register_object.group_names }}
{% endif %}
</td>
</tr>
{% endif %}
<tr>
<th>{% trans "Teachers" %}</th>
<td>{{ register_object.lesson.teacher_names }}</td>
<td>
{% if register_object.get_teacher_names %}
{{ register_object.get_teacher_names }}
{% else %}
{{ register_object.teacher_names }}
{% endif %}
</td>
</tr>
<tr>
<th>{% trans "Lesson topic" %}</th>
......@@ -235,17 +258,34 @@
<div class="hide-on-large-only">
<ul class="collection">
<li class="collection-item">
{{ register_object.period.period }}. {{ register_object.get_subject.name }}
{% if register_object.period %}
{{ register_object.period.period }}.
{% else %}
{{ register_object.period_from_on_day }}.–{{ register_object.period_to_on_day }}.
{% endif %}
{% if register_object.get_subject %}
{{ register_object.get_subject.name }}
{% elif register_object.subject %}
{{ register_object.subject }}
{% else %}
{% trans "Event" %}
{% endif %}
</li>
{% if not group %}
<li class="collection-item">
{{ register_object.lesson.group_names }}
{% if register_object.lesson %}
{{ register_object.lesson.group_names }}
{% else %}
{{ register_object.group_names }}
{% endif %}
</li>
{% endif %}
<li class="collection-item">
{{ register_object.lesson.teacher_names }}
{% if register_object.get_teacher_names %}
{{ register_object.get_teacher_names }}
{% else %}
{{ register_object.teacher_names }}
{% endif %}
</li>
<li class="collection-item">
{{ register_object.get_lesson_documentation.topic }}
......
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