Changeset 14415 for main

Timestamp:

17 Jan 2017, 13:54:55 (8 years ago)

Author:

Henrik Bettermann

Message:

Next trial.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

• studylevel.py (modified) (3 diffs)
• utils.py (modified) (1 diff)

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

@@ -172 +172 @@
     @property
     def remark(self):
-        if self.gpa_params[1] == 0:
-            # No credits weighted at this level
-            return 'FRNS'
-        if self.level_verdict == 'FRNS':
-            return 'FRNS'
         certificate = getattr(self.__parent__,'certificate',None)
         end_level = getattr(certificate, 'end_level', None)
@@ -184 +179 @@
         # final level student remark
         if end_level and self.level >= end_level:
+            if self.gpa_params[1] == 0:
+                # No credits weighted at this level
+                return 'FRNS'
+            if self.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
+                return self.level_verdict
             if '_m' in self.passed_params[4]:
                 return 'FRNS'
@@ -202 +202 @@
             return 'N/A'
         # returning student remark
+        if self.gpa_params[1] == 0:
+            # No credits weighted at this level
+            return 'Probation'
+        if self.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
+            return 'Probation'
         if self.cumulative_params[0] < failed_limit:
             return 'Probation'

main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py

@@ -43 +43 @@
 
     def getDegreeClassNumber(self, level_obj):
+        """Get degree class number (used for SessionResultsPresentation
+        reports).
+        """
         if level_obj.gpa_params[1] == 0:
             # No credits weighted
             return 0
-        if level_obj.level_verdict == 'FRNS':
+        if level_obj.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
             return 0
         certificate = getattr(level_obj.__parent__,'certificate',None)