Merge branch 'dev' into server

biscuit/apps/chronos/settings.py

 import dbsettings
 from django import forms
 
-from untisconnect.api_helper import get_terms
+from untisconnect.api_helper import get_terms, get_school_years
 
-choices = []
+choices_school_years = []
+school_years = get_school_years()
+for year in school_years:
+    choices_school_years.append((year.id, year.name))
+
+choices_terms = []
 terms = get_terms()
 for term in terms:
-    choices.append((term.id, term.name))
+    choices_terms.append((term.id, "{}, #{}: {}".format(term.school_year_id, term.id, term.name)))
 
 
 class UNTISSettings(dbsettings.Group):
-    term = dbsettings.IntegerValue(widget=forms.Select, choices=choices)
+    school_year = dbsettings.PositiveIntegerValue("Schuljahr", widget=forms.Select, choices=choices_school_years)
+    term = dbsettings.IntegerValue("Periode", widget=forms.Select, choices=choices_terms,
+                                   help_text="Bitte wähle oberhalb auch das zur Periode passende Schuljahr aus.")
 
 
-untis_settings = UNTISSettings()
+untis_settings = UNTISSettings("UNTIS")

biscuit/apps/chronos/urls.py

 from django.urls import path
-from untisconnect.models import Terms
+
+from untisconnect.models import Terms, Schoolyear
 
 try:
     from . import views
@@ -25,7 +26,7 @@ try:
         path('<str:plan_date>-class.pdf', views.sub_pdf, name="timetable_substitutions_pdf_date")
     ]
 
-except Terms.DoesNotExist:
+except (Terms.DoesNotExist, Schoolyear.DoesNotExist):
     from . import fallback_view
 
     urlpatterns = [
@@ -46,5 +47,3 @@ except Terms.DoesNotExist:
              name='timetable_substitutions_date'),
         path('class.pdf', fallback_view.fallback, name="timetable_substitutions_pdf")
     ]
-    
-