Changeset 14362 for main

Timestamp:

22 Dec 2016, 20:22:28 (8 years ago)

Author:

Henrik Bettermann

Message:

Customize _display_gpa.

Location:

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

Files:

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

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

@@ -48 +48 @@
         return self.is_postgrad
 
+    def _display_gpa(self, gpa):
+        return int(100 * gpa) / 100.0
+
 CustomStudentStudyCourse = attrs_to_fields(CustomStudentStudyCourse)
 

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

@@ -60 +60 @@
         return total
 
+    def _display_gpa(self, gpa):
+        return int(100 * gpa) / 100.0
+
     @property
     def gpa_params(self):
@@ -72 +75 @@
                 credits_weighted += ticket.credits * ticket.weight
         if credits_counted:
-            level_gpa = round(credits_weighted/credits_counted, 3)
+            level_gpa = self._display_gpa(credits_weighted/credits_counted)
         # Override level_gpa if value has been imported
         imported_gpa = getattr(self, 'imported_gpa', None)

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

@@ -116 +116 @@
         # sgpa = 82 / 23
         self.assertEqual(
-            self.student['studycourse']['100'].gpa_params[0], 3.565)
+            self.student['studycourse']['100'].gpa_params[0], 3.56)
         # imported gpa values override calculated values
         studylevel.imported_gpa = 4.3
@@ -388 +388 @@
         self.assertEqual(self.browser.headers['Content-Type'],
                          'text/csv; charset=UTF-8')
-        self.assertEqual(self.browser.contents, 'matric_number,student_id,'
-            'level,code,level_session,ca,score\r\n234,E1000000,'
+        self.assertEqual(self.browser.contents, 'matric_number,student_id,display_fullname,'
+            'level,code,level_session,ca,score\r\n234,E1000000,"TESTER, Anna",'
             '100,COURSE1,2003,,55\r\n')
         self.browser.open(self.edit_prev_scores_url)
@@ -453 +453 @@
         self.assertEqual(td[0][1]['level'].level_session, 2006)
         self.assertEqual(td[0][1]['tickets_1'][0].code, 'ANYCODE')
-        self.assertEqual(td[1], 3.57)
+        self.assertEqual(td[1], 3.56)
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.student_path + '/studycourse/transcript')