Changeset 9253 for main

Timestamp:

28 Sep 2012, 09:56:23 (12 years ago)

Author:

Henrik Bettermann

Message:

Export always certcode which is very helpful for offline data evaluation. Also add current_level, current_session and is_postgrad to StudentExporter?.

Location:

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

Files:

• export.py (modified) (3 diffs)
• interfaces.py (modified) (2 diffs)
• studylevel.py (modified) (2 diffs)
• tests/test_export.py (modified) (11 diffs)

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

@@ -105 +105 @@
     fields = tuple(sorted(iface_names(
         IStudent, omit=['loggerInfo']))) + (
-        'password', 'state', 'history', 'certcode')
+        'password', 'state', 'history', 'certcode', 'is_postgrad',
+        'current_level', 'current_session')
 
     #: The title under which this exporter will be displayed
@@ -176 +177 @@
     #: Fieldnames considered by this exporter
     fields = tuple(sorted(iface_names(
-        IStudentStudyLevel) + ['level'])) + ('student_id', 'number_of_tickets')
+        IStudentStudyLevel) + ['level'])) + (
+        'student_id', 'number_of_tickets','certcode')
 
     #: The title under which this exporter will be displayed
@@ -209 +211 @@
     fields = tuple(sorted(iface_names(ICourseTicket) +
         ['level', 'code', 'title', 'credits',
-        'passmark', 'semester', 'fcode', 'dcode'])) + ('student_id',)
+        'passmark', 'semester', 'fcode', 'dcode'])) + ('student_id', 'certcode')
 
     #: The title under which this exporter will be displayed

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

@@ -429 +429 @@
     level = Attribute('The level code')
     number_of_tickets = Attribute('Number of tickets contained in this level')
+    certcode = Attribute('The certificate code of the study course')
 
     level_session = schema.Choice(
@@ -470 +471 @@
     fcode = Attribute('faculty code of the original course')
     dcode = Attribute('department code of the original course')
+    certcode = Attribute('certificate code of the study course')
 
     mandatory = schema.Bool(

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

@@ -43 +43 @@
         try:
             return self.__parent__.__parent__
+        except AttributeError:
+            return None
+
+    @property
+    def certcode(self):
+        try:
+            return self.__parent__.certificate.code
         except AttributeError:
             return None
@@ -124 +131 @@
             return None
 
+    @property
+    def certcode(self):
+        try:
+            return self.__parent__.__parent__.certificate.code
+        except AttributeError:
+            return None
+
     def writeLogMessage(self, view, message):
         return self.__parent__.__parent__.__parent__.writeLogMessage(view, message)

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

@@ -45 +45 @@
             'firstname,lastname,matric_number,middlename,nationality,'
             'perm_address,phone,reg_number,sex,student_id,suspended,password,'
-            'state,history,certcode\r\n'
+            'state,history,certcode,is_postgrad,current_level,current_session\r\n'
 
             'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
@@ -65 +65 @@
             'firstname,lastname,matric_number,middlename,nationality,'
             'perm_address,phone,reg_number,sex,student_id,suspended,password,'
-            'state,history,certcode\r\n'
+            'state,history,certcode,is_postgrad,current_level,current_session\r\n'
 
             'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
@@ -84 +84 @@
             'firstname,lastname,matric_number,middlename,nationality,'
             'perm_address,phone,reg_number,sex,student_id,suspended,password,'
-            'state,history,certcode\r\n'
+            'state,history,certcode,is_postgrad,current_level,current_session\r\n'
 
             'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
@@ -210 +210 @@
             result,
             'level,level_session,level_verdict,validated_by,validation_date,'
-            'student_id,number_of_tickets\r\n'
-            ',,0,,,,0\r\n'
+            'student_id,number_of_tickets,certcode\r\n'
+            ',,0,,,,0,\r\n'
             )
         return
@@ -227 +227 @@
             result,
             'level,level_session,level_verdict,validated_by,validation_date,'
-            'student_id,number_of_tickets\r\n'
-            '100,2012,A,,,A111111,1\r\n'
+            'student_id,number_of_tickets,certcode\r\n'
+            '100,2012,A,,,A111111,1,CERT1\r\n'
             )
         return
@@ -242 +242 @@
             result,
             'level,level_session,level_verdict,validated_by,validation_date,'
-            'student_id,number_of_tickets\r\n'
-            '100,2012,A,,,A111111,1\r\n'
+            'student_id,number_of_tickets,certcode\r\n'
+            '100,2012,A,,,A111111,1,CERT1\r\n'
             )
         return
@@ -256 +256 @@
             result,
             'level,level_session,level_verdict,validated_by,validation_date,'
-            'student_id,number_of_tickets\r\n'
-            '100,2012,A,,,A111111,1\r\n'
+            'student_id,number_of_tickets,certcode\r\n'
+            '100,2012,A,,,A111111,1,CERT1\r\n'
             )
         return
@@ -292 +292 @@
             result,
             'automatic,carry_over,code,credits,dcode,fcode,level,mandatory,'
-            'passmark,score,semester,title,student_id\r\n'
-            '0,0,,,,,,0,,0,,,\r\n'
+            'passmark,score,semester,title,student_id,certcode\r\n'
+            '0,0,,,,,,0,,0,,,,\r\n'
             )
         return
@@ -310 +310 @@
             result,
             'automatic,carry_over,code,credits,dcode,fcode,level,mandatory,'
-            'passmark,score,semester,title,student_id\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,100,0,100,0,2,Course 1,A111111\r\n'
+            'passmark,score,semester,title,student_id,certcode\r\n'
+            '1,1,CRS1,100,DEP1,FAC1,100,0,100,0,2,Course 1,A111111,CERT1\r\n'
             )
         return
@@ -325 +325 @@
             result,
             'automatic,carry_over,code,credits,dcode,fcode,level,mandatory,'
-            'passmark,score,semester,title,student_id\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,100,0,100,0,2,Course 1,A111111\r\n'
+            'passmark,score,semester,title,student_id,certcode\r\n'
+            '1,1,CRS1,100,DEP1,FAC1,100,0,100,0,2,Course 1,A111111,CERT1\r\n'
             )
         return
@@ -339 +339 @@
             result,
             'automatic,carry_over,code,credits,dcode,fcode,level,mandatory,'
-            'passmark,score,semester,title,student_id\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,100,0,100,0,2,Course 1,A111111\r\n'
+            'passmark,score,semester,title,student_id,certcode\r\n'
+            '1,1,CRS1,100,DEP1,FAC1,100,0,100,0,2,Course 1,A111111,CERT1\r\n'
             )
         return