display submitted scripts, add help

diff --git a/teleforma/exam/templates/exam/inc/script_list.html b/teleforma/exam/templates/exam/inc/script_list.html
index 7b72c1c5fa4af4ad3c9a05546a7c338c5c7a5ccc..1a8bf9dd73b2924ac04acf99a75100163dde448c 100644 (file)
--- a/teleforma/exam/templates/exam/inc/script_list.html
+++ b/teleforma/exam/templates/exam/inc/script_list.html
@@ -33,7 +33,7 @@ $(document).ready(function(){
     </thead>
     <tbody id="spacing" class="script-list">
     {% for script in object_list %}
-    <tr data-href="{% url teleforma-exam-script-detail period.id script.id %}">
+    <tr {% if script.status != 2 %}data-href="{% url teleforma-exam-script-detail period.id script.id %}"{% endif %}>
     <td>{{ script.course.title }}</td>
      <td>{{ script.session }}</td>
      <td>{{ script.type }}</td>

diff --git a/teleforma/exam/templates/exam/script_form.html b/teleforma/exam/templates/exam/script_form.html
index 8a3c467effafc89256fd8e18194523d0d5eed286..7e3a3593b10ba5d37d53fd78c231f014bfba74e4 100644 (file)
--- a/teleforma/exam/templates/exam/script_form.html
+++ b/teleforma/exam/templates/exam/script_form.html
@@ -33,7 +33,9 @@
 </div>
 <br />
 
-<div>Merci de fournir des fichiers au format <b>PDF uniquement</b> et nommés <b>sans accents ni caractères spéciaux</b>.</div>
+<div>Merci de fournir <b>un seul</b> fichier au format <b>PDF uniquement</b> et nommés <b>sans accents ni caractères spéciaux</b>.</div>
+
+<div>Pour fusionner des fichiers PDF, vous pouvez utiliser un éditeur PDF ou bien ce <a href="http://www.pdfmerge.com/" target="_blank">service en ligne gratuit</a>.</div>
 
 <div class="course_content" id="media_infos" style="font-size: 115%;">
     <form method="post" id="_ScriptForm" action="" enctype="multipart/form-data" data-ajax="false">{% csrf_token %}
@@ -60,4 +62,4 @@
 </div>
 </div>
 
-{% endblock answers %}
\ No newline at end of file
+{% endblock answers %}

diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py
index 7dd8bfb5528fd53bc0d7b0ec61d626c0f184a734..4296e13bf0c930e9eb8dc71ed62d3e5c6338df9c 100644 (file)
--- a/teleforma/exam/views.py
+++ b/teleforma/exam/views.py
@@ -73,8 +73,9 @@ class ScriptsPendingView(ScriptsView):
         user = self.request.user
         period = Period.objects.get(id=self.kwargs['period_id'])
         Q1 = Q(status=3, author=user, period=period)
-        Q2 = Q(status=3, corrector=user, period=period)
-        scripts = Script.objects.filter(Q1 | Q2)
+        Q2 = Q(status=2, author=user, period=period)
+        Q3 = Q(status=3, corrector=user, period=period)
+        scripts = Script.objects.filter(Q1 | Q2 | Q3)
         return scripts
 
     def get_context_data(self, **kwargs):