{{ course.title }} - {{ type }}{% if course.description %} - {{ course.description }}{% endif %} +

{{ course.title }}{% if type.name != "None" %} - {{ type }}{% endif %}{% if course.description %} - {{ course.description }}{% endif %}

- {% if not user.correctors.all or user.is_staff %} - {% block conference %} - {% include "teleforma/inc/conference_list.html" %} - {% endblock %} + {% if type.name == 'Quiz' %} +

+ {% if course.quiz.all %} + + + {% for quiz in course.quiz.all %} + + + {% endfor %} + +

{{quiz.title}}	{{quiz.description}}

+ {% else %} +

Aucun quiz

+ {% endif %} +

- {% block media %} - {% include "teleforma/inc/media_list.html" %} - {% endblock %} - {% endif %} + {% else %} + {% if show_media %} + {% block conference %} + {% include "teleforma/inc/conference_list.html" %} + {% endblock %} + + {% block media %} + {% include "teleforma/inc/media_list.html" %} + {% endblock %} + {% endif %} - {% block document %} - {% with forloop.counter as type_counter %} - {% include "teleforma/inc/document_list.html" %} - {% endwith %} - {% endblock %} + {% block document %} + {% with forloop.counter as type_counter %} + {% include "teleforma/inc/document_list.html" %} + {% endwith %} + {% endblock %} + {% endif %}

{% endfor %} diff --cc teleforma/templates/telemeta/base.html index ce86b938,80487b4c..2b0230e6 --- a/teleforma/templates/telemeta/base.html +++ b/teleforma/templates/telemeta/base.html @@@ -2,16 -2,19 +2,15 @@@ {% load i18n %} {% load telemeta_utils %} {% load teleforma_tags %} -{% get_googletools as googletools %} -{% if googletools %} -{% load googletools %} -{% endif %} {% get_current_language as LANGUAGE_CODE %} {% get_available_languages as LANGUAGES %} - - - + - + + diff --cc teleforma/templatetags/teleforma_tags.py index 2e08c688,ed8ef8ef..dc098b4e --- a/teleforma/templatetags/teleforma_tags.py +++ b/teleforma/templatetags/teleforma_tags.py @@@ -219,16 -226,14 +226,14 @@@ def scripts_count(user, period, statuse return ' (' + str(len(scripts)) + ')' else: return '' - + + @register.simple_tag + def untreated_scripts_count(user, period): + return scripts_count(user, period, (3,)) + @register.simple_tag def treated_scripts_count(user, period): - Q1 = Q(status=4, author=user, period=period) - Q2 = Q(status=4, corrector=user, period=period) - scripts = Script.objects.filter(Q1 | Q2) - if scripts: - return ' (' + str(len(scripts)) + ')' - else: - return '' + return scripts_count(user, period, (4,)) @register.simple_tag def get_training_profile(user): @@@ -242,3 -247,32 +247,32 @@@ for training in student.trainings.all(): text += unicode(training) + ' ' return text + + @register.inclusion_tag('teleforma/inc/newsitems_portlet.html', takes_context=True) + def newsitems_portlet(context, course_id, period_id): + request = context['request'] + user = request.user + def get_data(newsitem): + return { + 'id':newsitem.id, + 'title':newsitem.title, + 'text':newsitem.text, + 'creator':newsitem.creator, + 'created':newsitem.created, + 'can_edit':newsitem.can_edit(request), + 'can_delete':newsitem.can_delete(request), + } - - course = get_object_or_404(Course, id=course_id) ++ ++ course = get_object_or_404(Course, id=course_id) + course_newsitems = [get_data(news) for news in NewsItem.objects.filter(deleted=False, course__id=course_id, period_id=period_id).order_by('-created')] + all_newsitems = [get_data(news) for news in NewsItem.objects.filter(deleted=False, period_id=period_id).order_by('-created')] - can_add = False ++ can_add = False + if user.is_staff or user.professor.count(): + can_add = True + return { + 'can_add':can_add, + 'course':course, + 'period_id':period_id, - 'course_newsitems':course_newsitems, ++ 'course_newsitems':course_newsitems, + 'all_newsitems':all_newsitems + }