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

Show lesson topic and groups in week view

Groups are only shown if the current page doesn't show a group
parent d519bea1
No related branches found
No related tags found
1 merge request!75Resolve "Show lesson topic and group in week overview"
Pipeline #3197 passed
...@@ -48,8 +48,12 @@ ...@@ -48,8 +48,12 @@
<tr> <tr>
<th></th> <th></th>
<th>{% blocktrans %}Period{% endblocktrans %}</th> <th>{% blocktrans %}Period{% endblocktrans %}</th>
{% if not group %}
<th>{% blocktrans %}Groups{% endblocktrans %}</th>
{% endif %}
<th>{% blocktrans %}Subject{% endblocktrans %}</th> <th>{% blocktrans %}Subject{% endblocktrans %}</th>
<th>{% blocktrans %}Teachers{% endblocktrans %}</th> <th>{% blocktrans %}Teachers{% endblocktrans %}</th>
<th>{% blocktrans %}Lesson topic{% endblocktrans %}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -63,6 +67,13 @@ ...@@ -63,6 +67,13 @@
{{ period.period.period }}. {{ period.period.period }}.
</a> </a>
</td> </td>
{% if not group %}
<td>
<a class="tr-link" href="{% url 'lesson_by_week_and_period' week.year week.week period.id %}">
{{ period.lesson.group_names }}
</a>
</td>
{% endif %}
<td> <td>
<a class="tr-link" href="{% url 'lesson_by_week_and_period' week.year week.week period.id %}"> <a class="tr-link" href="{% url 'lesson_by_week_and_period' week.year week.week period.id %}">
{{ period.get_subject.name }} {{ period.get_subject.name }}
...@@ -73,6 +84,11 @@ ...@@ -73,6 +84,11 @@
{{ period.get_teacher_names }} {{ period.get_teacher_names }}
</a> </a>
</td> </td>
<td>
<a class="tr-link" href="{% url 'lesson_by_week_and_period' week.year week.week period.id %}">
{{ period.get_lesson_documentation.topic }}
</a>
</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
......
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