X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/05333a6f2d2ea77a602612c3aaff039dc7b97200..0029595caa78abc831724d22b4c1b45b9867cec0:/catalogue/templatetags/catalogue_tags.py

diff --git a/catalogue/templatetags/catalogue_tags.py b/catalogue/templatetags/catalogue_tags.py
index 80b1a0c..a8d69e6 100755
--- a/catalogue/templatetags/catalogue_tags.py
+++ b/catalogue/templatetags/catalogue_tags.py
@@ -8,8 +8,12 @@ register = template.Library()
 
 @register.inclusion_tag("catalogue/snippets/carousel.html")
 def catalogue_carousel():
-    return {
-    }
+    lessons_count = Lesson.objects.filter(type__in=('course', 'synthetic')).count()
+    if 1 < lessons_count % 10 < 5 and lessons_count / 10 % 10 != 1:
+        lessons_desc = u'kompletne lekcje'
+    else:
+        lessons_desc = u'kompletnych lekcji'
+    return locals()
 
 @register.inclusion_tag("catalogue/snippets/section_buttons.html")
 def catalogue_section_buttons():
@@ -17,15 +21,19 @@ def catalogue_section_buttons():
         "object_list": Section.objects.all()
     }
 
-@register.inclusion_tag("catalogue/snippets/chosen_topics.html")
-def catalogue_chosen_topics():
-    return {
-    }
-
 @register.inclusion_tag("catalogue/snippets/section_box.html")
 def section_box(section):
     lessons = SortedDict()
-    for lesson in section.lesson_set.all():
+    lesson_lists = [alist for alist in [
+        list(section.lesson_set.all()),
+        list(section.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.level not in lessons:
             newdict = SortedDict()
             newdict['synthetic'] = []
@@ -35,6 +43,7 @@ def section_box(section):
             lessons[lesson.level][lesson.type] = []
         lessons[lesson.level][lesson.type].append(lesson)
     return {
+        "section": section,
         "lessons": lessons,
     }
 
@@ -42,19 +51,26 @@ def section_box(section):
 def lesson_nav(lesson):
     if lesson.type == 'course':
         root = lesson.section
-        siblings = root.lesson_set.filter(type='course')
+        siblings = Lesson.objects.filter(type='course', level=lesson.level, section=root)
+        mark_level = False
+        link_other_level = True
     else:
         root = None
         siblings = Lesson.objects.filter(type=lesson.type)
+        mark_level = link_other_level = lesson.type == 'course'
     return {
         "lesson": lesson,
         "root": root,
         "siblings": siblings,
+        "mark_level": mark_level
     }
 
 @register.inclusion_tag("catalogue/snippets/lesson_link.html")
 def lesson_link(uri):
-    return {'lesson': Lesson.objects.get(slug=WLURI(uri).slug)}
+    try:
+        return {'lesson': Lesson.objects.get(slug=WLURI(uri).slug)}
+    except Lesson.DoesNotExist:
+        return {}
 
 @register.filter
 def person_list(persons):