Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py	(revision 14461)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py	(revision 14462)
@@ -42,4 +42,30 @@
                       (5, '1st Class Honours'))
 
+    def getClassFromCGPA(self, gpa, student):
+        if gpa < self.gpa_boundaries[0][0]:
+            # FRNS
+            return 0, self.gpa_boundaries[0][1]
+        if student.entry_session < 2013:
+            if gpa < self.gpa_boundaries[1][0]:
+                # Pass
+                return 1, self.gpa_boundaries[1][1]
+        else:
+            if gpa < self.gpa_boundaries[1][0]:
+                # FRNS (Pass degree has been phased out in 2013)
+                return 0, self.gpa_boundaries[0][1]
+        if gpa < self.gpa_boundaries[2][0]:
+            # 3rd
+            return 2, self.gpa_boundaries[2][1]
+        if gpa < self.gpa_boundaries[3][0]:
+            # 2nd L
+            return 3, self.gpa_boundaries[3][1]
+        if gpa < self.gpa_boundaries[4][0]:
+            # 2nd U
+            return 4, self.gpa_boundaries[4][1]
+        if gpa <= self.gpa_boundaries[5][0]:
+            # 1st
+            return 5, self.gpa_boundaries[5][1]
+        return 'N/A'
+
     def getDegreeClassNumber(self, level_obj):
         """Get degree class number (used for SessionResultsPresentation
@@ -62,5 +88,6 @@
                 return 0
         # use gpa_boundaries above
-        return self.getClassFromCGPA(level_obj.cumulative_params[0])[0]
+        return self.getClassFromCGPA(
+            level_obj.cumulative_params[0], level_obj.student)[0]
 
     def increaseMatricInteger(self, student):
