fix tests

diff --git a/teleforma/exam/models.py b/teleforma/exam/models.py
index 616d2cbe77c56399d0f6b625454008bd7da819e4..1a625093f3ebd75dacedacabb8ff8c23c5d3735f 100644 (file)
--- a/teleforma/exam/models.py
+++ b/teleforma/exam/models.py
@@ -311,7 +311,8 @@ class Script(BaseResource):
 
     def mark(self):
         self.date_marked = datetime.datetime.now()
-        context = {'script': self}
+        site = Site.objects.all()[0]
+        context = {'script': self, 'site': site}
         text = render_to_string('exam/messages/script_marked.txt', context)
         a = ugettext('Script')
         v = ugettext('marked')
@@ -325,7 +326,8 @@ class Script(BaseResource):
     def reject(self):
         self.date_marked = datetime.datetime.now()
         self.date_rejected = datetime.datetime.now()
-        context = {'script': self}
+        site = Site.objects.all()[0]
+        context = {'script': self, 'site': site}
         text = render_to_string('exam/messages/script_rejected.txt', context)
         a = ugettext('Script')
         v = ugettext('rejected')
@@ -333,7 +335,6 @@ class Script(BaseResource):
         mess = Message(sender=self.corrector, recipient=self.author, subject=subject[:119], body=text)
         mess.moderation_status = 'a'
         mess.save()
-        site = Site.objects.all()[0]
         notify_user(mess, 'acceptance', site)
 
 

diff --git a/teleforma/exam/templates/exam/messages/script_marked.txt b/teleforma/exam/templates/exam/messages/script_marked.txt
index 422fe15f3dcb652241c5fa8fb01a4c56b4c93acf..075028069db4b3873649e5851e099fffeeb7a8e1 100644 (file)
--- a/teleforma/exam/templates/exam/messages/script_marked.txt
+++ b/teleforma/exam/templates/exam/messages/script_marked.txt
@@ -4,7 +4,7 @@ Votre copie soumise le {{ script.date_created }} en {{ script.course }} pour la
 
 La note, les commentaires et les annotations sont disponibles à cette adresse :
 
-{{ site.domain }}{% url teleforma-exam-script-detail script.period.id script.id %}
+http://{{ site.domain }}{% url teleforma-exam-script-detail script.period.id script.id %}
 
 {% trans "Best regards" %},
 {% trans "The site administrator" %} {% trans "of the" %} {% organization %}

diff --git a/teleforma/exam/templates/exam/messages/script_rejected.txt b/teleforma/exam/templates/exam/messages/script_rejected.txt
index c4bb0235f0cafd810c491e82ce6d9f130ca09cca..a306d766d54611e95b7f72dd66b1de8f651c48da 100644 (file)
--- a/teleforma/exam/templates/exam/messages/script_rejected.txt
+++ b/teleforma/exam/templates/exam/messages/script_rejected.txt
@@ -2,7 +2,7 @@
 
 Votre copie soumise le {{ script.date_created }} en {{ script.course }} pour la séance {{ script.session }} a été rejetée pour le motif suivant : {% trans script.reject_reason %}.
 
-Veuiller corriger cette erreur puis resoumettre votre copie.
+Veuillez s'il vous plaît corriger cette erreur puis resoumettre votre copie.
 
 {% trans "Best regards" %},
 {% trans "The site administrator" %} {% trans "of the" %} {% organization %}

diff --git a/teleforma/exam/templates/exam/script_form.html b/teleforma/exam/templates/exam/script_form.html
index 916243ac8093874b5143de59433c5b6aa603b188..8a3c467effafc89256fd8e18194523d0d5eed286 100644 (file)
--- a/teleforma/exam/templates/exam/script_form.html
+++ b/teleforma/exam/templates/exam/script_form.html
@@ -27,14 +27,18 @@
 {% trans "New script" %}
 
     <div style="float: right; font-size: 0.9em;">
-        <a id="blank_script" href="#" class="component_icon button icon_download">&nbsp;{% trans "Blank script" %}</a>
+        <a id="blank_script" href="http://files.parisson.com/pre-barreau/Modele_copie.pdf" class="component_icon button icon_download" target="_blank">&nbsp;{% trans "Blank script" %}</a>
     </div>
 
 </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 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 %}
        <table>
+       <br />
        <tr><td colspan="2">{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</td></tr>
        {% for field in form %}
        <tr>

diff --git a/teleforma/exam/templates/exam/scripts.html b/teleforma/exam/templates/exam/scripts.html
index 9d4d3fa1411b7ddc1af470b3dc4a96191c9d077a..8e6636bc90da21dfdffe37bfeb20b3823ebc7991 100644 (file)
--- a/teleforma/exam/templates/exam/scripts.html
+++ b/teleforma/exam/templates/exam/scripts.html
@@ -47,7 +47,10 @@
 </div>
 {% endif %}
 
-     {% if messages %}
+{% block answers %}
+<div class="course_title">{{ title }}</div>
+
+{% if messages %}
          <div class="messages">
             {% for message in messages %}
             <div{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</div>
@@ -55,11 +58,8 @@
          </div>
     {% endif %}
 
-{% block answers %}
-<div class="course_title">{{ title }}</div>
 <br />
 
-
  {% if object_list %}
   {% include "exam/inc/script_list.html" %}
  {% else %}

diff --git a/teleforma/management/commands/teleforma-exam-submit-scripts.py b/teleforma/management/commands/teleforma-exam-submit-scripts.py
index afc38ca5e90863e4c06923884b1d6e8de90183e8..f6b7cbd8c1f9b2cee5271387688c3291a833795f 100644 (file)
--- a/teleforma/management/commands/teleforma-exam-submit-scripts.py
+++ b/teleforma/management/commands/teleforma-exam-submit-scripts.py
@@ -15,4 +15,5 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
        for script in Script.objects.filter(status=2):
+               print unicode(script)
                script.submit()