Changeset 10276 for main/waeup.kofa/trunk/src/waeup/kofa/students/tests

Timestamp:

5 Jun 2013, 08:02:29 (12 years ago)

Author:

Henrik Bettermann

Message:

Remove gpa field. The GPA must not be an attribute of the level. It contains also information on carry over courses of following levels. Thus it can only be reliably calculated at the end of a study course, e.g. in transcripts.

Location:

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

Files:

• test_browser.py (modified) (3 diffs)
• test_export.py (modified) (5 diffs)

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

@@ -785 +785 @@
         self.assertEqual(self.student['studycourse']['100']['COURSE1'].grade, 'C')
         self.assertEqual(self.student['studycourse']['100']['COURSE1'].weight, 3)
-        # We add another ticket to check if GPA will be correctly calculated
+        # We add another ticket to check if GPAwill be correctly calculated
         # (and rounded)
         courseticket = createObject('waeup.CourseTicket')
@@ -797 +797 @@
         self.student['studycourse']['100']['COURSE2'] = courseticket
         self.browser.open(self.student_path + '/studycourse/100')
-        self.assertTrue('<div>3.57</div>' in self.browser.contents)
-        self.assertEqual(self.student['studycourse']['100'].gpa, 3.57)
+        # total credits
+        self.assertEqual(self.student['studycourse']['100'].gpa_params[1], 23)
+        # weigheted credits = 3 * 10 + 4 * 13
+        self.assertEqual(self.student['studycourse']['100'].gpa_params[2], 82.0)
+        # sgpa = 82 / 23
+        self.assertEqual(self.student['studycourse']['100'].gpa_params[0], 3.57)
         # Carry-over courses will be collected when next level is created
         self.browser.open(self.student_path + '/studycourse/manage')
@@ -1836 +1840 @@
         self.student['studycourse']['110']['COURSE2'] = courseticket
         self.student['studycourse']['100']['COURSE1'].score = 55
-        self.assertEqual(self.student['studycourse']['100'].gpa, 3.0)
-        self.assertEqual(self.student['studycourse']['110'].gpa, 4.0)
+        self.assertEqual(self.student['studycourse']['100'].gpa_params[0], 3.0)
+        self.assertEqual(self.student['studycourse']['110'].gpa_params[0], 4.0)
         # Get transcript data
         td = self.student['studycourse'].getTranscriptData()

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

@@ -402 +402 @@
         self.assertEqual(
             result,
-            'gpa,level,level_session,level_verdict,total_credits,'
+            'level,level_session,level_verdict,total_credits,'
             'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '0.0,,,0,0,,,,0,\r\n'
+            ',,0,0,,,,0,\r\n'
             )
         return
@@ -420 +420 @@
         self.assertEqual(
             result,
-            'gpa,level,level_session,level_verdict,total_credits,'
+            'level,level_session,level_verdict,total_credits,'
             'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '0.0,100,2012,A,100,,,A111111,1,CERT1\r\n'
+            '100,2012,A,100,,,A111111,1,CERT1\r\n'
             )
         return
@@ -436 +436 @@
         self.assertEqual(
             result,
-            'gpa,level,level_session,level_verdict,total_credits,'
+            'level,level_session,level_verdict,total_credits,'
             'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '0.0,100,2012,A,100,,,A111111,1,CERT1\r\n'
+            '100,2012,A,100,,,A111111,1,CERT1\r\n'
             )
         return
@@ -451 +451 @@
         self.assertEqual(
             result,
-            'gpa,level,level_session,level_verdict,total_credits,'
+            'level,level_session,level_verdict,total_credits,'
             'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '0.0,100,2012,A,100,,,A111111,1,CERT1\r\n'
+            '100,2012,A,100,,,A111111,1,CERT1\r\n'
             )
         return
@@ -470 +470 @@
         self.assertEqual(
             result,
-            'gpa,level,level_session,level_verdict,total_credits,'
+            'level,level_session,level_verdict,total_credits,'
             'validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '0.0,100,2012,A,100,,,A111111,1,CERT1\r\n'
+            '100,2012,A,100,,,A111111,1,CERT1\r\n'
             )
         return