-@register.inclusion_tag("catalogue/snippets/section_box.html")
-def section_box(section):
- lessons = SortedDict()
- for lesson in section.lesson_set.all():
- if lesson.level not in lessons:
- lessons[lesson.level] = SortedDict()
- if lesson.depth not in lessons[lesson.level]:
- lessons[lesson.level][lesson.depth] = []
- lessons[lesson.level][lesson.depth].append(lesson)
+
+@register.inclusion_tag("catalogue/snippets/level_box.html")
+def level_box(level):
+ lessons = dict(
+ synthetic = [],
+ course = SortedDict(),
+ project = [],
+ )
+ by_course = defaultdict(lambda: defaultdict(list))
+
+ lesson_lists = [alist for alist in [
+ list(level.lesson_set.exclude(type='appendix').order_by('section__order')),
+ list(level.lessonstub_set.all())
+ ] if alist]
+
+ while lesson_lists:
+ min_index, min_list = min(enumerate(lesson_lists), key=lambda x: x[1][0].order)
+ lesson = min_list.pop(0)
+ if not min_list:
+ lesson_lists.pop(min_index)
+
+ if lesson.type == 'course':
+ if lesson.section not in lessons['course']:
+ lessons['course'][lesson.section] = []
+ lessons['course'][lesson.section].append(lesson)
+ else:
+ lessons[lesson.type].append(lesson)
+
+ if hasattr(lesson, 'curriculum_courses'):
+ for course in lesson.curriculum_courses.all():
+ by_course[course][lesson.type].append(lesson)
+
+ courses = [(course, by_course[course]) for course in
+ CurriculumCourse.objects.filter(lesson__level=level).distinct()]
+