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

Timestamp:

12 Mar 2014, 22:14:18 (11 years ago)

Author:

Henrik Bettermann

Message:

Add display_fullname column to CourseTicketExporter? (requested by Uniben).

Location:

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

Files:

• export.py (modified) (2 diffs)
• tests/test_export.py (modified) (8 diffs)

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

@@ -275 +275 @@
     #: Fieldnames considered by this exporter
     fields = tuple(sorted(iface_names(ICourseTicket) +
-        ['level', 'code', 'level_session'])) + ('student_id', 'certcode')
+        ['level', 'code', 'level_session'])) + ('student_id',
+        'certcode', 'display_fullname')
 
     #: The title under which this exporter will be displayed
@@ -288 +289 @@
         if context is not None:
             student = context.student
-            if name == 'student_id' and student is not None:
+            if name in ('student_id', 'display_fullname') and student is not None:
                 value = getattr(student, name, None)
-            if name == 'level':
-                value = getattr(context, 'level', lambda: None)
-            if name == 'level_session':
-                value = getattr(context, 'level_session', lambda: None)
+            #if name == 'level':
+            #    value = getattr(context, 'level', lambda: None)
+            #if name == 'level_session':
+            #    value = getattr(context, 'level_session', lambda: None)
         return super(
             CourseTicketExporter, self).mangle_value(

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

@@ -525 +525 @@
             result,
             'automatic,carry_over,code,credits,dcode,fcode,level,level_session,'
-            'mandatory,passmark,score,semester,title,student_id,certcode\r\n'
-            '0,0,,,,,,,0,,,,,,\r\n'
+            'mandatory,passmark,score,semester,title,student_id,certcode,'
+            'display_fullname\r\n'
+            '0,0,,,,,,,0,,,,,,,\r\n'
             )
         return
@@ -543 +544 @@
             result,
             'automatic,carry_over,code,credits,dcode,fcode,level,level_session,'
-            'mandatory,passmark,score,semester,title,student_id,certcode\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,100,2012,0,100,,2,Course 1,A111111,CERT1\r\n'
+            'mandatory,passmark,score,semester,title,student_id,certcode,'
+            'display_fullname\r\n'
+            '1,1,CRS1,100,DEP1,FAC1,100,2012,0,100,,2,Course 1,A111111,CERT1,'
+            'Anna M. Tester\r\n'
             )
         return
@@ -558 +561 @@
             result,
             'automatic,carry_over,code,credits,dcode,fcode,level,level_session,'
-            'mandatory,passmark,score,semester,title,student_id,certcode\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,100,2012,0,100,,2,Course 1,A111111,CERT1\r\n'
+            'mandatory,passmark,score,semester,title,student_id,certcode,'
+            'display_fullname\r\n'
+            '1,1,CRS1,100,DEP1,FAC1,100,2012,0,100,,2,Course 1,A111111,CERT1,'
+            'Anna M. Tester\r\n'
             )
         return
@@ -572 +577 @@
             result,
             'automatic,carry_over,code,credits,dcode,fcode,level,level_session,'
-            'mandatory,passmark,score,semester,title,student_id,certcode\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,100,2012,0,100,,2,Course 1,A111111,CERT1\r\n'
+            'mandatory,passmark,score,semester,title,student_id,certcode,'
+            'display_fullname\r\n'
+            '1,1,CRS1,100,DEP1,FAC1,100,2012,0,100,,2,Course 1,A111111,CERT1,'
+            'Anna M. Tester\r\n'
             )
         return
@@ -590 +597 @@
             result,
             'automatic,carry_over,code,credits,dcode,fcode,level,level_session,'
-            'mandatory,passmark,score,semester,title,student_id,certcode\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,100,2012,0,100,,2,Course 1,A111111,CERT1\r\n'
+            'mandatory,passmark,score,semester,title,student_id,certcode,'
+            'display_fullname\r\n'
+            '1,1,CRS1,100,DEP1,FAC1,100,2012,0,100,,2,Course 1,A111111,CERT1,'
+            'Anna M. Tester\r\n'
             )
         # if the coursetickets catalog is used to filter students
@@ -602 +611 @@
             result,
             'automatic,carry_over,code,credits,dcode,fcode,level,level_session,'
-            'mandatory,passmark,score,semester,title,student_id,certcode\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,100,2012,0,100,,2,Course 1,A111111,CERT1\r\n'
+            'mandatory,passmark,score,semester,title,student_id,certcode,'
+            'display_fullname\r\n'
+            '1,1,CRS1,100,DEP1,FAC1,100,2012,0,100,,2,Course 1,A111111,CERT1,'
+            'Anna M. Tester\r\n'
             )
         exporter.export_filtered(
@@ -611 +622 @@
             result,
             'automatic,carry_over,code,credits,dcode,fcode,level,level_session,'
-            'mandatory,passmark,score,semester,title,student_id,certcode\r\n'
+            'mandatory,passmark,score,semester,title,student_id,certcode,'
+            'display_fullname\r\n'
             )
         # Also tickets in probating levels are exported. Therefore
@@ -623 +635 @@
             result,
             'automatic,carry_over,code,credits,dcode,fcode,level,level_session,'
-            'mandatory,passmark,score,semester,title,student_id,certcode\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,110,2012,0,100,,2,Course 1,A111111,CERT1\r\n'
+            'mandatory,passmark,score,semester,title,student_id,certcode,'
+            'display_fullname\r\n'
+            '1,1,CRS1,100,DEP1,FAC1,110,2012,0,100,,2,Course 1,A111111,CERT1,'
+            'Anna M. Tester\r\n'
             )
         return