entrouvert
/
polynum-blackboard
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

forms: fixed formatting of course labels

This commit is contained in:
Benjamin Dauvergne 2012-12-07 18:13:06 +01:00
parent 01aa6abb67
commit 5431c9c3cf
6 changed files with 53 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
polynum_blackboard/forms.py
View File

@ -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 \

20
polynum_blackboard/templates/_select_my_course.html Normal file
View File

@ -0,0 +1,20 @@
{% load url from future %}
{% if wizard.form.course_name.errors %}
<div class="alert">
{{ wizard.form.course_name.errors }}
</div>
{% endif %}
<style>
.type-ue .controls button {
height: auto;
}
.type-ue .controls.input-append {
display: block;
}
</style>
<div class="control-group type-owner">
<label for="course-type-owner" class="control-label">1. Déposer le document dans un cours que je gère</label>
<div class="controls">
{% include '_courses_selector.html' with response=courses.user_courses only %}
</div>
</div>

13
polynum_blackboard/templates/_select_sponsor_course.html Normal file
View File

@ -0,0 +1,13 @@
{% load url from future %}
<div class="control-group type-sponsor">
<label for="course-type-sponsor" class="control-label">2. Déposer le document dans un cours que gère le commanditaire</label>
<div class="controls">
{% if courses.sponsor_courses %}
{% include '_courses_selector.html' with response=courses.sponsor_courses only %}
{% else %}
<select disabled="disabled" class="span8">
<option>Pas de commanditaire</option>
</select>
{% endif %}
</div>
</div>

12
polynum_blackboard/templates/_select_ue_course.html Normal file
View File

@ -0,0 +1,12 @@
{% load url from future %}
<div id="ue-course-container">
<div id="ue-course" class="control-group type-ue">
{% if courses.ue_courses %}
<label for="course-type-ue" class="control-label">3. Déposer le document dans un cours de l'unité d'enseignement «&nbsp;{{ courses.ue }}&nbsp;»</label>
<div class="controls input-append">
{% include '_courses_selector.html' with response=courses.ue_courses only %}
<button data-target="#create-course" type="button" class="add-on btn" data-toggle="modal">Créer un nouveau cours</button>
</div>
{% endif %}
</div>
</div>

2
polynum_blackboard/templates/document_copyrights.new_request.html
View File

@ -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();
}

8
polynum_blackboard/views.py
View File

@ -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',