From e41a69cf56f19ace3dcde2c39f055eff627ceba8 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 21 Jan 2014 14:41:28 +0100 Subject: [PATCH] use first year of the scholar year to build the course_code refs #4179 --- .../templates/document_copyrights.new_request.html | 8 +++++++- polynum_blackboard/views.py | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/polynum_blackboard/templates/document_copyrights.new_request.html b/polynum_blackboard/templates/document_copyrights.new_request.html index 013c381..b2e1717 100644 --- a/polynum_blackboard/templates/document_copyrights.new_request.html +++ b/polynum_blackboard/templates/document_copyrights.new_request.html @@ -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; diff --git a/polynum_blackboard/views.py b/polynum_blackboard/views.py index 7fad241..6a4acfb 100644 --- a/polynum_blackboard/views.py +++ b/polynum_blackboard/views.py @@ -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,