Changeset 14407 for main

Timestamp:

16 Jan 2017, 10:59:01 (8 years ago)

Author:

Henrik Bettermann

Message:

Use old grading system.

Location:

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students

Files:

• studylevel.py (modified) (2 diffs)
• tests/test_export.py (modified) (2 diffs)

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/studylevel.py

@@ -30 +30 @@
 from kofacustom.coewarri.students.interfaces import (
     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)
 
 
@@ -64 +79 @@
     grok.provides(ICustomCourseTicket)
 
+    @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/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/tests/test_export.py

@@ -4 +4 @@
 from waeup.kofa.interfaces import ICSVExporter
 from waeup.kofa.schoolgrades import ResultEntry
-from waeup.kofa.students.tests.test_batching import StudentImportExportSetup
+from waeup.kofa.students.tests.test_batching import (
+    StudentImportExportSetup, curr_year)
 from kofacustom.coewarri.utils.utils import CustomKofaUtils
 from kofacustom.coewarri.students.export import (
@@ -107 +108 @@
             'r_pay_reference,thirdparty_amt,student_id,state,'
             'current_session\r\n'
-            '666,12.12,2012-04-01 13:12:01#,,schoolfee,1,my-id,p-item,'
-            '100,2012,paid,2012-04-01 14:12:01#,,12.12,'
-            '789,r-code,interswatch,,,,A111111,created,2012\r\n',
-            result
+            '666,12.12,%s-04-01 13:12:01#,,schoolfee,1,my-id,p-item,'
+            '100,%s,paid,%s-04-01 14:12:01#,,12.12,'
+            '789,r-code,interswatch,,,,A111111,created,2012\r\n'
+            % (curr_year-6, curr_year-6, curr_year-6), result
             )
         return