verbose curriculum levels in model

[edumed.git] / curriculum / templatetags / curriculum_tags.py

diff --git a/curriculum/templatetags/curriculum_tags.py b/curriculum/templatetags/curriculum_tags.py
index cc37d0e..9525aec 100755 (executable)
--- a/curriculum/templatetags/curriculum_tags.py
+++ b/curriculum/templatetags/curriculum_tags.py
@@ -21,7 +21,9 @@ def competence(texts, 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__iexact=identifier.replace(' ', ''))
                  for identifier in identifiers]
@@ -30,7 +32,7 @@ def curriculum(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]
@@ -40,6 +42,7 @@ def curriculum(identifiers):
 
     return {
         'currset': currset,
+        'new': new,
     }