Changeset 8820

Timestamp:

27 Jun 2012, 07:15:21 (12 years ago)

Author:

Henrik Bettermann

Message:

Change key for 'not yet' verdict and sort verdicts.

Location:

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

Files:

• interfaces.py (modified) (5 diffs)
• tests/test_browser.py (modified) (1 diff)
• tests/test_export.py (modified) (5 diffs)
• utils.py (modified) (2 diffs)

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

@@ -42 +42 @@
     def getValues(self, context):
         verdicts_dict = getUtility(IStudentsUtils).VERDICTS_DICT
-        return verdicts_dict.keys()
+        return sorted(verdicts_dict.keys())
 
     def getToken(self, context, value):
@@ -49 +49 @@
     def getTitle(self, context, value):
         verdicts_dict = getUtility(IStudentsUtils).VERDICTS_DICT
+        if value != '0':
+            return verdicts_dict[value] + ' (%s)' % value
         return verdicts_dict[value]
 
@@ -345 +347 @@
         title = _(u'Current Verdict'),
         source = VerdictSource(),
-        default = 'NY',
+        default = '0',
         required = False,
         )
@@ -352 +354 @@
         title = _(u'Previous Verdict'),
         source = VerdictSource(),
-        default = 'NY',
+        default = '0',
         required = False,
         )
@@ -396 +398 @@
         title = _(u'Verdict'),
         source = VerdictSource(),
-        default = 'NY',
+        default = '0',
         required = False,
         )

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -754 +754 @@
         self.assertEqual(student['studycourse'].current_session, 2005) # +1
         self.assertEqual(student['studycourse'].current_level, 200) # +100
-        self.assertEqual(student['studycourse'].current_verdict, 'NY') # NY = not set
+        self.assertEqual(student['studycourse'].current_verdict, '0') # 0 = Zero = not set
         self.assertEqual(student['studycourse'].previous_verdict, 'A')
         self.browser.getControl(name="transition").value = ['register_courses']

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py

@@ -127 +127 @@
             'entry_mode,entry_session,previous_verdict,student_id\r\n'
 
-            ',,,NY,,,NY,\r\n'
+            ',,,0,,,0,\r\n'
             )
         return
@@ -144 +144 @@
             'entry_mode,entry_session,previous_verdict,student_id\r\n'
 
-            'CERT1,200,2012,NY,ug_ft,2010,NY,A111111\r\n'
+            'CERT1,200,2012,0,ug_ft,2010,0,A111111\r\n'
             )
         return
@@ -160 +160 @@
             'entry_mode,entry_session,previous_verdict,student_id\r\n'
 
-            'CERT1,200,2012,NY,ug_ft,2010,NY,A111111\r\n'
+            'CERT1,200,2012,0,ug_ft,2010,0,A111111\r\n'
             )
         return
@@ -175 +175 @@
             'entry_mode,entry_session,previous_verdict,student_id\r\n'
 
-            'CERT1,200,2012,NY,ug_ft,2010,NY,A111111\r\n'
+            'CERT1,200,2012,0,ug_ft,2010,0,A111111\r\n'
             )
         return
@@ -210 +210 @@
             result,
             'level,level_session,level_verdict,student_id\r\n'
-            ',,NY,\r\n'
+            ',,0,\r\n'
             )
         return

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

@@ -250 +250 @@
         student['studycourse'].current_session = new_session
         verdict = student['studycourse'].current_verdict
-        student['studycourse'].current_verdict = 'NY'
+        student['studycourse'].current_verdict = '0'
         student['studycourse'].previous_verdict = verdict
         return
@@ -412 +412 @@
 
     VERDICTS_DICT = {
-        'NY': _('(not yet)'),
+        '0': _('(not yet)'),
         'A': 'Successful student',
         'B': 'Student with carryover courses',