Changeset 15376 for main/waeup.aaue/trunk/src/waeup
- Timestamp:
- 1 Apr 2019, 11:57:40 (6 years ago)
- Location:
- main/waeup.aaue/trunk/src/waeup/aaue
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_utils.py
r15368 r15376 213 213 self.assertEqual(self.student.matric_number, 'PTP/fac1/dep1/04/00001') 214 214 self.assertEqual(site['configuration'].next_matric_integer, 2) 215 # SHS have an extended matric number with leading 'SHS'215 # DSH have an extended matric number with leading 'DSH' 216 216 # and same counter as PTP. 217 217 self.student.matric_number = None 218 self.student['studycourse'].certificate.study_mode = ' shs'219 msg, mnumber = utils.setMatricNumber(self.student) 220 self.assertEqual(self.student.matric_number, ' SHS/fac1/dep1/04/00002')218 self.student['studycourse'].certificate.study_mode = 'dsh' 219 msg, mnumber = utils.setMatricNumber(self.student) 220 self.assertEqual(self.student.matric_number, 'DSH/fac1/dep1/04/00002') 221 221 self.assertEqual(site['configuration'].next_matric_integer, 3) 222 222 # Students in faculty FBM get an extended matric number with leading 'CMS' -
main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py
r15373 r15376 154 154 is as an attribute of the site configuration container. 155 155 """ 156 if student.current_mode in ('ug_pt', 'de_pt', ' shs'):156 if student.current_mode in ('ug_pt', 'de_pt', 'dsh'): 157 157 grok.getSite()['configuration'].next_matric_integer += 1 158 158 return … … 197 197 return None, "AAU/SPS/%s/%s/%s/%s/%05d" % ( 198 198 faccode, depcode, year, degree, next_integer) 199 if student.current_mode in (' shs',):199 if student.current_mode in ('dsh',): 200 200 next_integer = grok.getSite()['configuration'].next_matric_integer 201 201 if next_integer == 0: 202 202 return _('Matriculation number cannot be set.'), None 203 return None, " SHS/%s/%s/%s/%05d" % (203 return None, "DSH/%s/%s/%s/%05d" % ( 204 204 faccode, depcode, year, next_integer) 205 205 if student.current_mode in ('ug_pt', 'de_pt'): -
main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py
r15367 r15376 163 163 'ijmbe': 'IJMBE Preparation', 164 164 'bridge': 'Bridge', 165 ' shs': 'Science and Humanistic Studies',165 'dsh': 'Science and Humanisties', 166 166 } 167 167
Note: See TracChangeset for help on using the changeset viewer.