Skip to content
Snippets Groups Projects
Verified Commit ce6b1373 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Provide list of teacher names for substituted lessons.

Advances BiscuIT-App-Alsijil#27.
parent 6abe2af2
No related branches found
No related tags found
No related merge requests found
...@@ -157,7 +157,7 @@ class LessonPeriod(SchoolRelated): ...@@ -157,7 +157,7 @@ class LessonPeriod(SchoolRelated):
return None return None
def get_subject(self) -> Optional[Subject]: def get_subject(self) -> Optional[Subject]:
if self.get_substitution(): if self.get_substitution() and self.get_substitution().subject:
return self.get_substitution().subject return self.get_substitution().subject
else: else:
return self.lesson.subject return self.lesson.subject
...@@ -169,11 +169,14 @@ class LessonPeriod(SchoolRelated): ...@@ -169,11 +169,14 @@ class LessonPeriod(SchoolRelated):
return self.lesson.teachers return self.lesson.teachers
def get_room(self) -> Optional[Room]: def get_room(self) -> Optional[Room]:
if self.get_substitution(): if self.get_substitution() and self.get_substitution().room:
return self.get_substitution().room return self.get_substitution().room
else: else:
return self.room return self.room
def get_teacher_names(self, sep: Optional[str] = ', ') -> str:
return sep.join([teacher.full_name for teacher in self.get_teachers().all()])
def get_groups(self) -> models.query.QuerySet: def get_groups(self) -> models.query.QuerySet:
return self.lesson.groups return self.lesson.groups
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment