Changeset 1988 for WAeUP_SRP/branches/joachim-azax-branch/Widgets.py

Timestamp:

5 Jul 2007, 11:14:12 (17 years ago)

Author:

joachim

Message:

merged r1979:r1987 from trunk

File:

• WAeUP_SRP/branches/joachim-azax-branch/Widgets.py (modified) (6 diffs)

WAeUP_SRP/branches/joachim-azax-branch/Widgets.py

@@ -177 +177 @@
 
 class WAeUPStudyModeWidget(CPSSelectWidget): ###(
-    """WAeUP StudyMode widget."""
+    """WAeUP StudyMode Widget."""
     meta_type = 'WAeUP StudyMode Widget'
     vocabulary = 'entry_modes'
@@ -246 +246 @@
 
 class WAeUPSessionWidget(CPSSelectWidget): ###(
-    """WAeUP Session widget."""
+    """WAeUP Session Widget."""
     meta_type = 'WAeUP Session Widget'
 
     def _getSessions(self):
         current_year = DateTime().year()
-        d = {'xx': 'unknown'}
+        d = {'-1': 'N/A'}
         for y in range(current_year - 9,current_year + 1):
             d['%s' % str(y)[-2:]] = '%4d/%4d' % (y,y+1)
@@ -295 +295 @@
             vocabulary_items = sessions.items()
             if self.sorted:
-                vocabulary_items.sort(key=operator.itemgetter(1))
+                vocabulary_items.sort(key=operator.itemgetter(0))
             for k, v in vocabulary_items:
                 kw = {'value': k, 'contents': v}
@@ -321 +321 @@
 
     def _getLevels(self):
-        d = {'999':'unknown'}
+        d = {'000':'N/A'}
         for y in range(100,800,100):
             d['%s' % str(y)] = 'Year %1d (%3d Level)' % (y/100,y)
@@ -363 +363 @@
             vocabulary_items = levels.items()
             if self.sorted:
-                vocabulary_items.sort(key=operator.itemgetter(1))
+                vocabulary_items.sort(key=operator.itemgetter(0))
             for k, v in vocabulary_items:
                 kw = {'value': k, 'contents': v}
@@ -385 +385 @@
 
 class WAeUPVerdictWidget(CPSSelectWidget): ###(
-    """WAeUP Verdict widget."""
+    """WAeUP Verdict Widget."""
     meta_type = 'WAeUP Verdict Widget'