Changeset 14133 for main

Timestamp:

27 Aug 2016, 06:22:10 (8 years ago)

Author:

Henrik Bettermann

Message:

Add property attribute total_score in order to make provision
for additional scores (like contineous assessments) in custom
packages.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/students/browser.py (modified) (1 diff)
• src/waeup/kofa/students/interfaces.py (modified) (1 diff)
• src/waeup/kofa/students/studylevel.py (modified) (4 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.4.2.dev0 (unreleased)
 =======================
+
+* Add property attribute `total_score` in order to make provision
+  for additional scores (like contineous assessments) in custom
+  packages.
+
+* Make provision against storing other objects than applicant payments
+  in applicant containers.
 
 * Count mandates on configuration page and provide 'Purge' button.

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

@@ -1258 +1258 @@
                          (Term, 'semester', 1.5),
                          (Cred, 'credits', 1.5),
-                         (Score, 'score', 1.5),
+                         (Score, 'total_score', 1.5),
                          (Grade, 'grade', 1.5),
                          ]

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

@@ -612 +612 @@
     level_session = Attribute('Session of the study level the ticket has been added to')
     level = Attribute('Level value of the study level the ticket has been added to')
-    grade = Attribute('Grade calculated from score')
-    weight = Attribute('Weight calculated from score')
+    total_score = Attribute('Score')
+    grade = Attribute('Grade calculated from total score')
+    weight = Attribute('Weight calculated from total score')
     removable_by_student = Attribute('True if student is allowed to remove the ticket')
     editable_by_lecturer = Attribute('True if lecturer is allowed to edit the ticket')

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

@@ -114 +114 @@
         level_gpa = 0.0
         for ticket in self.values():
-            if ticket.carry_over is False and ticket.score:
-                if ticket.score < ticket.passmark:
+            if ticket.carry_over is False and ticket.total_score:
+                if ticket.total_score < ticket.passmark:
                     co_ticket = find_carry_over(ticket)
                     if co_ticket is not None and co_ticket.weight is not None:
@@ -135 +135 @@
         level_gpa = 0.0
         for ticket in self.values():
-            if ticket.score is not None:
+            if ticket.total_score is not None:
                 credits_counted += ticket.credits
                 credits_weighted += ticket.credits * ticket.weight
@@ -156 +156 @@
         credits_passed = 0
         for ticket in self.values():
-            if ticket.score is not None:
-                if ticket.score < ticket.passmark:
+            if ticket.total_score is not None:
+                if ticket.total_score < ticket.passmark:
                     failed += 1
                     credits_failed += ticket.credits
@@ -355 +355 @@
 
     @property
+    def total_score(self):
+        """Returns the total score of this ticket. In the base package
+        this is simply the score. In customized packages this could be
+        something else.
+        """
+        return self.score
+
+    @property
     def grade(self):
-        """Returns the grade calculated from score.
-        """
-        return getGradeWeightFromScore(self.score)[0]
+        """Returns the grade calculated from total score.
+        """
+        return getGradeWeightFromScore(self.total_score)[0]
 
     @property
     def weight(self):
-        """Returns the weight calculated from score.
-        """
-        return getGradeWeightFromScore(self.score)[1]
+        """Returns the weight calculated from total score.
+        """
+        return getGradeWeightFromScore(self.total_score)[1]
 
 CourseTicket = attrs_to_fields(CourseTicket)