Changeset 14075

Timestamp:

13 Aug 2016, 03:23:04 (8 years ago)

Author:

Henrik Bettermann

Message:

Implement entry_session-dependent grading system.

Location:

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

Files:

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

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

@@ -31 +31 @@
     StudentStudyLevel, CourseTicket,
     CourseTicketFactory, StudentStudyLevelFactory)
-from waeup.kofa.students.interfaces import IStudentNavigation
+from waeup.kofa.students.interfaces import IStudentNavigation, ICourseTicket
 from waeup.aaue.students.interfaces import (
     ICustomStudentStudyLevel, ICustomCourseTicket)
 
 
-def getGradeWeightFromScore(score, ca):
+def getGradeWeightFromScore(score, ca, student):
     if None in (score, ca):
         return (None, None)
@@ -48 +48 @@
     if total >= 45:
         return ('D',2)
-    if total >= 40:
+    if total >= 40 and student.entry_session < 2013:
         return ('E',1)
     return ('F',0)
@@ -116 +116 @@
         return False
 
+    def addCourseTicket(self, ticket, course):
+        """Add a course ticket object.
+        """
+        if not ICourseTicket.providedBy(ticket):
+            raise TypeError(
+                'StudentStudyLeves contain only ICourseTicket instances')
+        ticket.code = course.code
+        ticket.title = course.title
+        ticket.fcode = course.__parent__.__parent__.__parent__.code
+        ticket.dcode = course.__parent__.__parent__.code
+        ticket.credits = course.credits
+        if self.student.entry_session < 2013:
+            ticket.passmark = course.passmark - 5
+        else:
+            ticket.passmark = course.passmark
+        ticket.semester = course.semester
+        self[ticket.code] = ticket
+        return
+
 CustomStudentStudyLevel = attrs_to_fields(
     CustomStudentStudyLevel, omit=[
@@ -147 +166 @@
         """Returns the grade calculated from score.
         """
-        return getGradeWeightFromScore(self.score, self.ca)[0]
+        return getGradeWeightFromScore(self.score, self.ca, self.student)[0]
 
     @property
@@ -153 +172 @@
         """Returns the weight calculated from score.
         """
-        return getGradeWeightFromScore(self.score, self.ca)[1]
+        return getGradeWeightFromScore(self.score, self.ca, self.student)[1]
 
 CustomCourseTicket = attrs_to_fields(CustomCourseTicket)

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

@@ -145 +145 @@
         # sgpa = 82 / 23
         self.assertEqual(self.student['studycourse']['100'].gpa_params[0], 3.565)
+        return
+
+    def test_grade_weight(self):
+        studylevel = createObject(u'waeup.StudentStudyLevel')
+        studylevel.level = 100
+        studylevel.level_session = 2005
+        self.student['studycourse'].entry_mode = 'ug_ft'
+        self.student['studycourse'].addStudentStudyLevel(
+            self.certificate, studylevel)
+        studylevel['COURSE1'].score = 42
+        studylevel['COURSE1'].ca = 0
+        courseticket = createObject('waeup.CourseTicket')
+        self.assertEqual(studylevel['COURSE1'].weight, 1)
+        self.assertEqual(studylevel['COURSE1'].grade, 'E')
+        self.student['studycourse'].entry_session = 2015
+        self.assertEqual(studylevel['COURSE1'].weight, 0)
+        self.assertEqual(studylevel['COURSE1'].grade, 'F')
+        studylevel['COURSE1'].score = 45
+        self.assertEqual(studylevel['COURSE1'].weight, 2)
+        self.assertEqual(studylevel['COURSE1'].grade, 'D')
         return