diff --git a/advlabdb/adminModelViews.py b/advlabdb/adminModelViews.py
index 1494c6d..c358fc4 100644
--- a/advlabdb/adminModelViews.py
+++ b/advlabdb/adminModelViews.py
@@ -128,7 +128,7 @@ class UserView(SecureAdminModelView):
@staticmethod
def semesterQueryFactory():
- return Semester.query.order_by(Semester.id.desc()).where(Semester.done == False)
+ return Semester.query.order_by(Semester.id.desc())
@staticmethod
def default_roles():
diff --git a/advlabdb/assistantModelViews.py b/advlabdb/assistantModelViews.py
index 3de19fa..ed22d54 100644
--- a/advlabdb/assistantModelViews.py
+++ b/advlabdb/assistantModelViews.py
@@ -53,7 +53,7 @@ class AssistantGroupExperimentView(SecureAssistantModelView):
if not semester_changed:
flash(
Markup(
- f"Active semester {active_semester} is marked as done. Therefore, you are not allowed to view or edit any marks in this semester. You should change your active semester in user settings if possible."
+ f"Active semester {active_semester} is set as done. Therefore, you are not allowed to view or edit any marks in this semester. You should change your active semester in user settings if possible."
),
"danger",
)
@@ -218,7 +218,7 @@ class AssistantUserView(SecureAssistantModelView):
query_factory=semesterQueryFactory,
validators=[DataRequired()],
default=Semester.lastSemester,
- description="You should change the active semester to the last semester. Do not forget to click save! Only last two semesters are shown that are not marked as done.",
+ description="You should change the active semester to the last semester. Do not forget to click save! Only last two semesters are shown that are not set as done.",
)
phone_number, mobile_phone_number, building, room = user_info_fields()
diff --git a/advlabdb/models.py b/advlabdb/models.py
index 880e63e..8e3d015 100644
--- a/advlabdb/models.py
+++ b/advlabdb/models.py
@@ -724,7 +724,7 @@ class User(db.Model, FsUserMixin):
return False
else:
flash(
- f"Active semester changed to {last_semester} because your last active semester was marked as done!",
+ f"Active semester changed to {last_semester} because your last active semester was set as done!",
"warning",
)