diff --git a/polynum_blackboard/forms.py b/polynum_blackboard/forms.py
index 41da0b0..9c15225 100644
--- a/polynum_blackboard/forms.py
+++ b/polynum_blackboard/forms.py
@@ -62,7 +62,7 @@ class CreateCourseForm(forms.Form):
('password', u'avec mot de passe'),
('no', u'non'))
entity = forms.ModelChoiceField(Entity.objects.all(),
- label=u'Diplôme')
+ label=u'Unité d\'enseignement')
category = forms.ChoiceField(label=u'Catégorie',
choices=func2iter(categories))
td_group = forms.CharField(label=u'Groupe de TD', max_length=16,
@@ -141,7 +141,7 @@ laquelle vous souhaitez diffuser votre document')
HTML('{% include \'_select_sponsor_course.html\' %}'),
HTML('{% include \'_select_ue_course.html\' %}')),
'ue',
- id='mycourse-block', css_class='hide'))
+ css_id='mycourse-block', css_class='hide'))
def clean_course_name(self):
if self.cleaned_data['licence'] and \
diff --git a/polynum_blackboard/templates/_select_my_course.html b/polynum_blackboard/templates/_select_my_course.html
new file mode 100644
index 0000000..60abc5d
--- /dev/null
+++ b/polynum_blackboard/templates/_select_my_course.html
@@ -0,0 +1,20 @@
+{% load url from future %}
+{% if wizard.form.course_name.errors %}
+
+ {{ wizard.form.course_name.errors }}
+
+{% endif %}
+
+
+
+
+ {% include '_courses_selector.html' with response=courses.user_courses only %}
+
+
diff --git a/polynum_blackboard/templates/_select_sponsor_course.html b/polynum_blackboard/templates/_select_sponsor_course.html
new file mode 100644
index 0000000..28b3cb4
--- /dev/null
+++ b/polynum_blackboard/templates/_select_sponsor_course.html
@@ -0,0 +1,13 @@
+{% load url from future %}
+
diff --git a/polynum_blackboard/templates/_select_ue_course.html b/polynum_blackboard/templates/_select_ue_course.html
new file mode 100644
index 0000000..6413c60
--- /dev/null
+++ b/polynum_blackboard/templates/_select_ue_course.html
@@ -0,0 +1,12 @@
+{% load url from future %}
+
+
+{% if courses.ue_courses %}
+
+
+ {% include '_courses_selector.html' with response=courses.ue_courses only %}
+
+
+{% endif %}
+
+
diff --git a/polynum_blackboard/templates/document_copyrights.new_request.html b/polynum_blackboard/templates/document_copyrights.new_request.html
index af71afb..4ca16fa 100644
--- a/polynum_blackboard/templates/document_copyrights.new_request.html
+++ b/polynum_blackboard/templates/document_copyrights.new_request.html
@@ -104,7 +104,7 @@
$name.text("La sélection n'est pas une unité d'enseignement.");
} else {
var username = '{{user.username}}';
- var name = item.name+'_'+'{{course_year}}'+'_'+ue.name+'_{{user.display_name}}';
+ var name = item.name+'_'+'{{course_year}}'+'_'+ue.name+'_{{user.display_name|title}}';
if (td_group) {
name += '_' + td_group.toUpperCase();
}
diff --git a/polynum_blackboard/views.py b/polynum_blackboard/views.py
index 5697084..18dc885 100644
--- a/polynum_blackboard/views.py
+++ b/polynum_blackboard/views.py
@@ -32,11 +32,13 @@ def create_course(request):
conn = django_ws.get_bb_conn()
course_id = form.cleaned_data['course_id']
entity = form.cleaned_data['entity']
- diploma = entity.parents().filter(
+ diploma = entity.parents().get(
entity_type__name=settings.POLYNUM_BB_DIPLOMA_DESIGNATION)
course_label = diploma.get_name() + '_' + \
settings.POLYNUM_BB_COURSE_YEAR + '_' + \
- entity.get_name() + request.user.display_name()
+ entity.get_name() + '_' + request.user.display_name().title()
+ if form.cleaned_data.get('td_group'):
+ course_label += '_' + form.cleaned_data['td_group']
ok, result = conn.create_course(course_id,
course_label,
form.cleaned_data['category'],
@@ -70,7 +72,7 @@ Mot de passe: %(password)s
'success': 1,
'entity_pk': form.cleaned_data['entity'].pk,
'course_id': course_id,
- 'description': form.cleaned_data['description']
+ 'description': course_label,
}
else:
logging.error('user %s failed to create course %s: %s',