Skip to content
Snippets Groups Projects

Resolve "Add simple course book list"

Merged Hangzhi Yu requested to merge 256-add-simple-course-book-list into master
Compare and Show latest version
1 file
+ 8
9
Compare changes
  • Side-by-side
  • Inline
@@ -521,11 +521,9 @@ class Documentation(CalendarEvent):
obj_type may be one of TEACHER, GROUP, ROOM, COURSE
"""
# documentations = Documentation.objects.filter(
# Q(course__pk=course_id) | Q(lesson_event__course__pk=course_id)
# )
# 1. Find all LessonEvents for all Lessons of this Course in this date range
# TODO: verify that substitutions don't break this
events = LessonEvent.get_single_events(date_start, date_end, request, {"type": obj_type, "id": obj_id, }, with_reference_obj=True)
# (1.5 filter them by permissions)
...
@@ -534,20 +532,21 @@ class Documentation(CalendarEvent):
# if so, add the documentation to a list, if not, create a new one
return [
(
event_reference_obj.first()
if event_reference_obj.documentation.exists() else
event_reference_obj.documentation.first() # TODO: probably show all documentations
if (event_reference_obj := event["REFERENCE_OBJ"]).documentation.exists() else
cls(
pk=f"DUMMY:{event_reference_obj.id}",
lesson_event=event_reference_obj,
# course=Course.objects.filter(id=event_meta["course"]["id"]).first(),
# subject=Subject.objects.get(id=event_meta["subject"]["id"] or event_meta["course"]["subject"]["id"]),
course=event_reference_obj.course,
subject=event_reference_obj.subject,
datetime_start=event["DTSTART"].dt,
datetime_end=event["DTEND"].dt,
)
)
for event_reference_obj in [e["REFERENCE_OBJ"] for e in events]
for event in events
]
class ParticipationStatus(ExtensibleModel):
"""A participation or absence record about a single person.
Loading