diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py index ed06b1e5b4b86d6f4aaf64809f73d8dadf00b974..293b62ba8f886a0689d79121421de7e346bb9473 100644 --- a/aleksis/apps/chronos/models.py +++ b/aleksis/apps/chronos/models.py @@ -345,7 +345,7 @@ class LessonSubstitution(models.Model): raise ValidationError(_("Lessons can only be either substituted or cancelled.")) @property - def type(self): + def type_(self): # TODO: Add cases events and supervisions if self.cancelled: return "cancellation" diff --git a/aleksis/apps/chronos/templates/chronos/substitutions.html b/aleksis/apps/chronos/templates/chronos/substitutions.html index f21f2c2fb5fdd741ca5e0c0c41f59d43031f201a..204efd1a3501bd6d743f175f5b785b12faaf5468 100644 --- a/aleksis/apps/chronos/templates/chronos/substitutions.html +++ b/aleksis/apps/chronos/templates/chronos/substitutions.html @@ -80,7 +80,7 @@ </td> {% endif %} {% for sub in substitutions %} - <tr class="{% if sub.type == "cancellation" %}green-text{% else %}black-text{% endif %}"> {# TODO: Extend support for blue and purple (supervisions and events) #} + <tr class="{% if sub.type_ == "cancellation" %}green-text{% else %}black-text{% endif %}"> {# TODO: Extend support for blue and purple (supervisions and events) #} <td> {% include "chronos/partials/groups.html" with groups=sub.lesson_period.lesson.groups.all %} </td> diff --git a/aleksis/apps/chronos/urls.py b/aleksis/apps/chronos/urls.py index 0bdd940f486ed8ea3530483e53d24fd97ce6687f..fb3e7c2e0fe25027493b3d5fcf6c2816846c68a3 100644 --- a/aleksis/apps/chronos/urls.py +++ b/aleksis/apps/chronos/urls.py @@ -3,7 +3,7 @@ from django.urls import path from . import views urlpatterns = [ - path("", views.all, name="all_timetables"), + path("", views.all_timetables, name="all_timetables"), path("timetable/my/", views.my_timetable, name="my_timetable"), path("timetable/my/<int:year>/<int:month>/<int:day>/", views.my_timetable, name="my_timetable_by_date"), path("timetable/<str:type_>/<int:pk>/", views.timetable, name="timetable"), diff --git a/aleksis/apps/chronos/views.py b/aleksis/apps/chronos/views.py index 0842903493427dd286b35590975020ae00c8542f..444925c5298b4f21da16cfa1d881103dbf06d6fe 100644 --- a/aleksis/apps/chronos/views.py +++ b/aleksis/apps/chronos/views.py @@ -28,7 +28,7 @@ from .util.weeks import CalendarWeek, get_weeks_for_year @login_required -def all(request: HttpRequest) -> HttpResponse: +def all_timetables(request: HttpRequest) -> HttpResponse: context = {} teachers = Person.objects.annotate(