Merge branch '62-show-lesson-topic-in-week-overview' into 'master'

Resolve "Show lesson topic and group in week overview"

Closes #62

See merge request !75

aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html

@@ -48,8 +48,12 @@
                 <tr>
                   <th></th>
                   <th>{% blocktrans %}Period{% endblocktrans %}</th>
+                  {% if not group %}
+                    <th>{% blocktrans %}Groups{% endblocktrans %}</th>
+                  {% endif %}
                   <th>{% blocktrans %}Subject{% endblocktrans %}</th>
                   <th>{% blocktrans %}Teachers{% endblocktrans %}</th>
+                  <th>{% blocktrans %}Lesson topic{% endblocktrans %}</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -63,6 +67,13 @@
                         {{ period.period.period }}.
                       </a>
                     </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>
                       <a class="tr-link" href="{% url 'lesson_by_week_and_period' week.year week.week period.id %}">
                         {{ period.get_subject.name }}
@@ -73,6 +84,11 @@
                         {{ period.get_teacher_names }}
                       </a>
                     </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>
                 {% endfor %}
                 </tbody>