Changeset 14406 for main

Timestamp:

16 Jan 2017, 10:52:15 (8 years ago)

Author:

Henrik Bettermann

Message:

Use old grading system.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene/students

Files:

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

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

@@ -31 +31 @@
     ICustomStudentStudyLevel, ICustomCourseTicket)
 
+def getGradeWeightFromScore(score):
+    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 >= 40:
+        return ('E',1)
+    return ('F',0)
 
 class CustomStudentStudyLevel(StudentStudyLevel):
@@ -68 +82 @@
         return True
 
+    @property
+    def grade(self):
+        """Returns the grade calculated from total score.
+        """
+        return getGradeWeightFromScore(self.total_score, self.student)[0]
+
+    @property
+    def weight(self):
+        """Returns the weight calculated from total score.
+        """
+        return getGradeWeightFromScore(self.total_score, self.student)[1]
+
 CustomCourseTicket = attrs_to_fields(CustomCourseTicket)
 

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

@@ -248 +248 @@
         self.certificate.study_mode = 'ug_ft'
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
-        self.assertEqual(payment.amount_auth,  61300.0)
+        self.assertEqual(payment.amount_auth,  56300.0)
         self.assertEqual(error, None)
         # UG cleared students pay 65650