Changeset 10260 for main

Timestamp:

31 May 2013, 05:21:11 (11 years ago)

Author:

Henrik Bettermann

Message:

Calculate sessional gpa.

Location:

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

Files:

• studycourse.py (modified) (4 diffs)
• tests/test_browser.py (modified) (1 diff)

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

@@ -126 +126 @@
         """
         levels = []
-        gpa = 0.0
-        credits_counted = 0
+        cgpa = 0.0
+        total_credits_counted = 0
         for level_key, level_val in self.items():
             tickets_1 = []
@@ -133 +133 @@
             tickets_3 = []
             tickets = sorted(level_val.values(), key=lambda ticket: ticket.code)
+            sgpa = 0.0
+            session_credits_counted = 0
             for ticket in tickets:
                 if ticket.semester == 1:
@@ -141 +143 @@
                     tickets_3.append(ticket)
                 if ticket.score:
-                    credits_counted += ticket.credits
-                    gpa += ticket.credits * ticket.weight
+                    total_credits_counted += ticket.credits
+                    session_credits_counted += ticket.credits
+                    cgpa += ticket.credits * ticket.weight
+                    sgpa += ticket.credits * ticket.weight
+            if session_credits_counted:
+                sgpa = round(sgpa/session_credits_counted, 2)
             levels.append(
                 dict(level_key=level_key,
@@ -148 +154 @@
                      tickets_1=tickets_1,
                      tickets_2=tickets_2,
-                     tickets_3=tickets_3))
-        if credits_counted:
-            gpa = round(gpa/credits_counted, 2)
-        return sorted(levels, key=lambda level: level['level_key']), gpa
+                     tickets_3=tickets_3,
+                     sgpa=sgpa))
+        if total_credits_counted:
+            cgpa = round(cgpa/total_credits_counted, 2)
+        return sorted(levels, key=lambda level: level['level_key']), cgpa
 
 StudentStudyCourse = attrs_to_fields(StudentStudyCourse)

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

@@ -1835 +1835 @@
         td = self.student['studycourse'].getTranscriptData()
         self.assertEqual(td[0][0]['level_key'], '100')
+        self.assertEqual(td[0][0]['sgpa'], 3.57)
         self.assertEqual(td[0][0]['level'].level, 100)
         self.assertEqual(td[0][0]['level'].level_session, 2005)