use first year of the scholar year to build the course_code

refs #4179
This commit is contained in:
Benjamin Dauvergne 2014-01-21 14:41:28 +01:00
parent 9d4461879f
commit e41a69cf56
2 changed files with 10 additions and 3 deletions

View File

@ -115,10 +115,16 @@ option.unavailable {
var scholar_year = '{{ course_year }}';
var diploma_name = diploma.name;
var group = '';
var year = '';
if (td_group) {
group = '_Gr' + td_group;
}
var course_code = ue.code.toUpperCase() + '_' + new Date().getFullYear() + group;
if (scholar_year.indexOf('-') != -1) {
year = scholar_year.substr(0, scholar_year.indexOf('-'));
} else {
year = scholar_year;
}
var course_code = ue.code.toUpperCase() + '_' + year + group;
var course_name = diploma.name.toUpperCase() + '_' + scholar_year + '_' +
ue.description + group + '_' + sponsor_name;

View File

@ -44,9 +44,10 @@ def create_course(request):
group = ''
if form.cleaned_data.get('td_group'):
group = '_Gr{0}'.format(form.cleaned_data['td_group'])
course_code = u'{entity_code}_{today.year}{group}'.format(
year = app_settings.COURSE_YEAR.split('-')[0]
course_code = u'{entity_code}_{year}{group}'.format(
entity_code=entity.code.upper(),
today=datetime.date.today(),
year=year,
group=group)
course_name = u'{diploma.name}_{scholar_year}_{entity.description}{group}_{sponsor_name}'.format(
scholar_year=app_settings.COURSE_YEAR,