Ignore:
Timestamp:
1 Feb 2017, 09:17:31 (8 years ago)
Author:
Henrik Bettermann
Message:

Replace 'NEOR' and 'NEOV'.

Location:
main/waeup.aaue/trunk/src/waeup/aaue
Files:
4 edited

Legend:

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

    r14475 r14487  
    185185                if self.gpa_params[1] == 0:
    186186                    # no credits taken
    187                     return 'NEOR'
     187                    return 'NER'
    188188            else:
    189189                if self.gpa_params[1] < 30:
    190190                    # credits taken below limit
    191                     return 'NEOR'
    192             if self.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
     191                    return 'NER'
     192            if self.level_verdict in ('FRNS', 'NER', 'NYV'):
    193193                return self.level_verdict
    194194            if '_m' in self.passed_params[4]:
     
    213213            return 'N/A'
    214214        # returning student remark
    215         if self.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
     215        if self.level_verdict in ('FRNS', 'NER', 'NYV'):
    216216            return 'Probation'
    217217        if self.level_verdict == 'D':
  • main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_utils.py

    r14378 r14487  
    3333        self.student['studycourse'].current_verdict = 'C'
    3434        self.assertEqual(utils.getReturningData(self.student),(2005, 200))
    35         self.student['studycourse'].current_verdict = 'NEOR'
     35        self.student['studycourse'].current_verdict = 'NER'
    3636        self.assertEqual(utils.getReturningData(self.student),(2005, 100))
    3737        return
  • main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py

    r14476 r14487  
    3535    PORTRAIT_CHANGE_STATES = (ADMITTED,)
    3636
    37     gpa_boundaries = ((1, 'FRNS / NEOR / NEOV'),
     37    gpa_boundaries = ((1, 'FRNS / NER / NYV'),
    3838                      (1.5, 'Pass'),
    3939                      (2.4, '3rd Class Honours'),
     
    9090            # credits taken below limit
    9191            return 0
    92         if level_obj.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
     92        if level_obj.level_verdict in ('FRNS', 'NER', 'NYV'):
    9393            return 0
    9494        # use gpa_boundaries above
  • main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py

    r14475 r14487  
    180180        #'A7': 'Credit',
    181181        #'A8': 'Merit',
    182         'NEOR': 'No evidence of registration',
    183         'NEOV': 'No evidence of verification',
     182        'NER': 'No evidence of registration',
     183        'NYV': 'Not yet verified',
    184184        'FRNS': 'Faculty requirements not satisfied',
    185185        }
Note: See TracChangeset for help on using the changeset viewer.