Changeset 10277

Timestamp:

5 Jun 2013, 09:07:33 (12 years ago)

Author:

Henrik Bettermann

Message:

Use carry over tickets in next level for GPA calculation. Ignore carry over tickets in current level.

Location:

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

Files:

• studylevel.py (modified) (1 diff)
• tests/test_browser.py (modified) (2 diffs)

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

@@ -31 +31 @@
 
 def find_carry_over(ticket):
-    return None
+    studylevel = ticket.__parent__
+    studycourse = ticket.__parent__.__parent__
+    levels = sorted(studycourse.keys())
+    index = levels.index(str(studylevel.level))
+    try:
+        next_level = levels[index+1]
+    except IndexError:
+        return None
+    next_studylevel = studycourse[next_level]
+    co_ticket = next_studylevel.get(ticket.code, None)
+    return co_ticket
 
 def getGradeWeightFromScore(score):

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

@@ -819 +819 @@
         self.assertTrue(
             self.student['studycourse']['200']['COURSE1'].carry_over)
+        return
+
+    def test_gpa_calculation_with_carryover(self):
+        studylevel = createObject(u'waeup.StudentStudyLevel')
+        studylevel.level = 100
+        studylevel.level_session = 2005
+        self.student['studycourse'].entry_mode = 'ug_ft'
+        self.student['studycourse'].addStudentStudyLevel(
+            self.certificate, studylevel)
+        # First course has been added automatically.
+        # Set score above passmark.
+        studylevel['COURSE1'].score = studylevel['COURSE1'].passmark + 1
+        # GPA is 1.
+        self.assertEqual(self.student['studycourse']['100'].gpa_params[0], 1.0)
+        # Set score below passmark.
+        studylevel['COURSE1'].score = studylevel['COURSE1'].passmark - 1
+        # GPA is still 0.
+        self.assertEqual(self.student['studycourse']['100'].gpa_params[0], 0.0)
+        studylevel2 = createObject(u'waeup.StudentStudyLevel')
+        studylevel2.level = 200
+        studylevel2.level_session = 2006
+        self.student['studycourse'].addStudentStudyLevel(
+            self.certificate, studylevel2)
+        # Carry-over course has been autonatically added.
+        studylevel2['COURSE1'].score = 66
+        # The score of the carry-over course is now used for calculation of the
+        # GPA at level 100 ...
+        self.assertEqual(self.student['studycourse']['100'].gpa_params[0], 4.0)
+        # ... but not at level 200
+        self.assertEqual(self.student['studycourse']['200'].gpa_params[0], 0.0)
         return
 
@@ -1816 +1846 @@
             'temp_password generated: %s' % temp_password in logcontent)
 
-    def test_transcrtipts(self):
-        self.student.date_of_birth = date(1981, 2, 4)
+    def test_transcripts(self):
         studylevel = createObject(u'waeup.StudentStudyLevel')
         studylevel.level = 100