diff --git a/advlabdb/modelViews.py b/advlabdb/modelViews.py index 7391fe3..74a334b 100644 --- a/advlabdb/modelViews.py +++ b/advlabdb/modelViews.py @@ -139,8 +139,21 @@ class RoleView(SecureModelView): class SemesterView(SecureModelView): class CreateForm(Form): - label = RadioField("Semester", choices=["WS", "SS"], validators=[DataRequired()]) - year = TextField("Year", validators=[DataRequired()]) + def labelDefault(): + if userActiveSemester().label == "WS": + return "SS" + else: + return "WS" + + def yearDefault(): + activeSemester = userActiveSemester() + if activeSemester.label == "WS": + return activeSemester.year + 1 + else: + return activeSemester.year + + label = RadioField("Semester", choices=["WS", "SS"], validators=[DataRequired()], default=labelDefault) + year = TextField("Year", validators=[DataRequired()], default=yearDefault) transfer_parts = BooleanField( "Transfer parts", description="This option transfers the parts you have in your current active semester. Make sure that your semester is the last semester before creating a new one (recommended)!",