Changeset 14531

Timestamp:

10 Feb 2017, 13:53:40 (8 years ago)

Author:

Henrik Bettermann

Message:

Move getGradeWeightFromScore into StudentStudyLevel? class in order to ease customization.

File:

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

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

@@ -47 +47 @@
     return co_ticket
 
-def getGradeWeightFromScore(score, ticket):
-    """Nigerian Course Grading System
-    """
-    if score == -1:
-        return ('-',0) # core course but result not yet available (used by AAUE)
-    if score is None:
-        return (None, None)
-    if score >= 70:
-        return ('A',5)
-    if score >= 60:
-        return ('B',4)
-    if score >= 50:
-        return ('C',3)
-    if score >= 45:
-        return ('D',2)
-    if score >= ticket.passmark: # passmark changed in 2013 from 40 to 45
-        return ('E',1)
-    return ('F',0)
-
 class StudentStudyLevel(grok.Container):
     """This is a container for course tickets.
@@ -384 +365 @@
 
     @property
+    def _getGradeWeightFromScore(self):
+        """Nigerian Course Grading System
+        """
+        if self.total_score is None:
+            return (None, None)
+        if self.total_score >= 70:
+            return ('A',5)
+        if self.total_score >= 60:
+            return ('B',4)
+        if self.total_score >= 50:
+            return ('C',3)
+        if self.total_score >= 45:
+            return ('D',2)
+        if self.total_score >= self.passmark: # passmark changed in 2013 from 40 to 45
+            return ('E',1)
+        return ('F',0)
+
+    @property
     def grade(self):
         """Returns the grade calculated from total score.
         """
-        return getGradeWeightFromScore(self.total_score, self)[0]
+        return self._getGradeWeightFromScore[0]
 
     @property
@@ -393 +392 @@
         """Returns the weight calculated from total score.
         """
-        return getGradeWeightFromScore(self.total_score, self)[1]
+        return self._getGradeWeightFromScore[1]
 
 CourseTicket = attrs_to_fields(CourseTicket)