Index: main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/studylevel.py
===================================================================
--- main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/studylevel.py	(revision 18318)
+++ main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/studylevel.py	(revision 18319)
@@ -57,39 +57,25 @@
 
     @property
-    def cumulative_params(self):
-        """Calculate the cumulative gpa and other cumulative parameters
-        for this level.
-        All levels below this level are taken under consideration
-        (including repeating levels).
-        This method is used for level reports and meanwhile also
-        for session results presentations.
+    def gpa_params(self):
+        """Calculate gpa parameters for this level.
         """
-        credits_passed = 0
-        total_credits = 0
-        total_credits_counted = 0
-        total_credits_weighted = 0
-        cgpa = 0.0
-        if self.__parent__:
-            for level in self.__parent__.values():
-                if level.level > self.level:
-                    continue
-                credits_passed += level.passed_params[2]
-                total_credits += level.total_credits
-                gpa_params = level.gpa_params
-                total_credits_counted += gpa_params[1]
-                total_credits_weighted += gpa_params[2]
-            if total_credits_counted:
-                cgpa = total_credits_weighted/total_credits_counted
-
-            # Unidel special
-            # the ticket is still open
-
-            # Override cgpa if value has been imported
-            # (not implemented in base package)
-            imported_cgpa = getattr(self, 'imported_cgpa', None)
-            if imported_cgpa:
-                cgpa = imported_cgpa
-        return (cgpa, total_credits_counted, total_credits_weighted,
-               total_credits, credits_passed)
+        credits_weighted = 0.0
+        credits_counted = 0
+        level_gpa = 0.0
+        for ticket in self.values():
+            if ticket.total_score is not None:
+                credits_counted += ticket.credits
+                credits_weighted += ticket.credits * ticket.weight
+        if credits_counted:
+            level_gpa = credits_weighted/credits_counted
+        # Override level_gpa if value has been imported
+        imported_gpa = getattr(self, 'imported_gpa', None)
+        if imported_gpa:
+            level_gpa = imported_gpa
+        return level_gpa, credits_counted, credits_weighted
+
+    @property
+    def gpa_params_rectified(self):
+        return self.gpa_params
 
     @property
