X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/8489d044ccb3f0ea247eae2dec8387d5b206e4b4..94e3d1b327655f92b3ea314cc581c707728e1acd:/curriculum/templatetags/curriculum_tags.py

diff --git a/curriculum/templatetags/curriculum_tags.py b/curriculum/templatetags/curriculum_tags.py
index cf0cc7d..9525aec 100755
--- a/curriculum/templatetags/curriculum_tags.py
+++ b/curriculum/templatetags/curriculum_tags.py
@@ -1,6 +1,8 @@
+# -*- coding: utf-8 -*-
 from django import template
 from django.utils.datastructures import SortedDict
 from ..models import Competence, Curriculum, CurriculumCourse
+from catalogue.models import Lesson
 
 register = template.Library()
 
@@ -10,23 +12,27 @@ def competence(texts, level):
     try:
         comps = [Competence.from_text(text) for text in texts]
     except:
+        # WTF
         return {'texts': texts}
     return {
         'comps': comps,
         'level': level,
     }
 
+
 @register.inclusion_tag("curriculum/snippets/curriculum.html")
-def curriculum(identifiers):
+def curriculum(identifiers, new=False):
+    # shouldn't be needed, but is
+    identifiers = [id for id in identifiers if id]
     try:
-        currs = [Curriculum.objects.get(identifier=identifier)
-                    for identifier in identifiers]
+        currs = [Curriculum.objects.get(identifier__iexact=identifier.replace(' ', ''))
+                 for identifier in identifiers]
     except Curriculum.DoesNotExist:
         return {'identifiers': identifiers}
 
     currset = SortedDict()
     for curr in currs:
-        k = curr.course, curr.level
+        k = curr.course, curr.level.verbose
         if k not in currset:
             currset[k] = SortedDict()
         typename = Curriculum.TYPES[curr.type]
@@ -36,6 +42,7 @@ def curriculum(identifiers):
 
     return {
         'currset': currset,
+        'new': new,
     }
     
 
@@ -44,6 +51,7 @@ def url_for_level(comp, level):
     try:
         return comp.url_for_level(level)
     except:
+        # WTF
         return comp.get_absolute_url()
 
 
@@ -60,16 +68,32 @@ def course_box(course):
             lessons[lesson.level][lesson.type] = []
         lessons[lesson.level][lesson.type].append(lesson)
     return {
+        "course": course,
         "lessons": lessons,
     }
 
+
 @register.inclusion_tag("curriculum/snippets/course_boxes.html")
 def course_boxes():
     return {'object_list': CurriculumCourse.objects.all()}
 
+
 @register.inclusion_tag("curriculum/snippets/course_boxes_toc.html")
 def course_boxes_toc(accusative=False):
+    last = None, None
+    object_list = []
+    lessons = Lesson.curriculum_courses.through.objects\
+        .select_related('lesson__level', 'curriculumcourse')\
+        .order_by('lesson__level', 'curriculumcourse')
+    for l in lessons:
+        level, course = l.lesson.level, l.curriculumcourse
+        if (level, course) == last:
+            continue
+        if level != last[0]:
+            object_list.append((level, []))
+        object_list[-1][1].append(course)
+        last = (level, course)
     return {
-        'object_list': CurriculumCourse.objects.all(),
+        'object_list': object_list,
         'accusative': accusative,
     }