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

Timestamp:

31 Jan 2017, 08:28:20 (8 years ago)

Author:

Henrik Bettermann

Message:

Use ticket.passmark for determining the grade.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/studylevel.py (modified) (4 diffs)

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

@@ -47 +47 @@
     return co_ticket
 
-def getGradeWeightFromScore(score, student):
+def getGradeWeightFromScore(score, ticket):
     """Nigerian Course Grading System
     """
@@ -60 +60 @@
     if score >= 45:
         return ('D',2)
-    if score >= 40 and student.entry_session < 2013:
+    if score >= ticket.passmark: # passmark changed in 2013 from 40 to 45
         return ('E',1)
     return ('F',0)
@@ -385 +385 @@
         """Returns the grade calculated from total score.
         """
-        return getGradeWeightFromScore(self.total_score, self.student)[0]
+        return getGradeWeightFromScore(self.total_score, self)[0]
 
     @property
@@ -391 +391 @@
         """Returns the weight calculated from total score.
         """
-        return getGradeWeightFromScore(self.total_score, self.student)[1]
+        return getGradeWeightFromScore(self.total_score, self)[1]
 
 CourseTicket = attrs_to_fields(CourseTicket)