Changeset 14380 for main

Timestamp:

10 Jan 2017, 09:24:58 (8 years ago)

Author:

Henrik Bettermann

Message:

A GPA of 1.5 is for students with entry session 2013/2014 till date and 1.0 is for 2012/2013 backward.

Location:

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

Files:

• interswitch/browser.py (modified) (1 diff)
• students/studylevel.py (modified) (3 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py

@@ -214 +214 @@
         # been successfully queried/paid beforehand. This
         # requirement applies to students in state 'cleared' and
-        # entry_session greater than 2013 only.
+        # entry_session greater than 2012 only.
         if self.context.p_category.startswith('schoolfee') and \
             student.state == CLEARED and \

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

@@ -175 +175 @@
         certificate = getattr(self.__parent__,'certificate',None)
         end_level = getattr(certificate, 'end_level', None)
+        failed_limit = 1.5
+        if self.student.entry_session < 2013:
+            failed_limit = 1.0
         # final level student remark
         if end_level and self.level >= end_level:
@@ -180 +183 @@
             if '_m' in failed_courses:
                 return 'FRNS'
-            if self.cumulative_params[0] < 1.5:
+            if self.cumulative_params[0] < failed_limit:
                 return 'Fail'
             if self.cumulative_params[0] < 2.4:
@@ -192 +195 @@
             return 'N/A'
         # returning student remark
-        if self.cumulative_params[0] < 1.5:
+        if self.cumulative_params[0] < failed_limit:
             return 'Probation'
         if self.cumulative_params[0] < 5.1: