Changeset 14464 for main


Ignore:
Timestamp:
26 Jan 2017, 11:03:09 (8 years ago)
Author:
Henrik Bettermann
Message:

ivama: Any student with less than 30 units in summary of result should not proceed no matter the GPA/CGPA.

Location:
main/waeup.aaue/trunk/src/waeup/aaue/students
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py

    r14463 r14464  
    181181        # final level student remark
    182182        if end_level and self.level >= end_level:
    183             if self.gpa_params[1] == 0:
    184                 # No credits weighted at this level
    185                 return 'NEOR'
     183            if self.level > end_level:
     184                # spill-over level
     185                if self.gpa_params[1] == 0:
     186                    # no credits taken
     187                    return 'NEOR'
     188            else:
     189                if self.gpa_params[1] < 30:
     190                    # credits taken below limit
     191                    return 'NEOR'
    186192            if self.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
    187193                return self.level_verdict
     
    208214        # returning student remark
    209215        if self.gpa_params[1] < 30:
    210             # Credits taken below limit
     216            # credits taken below limit
    211217            return 'Probation'
    212218        if self.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
  • main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py

    r14462 r14464  
    7272        reports).
    7373        """
    74         if level_obj.gpa_params[1] == 0:
    75             # No credits weighted
    76             return 0
    77         if level_obj.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
    78             return 0
    7974        certificate = getattr(level_obj.__parent__,'certificate', None)
    8075        end_level = getattr(certificate, 'end_level', None)
    8176        if end_level and level_obj.level >= end_level:
     77            if level_obj.level > end_level:
     78                # spill-over level
     79                if self.gpa_params[1] == 0:
     80                    # no credits taken
     81                    return 0
    8282            failed_courses = level_obj.passed_params[4]
    8383            not_taken_courses = level_obj.passed_params[5]
     
    8787                and not not_taken_courses == 'NIL':
    8888                return 0
     89        elif level_obj.gpa_params[1] < 30:
     90            # credits taken below limit
     91            return 0
     92        if level_obj.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
     93            return 0
    8994        # use gpa_boundaries above
    9095        return self.getClassFromCGPA(
Note: See TracChangeset for help on using the changeset viewer.