Changeset 9688 for main/waeup.uniben/trunk/src/waeup

Timestamp:

19 Nov 2012, 18:19:35 (12 years ago)

Author:

Henrik Bettermann

Message:

Show GPA.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/students

Files:

• browser.py (modified) (1 diff)
• browser_templates/studyleveleditpage.pt (modified) (1 diff)
• browser_templates/studylevelpage.pt (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)

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

@@ -191 +191 @@
             self.redirect(self.url(self.context))
             return
-        if self.total_credits > self.max_credits:
+        if self.context.total_credits > self.max_credits:
             self.flash(_('Maximum credits of ${a} exceeded.',
                 mapping = {'a':self.max_credits}))

main/waeup.uniben/trunk/src/waeup/uniben/students/browser_templates/studyleveleditpage.pt

@@ -5 +5 @@
     Course Tickets
     (Total Credits:
-    <span i18n:name="total_credits" tal:replace="view/total_credits">TOTAL</span>)
+    <span i18n:name="total_credits"
+      tal:replace="view/context/total_credits">TOTAL</span>)
   </h3>
   <table class="display dataTableManage">

main/waeup.uniben/trunk/src/waeup/uniben/students/browser_templates/studylevelpage.pt

@@ -20 +20 @@
       </td>
       <td>
-        <span tal:replace="view/total_credits">TOTAL</span>
+        <span tal:replace="view/context/total_credits">TOTAL</span>
+      </td>
+    </tr>
+    <tr>
+      <td i18n:translate="">
+        Momentary GPA:
+      </td>
+      <td>
+        <span tal:replace="python: '%4.2f' % view.context.gpa">2.33</span>
       </td>
     </tr>

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

@@ -342 +342 @@
         # A level with one course ticket was created
         self.assertEqual(self.student['studycourse']['100'].number_of_tickets, 1)
+        self.student['studycourse']['100']['COURSE1'].score = 55
         self.browser.getLink("100").click()
+        # GPA has been properly calculated and is shown on the page
+        self.assertTrue('3.00' in self.browser.contents)
+        self.assertEqual(self.student['studycourse']['100'].gpa, 3.0)
+        # Score is not shown but grade
         self.assertTrue('<th>Grade</th>' in self.browser.contents)
         self.assertFalse('<th>Score</th>' in self.browser.contents)