Ignore:
Timestamp:
17 Jan 2017, 08:04:15 (8 years ago)
Author:
Henrik Bettermann
Message:

Change FRNS criteria (experimental).

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

    r14412 r14413  
    172172    @property
    173173    def remark(self):
     174        if self.gpa_params[1] == 0:
     175            # No credits weighted at this level
     176            return 'FRNS'
     177        if self.level_verdict == 'FRNS':
     178            return 'FRNS'
    174179        certificate = getattr(self.__parent__,'certificate',None)
    175180        end_level = getattr(certificate, 'end_level', None)
    … …  
    184189                return 'FRNS'
    185190            if len(self.passed_params[5]):
    186                 return 'FRNS'
    187             if self.level_verdict == 'FRNS':
    188191                return 'FRNS'
    189192            if self.cumulative_params[0] < failed_limit:

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

    r14411 r14413  
    4444    def getDegreeClassNumber(self, level_obj):
    4545        if level_obj.gpa_params[1] == 0:
     46            # No credits weighted
     47            return 0
     48        if level_obj.level_verdict == 'FRNS':
    4649            return 0
    4750        certificate = getattr(level_obj.__parent__,'certificate',None)
    … …  
    5356                return 0
    5457            if len(not_taken_courses):
    55                 return 0
    56             if level_obj.level_verdict == 'FRNS':
    5758                return 0
    5859        # use gpa_boundaries above
Note: See TracChangeset for help on using the changeset viewer.