Changeset 14487 for main/waeup.aaue/trunk/src
- Timestamp:
- 1 Feb 2017, 09:17:31 (8 years ago)
- 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 185 185 if self.gpa_params[1] == 0: 186 186 # no credits taken 187 return 'NE OR'187 return 'NER' 188 188 else: 189 189 if self.gpa_params[1] < 30: 190 190 # credits taken below limit 191 return 'NE OR'192 if self.level_verdict in ('FRNS', 'NE OR', 'NEOV'):191 return 'NER' 192 if self.level_verdict in ('FRNS', 'NER', 'NYV'): 193 193 return self.level_verdict 194 194 if '_m' in self.passed_params[4]: … … 213 213 return 'N/A' 214 214 # returning student remark 215 if self.level_verdict in ('FRNS', 'NE OR', 'NEOV'):215 if self.level_verdict in ('FRNS', 'NER', 'NYV'): 216 216 return 'Probation' 217 217 if self.level_verdict == 'D': -
main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_utils.py
r14378 r14487 33 33 self.student['studycourse'].current_verdict = 'C' 34 34 self.assertEqual(utils.getReturningData(self.student),(2005, 200)) 35 self.student['studycourse'].current_verdict = 'NE OR'35 self.student['studycourse'].current_verdict = 'NER' 36 36 self.assertEqual(utils.getReturningData(self.student),(2005, 100)) 37 37 return -
main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py
r14476 r14487 35 35 PORTRAIT_CHANGE_STATES = (ADMITTED,) 36 36 37 gpa_boundaries = ((1, 'FRNS / NE OR / NEOV'),37 gpa_boundaries = ((1, 'FRNS / NER / NYV'), 38 38 (1.5, 'Pass'), 39 39 (2.4, '3rd Class Honours'), … … 90 90 # credits taken below limit 91 91 return 0 92 if level_obj.level_verdict in ('FRNS', 'NE OR', 'NEOV'):92 if level_obj.level_verdict in ('FRNS', 'NER', 'NYV'): 93 93 return 0 94 94 # use gpa_boundaries above -
main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py
r14475 r14487 180 180 #'A7': 'Credit', 181 181 #'A8': 'Merit', 182 'NE OR': 'No evidence of registration',183 'N EOV': 'No evidence of verification',182 'NER': 'No evidence of registration', 183 'NYV': 'Not yet verified', 184 184 'FRNS': 'Faculty requirements not satisfied', 185 185 }
Note: See TracChangeset for help on using the changeset viewer.