Changeset 14354

Timestamp:

16 Dec 2016, 17:36:07 (8 years ago)

Author:

Henrik Bettermann

Message:

getGradeWeightFromScore is now the same in the base package.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

• browser.py (modified) (2 diffs)
• studylevel.py (modified) (2 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/students/browser.py

@@ -33 +33 @@
     IStudentsUtils, IStudent, IStudentRequestPW)
 from waeup.kofa.students.workflow import PAID, REGISTERED, RETURNING
+from waeup.kofa.students.studylevel import getGradeWeightFromScore
 from waeup.kofa.students.browser import (
     StartClearancePage,
@@ -80 +81 @@
     ICustomCourseTicket,
     ICustomStudentBase)
-from waeup.aaue.students.studylevel import getGradeWeightFromScore
 from waeup.aaue.interswitch.browser import gateway_net_amt
 from waeup.aaue.interfaces import MessageFactory as _

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

@@ -38 +38 @@
 
 
-def getGradeWeightFromScore(total, student):
-    if total is None:
-        return (None, None)
-    if total >= 70:
-        return ('A',5)
-    if total >= 60:
-        return ('B',4)
-    if total >= 50:
-        return ('C',3)
-    if total >= 45:
-        return ('D',2)
-    if total >= 40 and student.entry_session < 2013:
-        return ('E',1)
-    return ('F',0)
-
-
 class CustomStudentStudyLevel(StudentStudyLevel):
     """This is a container for course tickets.
@@ -304 +288 @@
 
     @property
-    def grade(self):
-        """Returns the grade calculated from score.
-        """
-        return getGradeWeightFromScore(self.total_score, self.student)[0]
-
-    @property
-    def weight(self):
-        """Returns the weight calculated from score.
-        """
-        return getGradeWeightFromScore(self.total_score, self.student)[1]
-
-    @property
     def total_score(self):
         """Returns ca + score.