Changeset 9776 for main/waeup.kofa/trunk/src

Timestamp:

6 Dec 2012, 11:23:03 (12 years ago)

Author:

uli

Message:

Lists of levels are computed at several places, everywhere following
the same algorithm. I think it's good to have this algorithm in
exactly one place.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/vocabularies.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/students/vocabularies.py

@@ -36 +36 @@
 nats_vocab = SimpleKofaVocabulary(*COUNTRIES)
 
+def levels_from_range(start_level=None, end_level=None):
+    """Get a list of valid levels for given start/end level.
+
+    Start and end level must be numbers (or ``None``).
+
+    If no start/end level is given, return the default list of levels.
+
+    If only one of start_level or end_level is given, the result is
+    undefined.
+    """
+    if 999 in (start_level, end_level):
+        return [999]
+    levels = [10,] + [
+        level for level in range(100,1000,10) if level % 100 < 30]
+    if start_level is None and end_level is None:
+        return levels + [999]
+    if start_level == 10 == end_level:
+        return [10,]
+    start_level, end_level = (start_level or 10, end_level or 900)
+    levels = [x for x in levels
+              if x >= start_level and x <= (end_level + 120)]
+    return levels
+
 def study_levels(context):
     certificate = getattr(context, 'certificate', None)
+    start_level, end_level = (None, None)
     if  certificate is not None:
         start_level = int(certificate.start_level)
         end_level = int(certificate.end_level)
-        if start_level == 999 or end_level == 999:
-            levels = [999]
-        elif start_level == 10 and end_level == 10:
-            levels = [10,]
-        elif start_level == 10:
-            levels = [10,] + [level for level in range(100,end_level+200,10)
-                if level % 100 < 30]
-        else:
-            levels = [level for level in range(start_level,end_level+200,10)
-                if level % 100 < 30]
-    else:
-        # default level range
-        levels = [10,]
-        levels += [level for level in range(100,1000,10) if level % 100 < 30]
-        levels.append(999)
-    return levels
-
+    return levels_from_range(start_level, end_level)
 
 class StudyLevelSource(BasicContextualSourceFactory):