From: Guillaume Pellerin Date: Sat, 14 Jun 2014 00:10:31 +0000 (+0200) Subject: add topics to scripts X-Git-Tag: 1.1~471 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=141ec5f5b7e6f735bbb8f88492275b081863d482;p=teleforma.git add topics to scripts --- diff --git a/example/settings.py b/example/settings.py index a0110c81..72df9b5d 100644 --- a/example/settings.py +++ b/example/settings.py @@ -198,7 +198,7 @@ TELECASTER_MASTER_SERVER = 'angus.parisson.com' TELEFORMA_E_LEARNING_TYPE = 'CRFPA' TELEFORMA_GLOBAL_TWEETER = False TELEFORMA_PERIOD_TWEETER = True -TELEFORMA_EXAM_DEFAULT_DOCUMENT_TYPE = 2 +TELEFORMA_EXAM_DEFAULT_DOCUMENT_TYPE_NUMBER = 2 JQCHAT_DISPLAY_COUNT = 50 JQCHAT_DISPLAY_TIME = 48 diff --git a/teleforma/exam/templates/exam/script_detail.html b/teleforma/exam/templates/exam/script_detail.html index e9739670..a064299f 100644 --- a/teleforma/exam/templates/exam/script_detail.html +++ b/teleforma/exam/templates/exam/script_detail.html @@ -88,7 +88,9 @@ {{ script.title }}
- + {% if topic.file %} + {% trans "Topic" %} + {% endif %} {% if script.score %} {% trans "Score" %} : {{ script.score|floatformat }}/20 {% trans "Comments" %} diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py index 20d13987..9fb0c55b 100644 --- a/teleforma/exam/views.py +++ b/teleforma/exam/views.py @@ -23,6 +23,10 @@ class ScriptView(CourseAccessMixin, UpdateView): context['mark_fields'] = ['score', 'comments' ] context['reject_fields'] = ['reject_reason' ] + doc_type = DocumentType.objects.get(number=settings.TELEFORMA_EXAM_DEFAULT_DOCUMENT_TYPE_NUMBER) + topics = Document.objects.filter(course=script.course, period=script.period, + session=script.session, type=doc_type) + context['topic'] = topics[0] access = self.request.user == script.author or \ self.request.user == script.corrector or \ self.request.user.is_superuser or \