Changeset 9761

Timestamp:

3 Dec 2012, 06:34:58 (12 years ago)

Author:

Henrik Bettermann

Message:

Show entry_sesssion in export. Show only level_session to ease post-processing with Excel.

Location:

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

Files:

• export.py (modified) (2 diffs)
• interfaces.py (modified) (1 diff)
• student.py (modified) (1 diff)
• tests/test_export.py (modified) (2 diffs)

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

@@ -405 +405 @@
     fields = ('student_id', ) + (
         'state', 'certcode', 'faccode', 'depcode', 'is_postgrad',
-        'current_level', 'current_session',
+        'entry_session', 'current_level', 'current_session',
         ) + level_range_tuple
 
@@ -416 +416 @@
             for level in context['studycourse'].values():
                 if level.level == int(name):
-                    value = '%s|%s|%s|%s' % (
-                        level.level_session,
-                        len(level),
-                        level.validated_by,
-                        level.level_verdict)
+                    #value = '%s|%s|%s|%s' % (
+                    #    level.level_session,
+                    #    len(level),
+                    #    level.validated_by,
+                    #    level.level_verdict)
+                    value = '%s' % level.level_session
                     break
         return super(

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

@@ -155 +155 @@
     depcode = Attribute('The department code of any chosen study course')
     faccode = Attribute('The faculty code of any chosen study course')
+    entry_session = Attribute('The entry session of the student')
     current_session = Attribute('The current session of the student')
     current_level = Attribute('The current level of the student')

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

@@ -167 +167 @@
 
     @property
+    def entry_session(self):
+        session = getattr(
+            self.get('studycourse', None), 'entry_session', None)
+        return session
+
+    @property
     def current_level(self):
         level = getattr(

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

@@ -672 +672 @@
         self.assertEqual(
              'student_id,state,certcode,faccode,depcode,is_postgrad,'
-             'current_level,current_session,'
+             'entry_session,current_level,current_session,'
              '10,100,110,120,200,210,220,300,310,320,400,410,420,500,'
              '510,520,600,610,620,700,710,720,800,810,820,900,910,920,999\r\n'
-             'A111111,created,CERT1,NA,NA,0,200,2012,,2012|1|None|A'
+             'A111111,created,CERT1,NA,NA,0,2010,200,2012,,2012'
              ',,,,,,,,,,,,,,,,,,,,,,,,,,,\r\n',
             result
@@ -688 +688 @@
         self.assertEqual(
             'student_id,state,certcode,faccode,depcode,is_postgrad,'
-            'current_level,current_session,'
+            'entry_session,current_level,current_session,'
             '10,100,110,120,200,210,220,300,310,320,400,410,420,500,'
             '510,520,600,610,620,700,710,720,800,810,820,900,910,920,999\r\n'
-            'A111111,created,CERT1,NA,NA,0,200,2012,,2012|1|None|A'
+            'A111111,created,CERT1,NA,NA,0,2010,200,2012,,2012'
             ',,,,,,,,,,,,,,,,,,,,,,,,,,,\r\n',
             result