diff --git a/aleksis/apps/alsijil/util.py b/aleksis/apps/alsijil/util.py new file mode 100644 index 0000000000000000000000000000000000000000..da358059242d744e0e1783b88ca2b5fd96d6577f --- /dev/null +++ b/aleksis/apps/alsijil/util.py @@ -0,0 +1,9 @@ +from typing import List + + +def append_if_all(iterable: List, *args) -> List: + """Append args to a list if all args are true-like.""" + if all(args): + for a in args: + iterable.append(a) + return iterable diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py index b3fdbd7ebbcc482a613c06180a0a5bab7c854459..f97509307b7f46c885dc9fa0c559250e52783db8 100644 --- a/aleksis/apps/alsijil/views.py +++ b/aleksis/apps/alsijil/views.py @@ -13,6 +13,7 @@ from django_tables2 import SingleTableView from reversion.views import RevisionMixin from rules.contrib.views import PermissionRequiredMixin +from aleksis.apps.alsijil.util import append_if_all from aleksis.apps.chronos.managers import TimetableType from aleksis.apps.chronos.models import LessonPeriod from aleksis.apps.chronos.util.chronos_helpers import get_el_by_pk @@ -294,11 +295,6 @@ def week_view( lesson_periods, key=lambda x: (x.period.weekday, x.period.period) ) - def append_if_all(iterable, *args): - if all(args): - for a in args: - iterable.append(a) - context["extra_marks"] = ExtraMark.objects.all() context["week"] = wanted_week context["weeks"] = get_weeks_for_year(year=wanted_week.year)