Changeset 9812 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

20 Dec 2012, 06:59:26 (12 years ago)

Author:

Henrik Bettermann

Message:

Round gpa.

Location:

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

Files:

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

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

@@ -82 +82 @@
     @property
     def gpa(self):
-        gpa = 0
+        gpa = 0.0
         credits_counted = 0
         for ticket in self.values():
@@ -89 +89 @@
                 gpa += ticket.credits * ticket.weight
         if credits_counted:
-            gpa = 100*gpa/credits_counted
-        return float(gpa)/100
+            gpa = round(gpa/credits_counted, 2)
+        return gpa
 
     @property

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

@@ -764 +764 @@
         self.browser.getLink("COURSE1").click()
         self.browser.getLink("Manage").click()
-        #self.browser.getControl(name="form.score").value = '10'
         self.browser.getControl("Save").click()
         self.assertTrue('Form has been saved' in self.browser.contents)
@@ -777 +776 @@
         self.assertEqual(self.student['studycourse']['100']['COURSE1'].grade, 'C')
         self.assertEqual(self.student['studycourse']['100']['COURSE1'].weight, 3)
-        # GPA has been properly calculated and is shown on the page
+        # We add another ticket to check if GPA will be correctly calculated
+        # (and rounded)
+        courseticket = createObject('waeup.CourseTicket')
+        courseticket.code = 'ANYCODE'
+        courseticket.title = u'Any TITLE'
+        courseticket.credits = 13
+        courseticket.score = 66
+        courseticket.semester = 1
+        courseticket.dcode = u'ANYDCODE'
+        courseticket.fcode = u'ANYFCODE'
+        self.student['studycourse']['100']['COURSE2'] = courseticket
         self.browser.open(self.student_path + '/studycourse/100')
-        self.assertTrue('3.0' in self.browser.contents)
-        self.assertEqual(self.student['studycourse']['100'].gpa, 3.0)
+        self.assertTrue('<div>3.57</div>' in self.browser.contents)
+        self.assertEqual(self.student['studycourse']['100'].gpa, 3.57)
         # Carry-over courses will be collected when next level is created
         self.browser.open(self.student_path + '/studycourse/manage')