Changeset 14161 for main

Timestamp:

5 Sep 2016, 08:42:20 (8 years ago)

Author:

Henrik Bettermann

Message:

Remove deprecated final_remark method.

Rework remark method.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py (modified) (1 diff)

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

@@ -131 +131 @@
     @property
     def remark(self):
+        certificate = getattr(self.__parent__,'certificate',None)
+        end_level = getattr(certificate, 'end_level', None)
+        # final student remark
+        if end_level and self.student.current_level >= end_level:
+            failed_courses = self.passed_params[4]
+            if '_m' in failed_courses:
+                return 'FRNS'
+            if self.cumulative_params[0] < 1.5:
+                return 'Fail'
+            if self.cumulative_params[0] < 2.4:
+                return '3rd'
+            if self.cumulative_params[0] < 3.5:
+                return '2nd Lower'
+            if self.cumulative_params[0] < 4.5:
+                return '2nd Upper'
+            if self.cumulative_params[0] < 5.1:
+                return '1st'
+            return 'N/A'
+        # returning student remark
         if self.cumulative_params[0] < 1.5:
             return 'Probation'
         if self.cumulative_params[0] < 5.1:
             return 'Proceed'
-        return 'N/A'
-
-    # only AAUE
-    @property
-    def final_remark(self):
-        if self.cumulative_params[0] < 1.5:
-            return 'Fail'
-        if self.cumulative_params[0] < 2.4:
-            return '3rd'
-        if self.cumulative_params[0] < 3.5:
-            return '2nd Lower'
-        if self.cumulative_params[0] < 4.5:
-            return '2nd Upper'
-        if self.cumulative_params[0] < 5.1:
-            return '1st'
         return 'N/A'