diff --git a/biscuit/apps/alsijil/templates/alsijil/group_week.html b/biscuit/apps/alsijil/templates/alsijil/group_week.html
index 65f7e9b28ecdf6808bd53ed1138d02db45c04dd1..fd25a1da6ecb8a357989e1f36d0ba67912a23ecd 100644
--- a/biscuit/apps/alsijil/templates/alsijil/group_week.html
+++ b/biscuit/apps/alsijil/templates/alsijil/group_week.html
@@ -44,16 +44,20 @@
                         {% today as today %}
                         {% if current_date < today %}
                           table-danger
+                        {% else %}
+                          {% if period.get_substitution %}
+                            table-warning
+                          {% endif %}
                         {% endif %}
                       {% endif %}
                     ">
                       <td>{{ period.period.period }}</td>
                       <td>
                         <a href="{% url 'lesson_by_week_and_period' week period.id %}">
-                          {{ period.lesson.subject.name }}
+                          {{ period.get_subject.name }}
                         </a>
                       </td>
-                      <td>{{ period.lesson.teacher_names }}</td>
+                      <td>{{ period.get_teacher_names }}</td>
                     </tr>
                   {% endfor %}
                 </tbody>