exam: fix different types of quotas

diff --git a/teleforma/exam/models.py b/teleforma/exam/models.py
index 2583bb11a370dd9093befe52014c90574faa9042..dcbb26282f3c95208cf164ff25f50269b2e16e69 100644 (file)
--- a/teleforma/exam/models.py
+++ b/teleforma/exam/models.py
@@ -282,7 +282,8 @@ class Script(BaseResource):
                                             script_type=self.type)
         if not quotas:
             quotas = self.course.quotas.filter(date_start__lte=self.date_submitted,
-                                            date_end__gte=self.date_submitted)
+                                            date_end__gte=self.date_submitted,
+                                            script_type=None)
         if quotas:
             for quota in quotas:
                 if quota.value:
@@ -290,6 +291,7 @@ class Script(BaseResource):
             lower_quota = sorted(quota_list, key=lambda k: k['level'])[0]
             self.corrector = lower_quota['obj'].corrector
         else:
+            #FIXME: default corrector goes to settings
             self.corrector = User.objects.filter(is_superuser=True)[1]
 
         self.status = 3

diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py
index ed872a9a5965f119e9f94db530734640674528d1..a41b96b681200ee0b771c74ddfa425ac391701cd 100644 (file)
--- a/teleforma/exam/views.py
+++ b/teleforma/exam/views.py
@@ -214,7 +214,7 @@ class ScriptsScoreAllView(ScriptsTreatedView):
 
     def score_data_setup(self, x, y):
         if not x['x']:
-            messages.warning(self.request, _("You must add one new score at least to access to the statistics."))
+            messages.warning(self.request, _("You must add your score to access to the statistics."))
 
         chartdata = x
         i = 1

diff --git a/teleforma/locale/en/LC_MESSAGES/django.mo b/teleforma/locale/en/LC_MESSAGES/django.mo
index 216735be53cf93b1275230a9f5ab4bd00e5e2028..d5806b6a3f87dadd19fab160fa19e93dc7ab9b4b 100644 (file)
Binary files a/teleforma/locale/en/LC_MESSAGES/django.mo and b/teleforma/locale/en/LC_MESSAGES/django.mo differ

diff --git a/teleforma/locale/en/LC_MESSAGES/django.po b/teleforma/locale/en/LC_MESSAGES/django.po
index 140072081baa03064c9bb775ca7ccb55fb158e15..0d77a947102f6d3304069a1a8be2194cff3ce1d4 100644 (file)
--- a/teleforma/locale/en/LC_MESSAGES/django.po
+++ b/teleforma/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-04 22:52+0200\n"
+"POT-Creation-Date: 2015-08-05 01:43+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n"
 "Language-Team: LANGUAGE <lists@parisson.com>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "period"
 msgstr "période"
 
-#: exam/models.py:62 exam/models.py:436
+#: exam/models.py:62 exam/models.py:438
 msgid "rejected"
 msgstr "rejetée"
 
@@ -39,7 +39,7 @@ msgstr "soumise"
 msgid "pending"
 msgstr "en attente"
 
-#: exam/models.py:63 exam/models.py:421
+#: exam/models.py:63 exam/models.py:423
 msgid "marked"
 msgstr "corrigée"
 
@@ -251,7 +251,7 @@ msgstr ""
 msgid "Session"
 msgstr "Séance"
 
-#: exam/models.py:258 exam/models.py:420 exam/models.py:435
+#: exam/models.py:258 exam/models.py:422 exam/models.py:437
 msgid "Script"
 msgstr "Copie"
 
@@ -466,7 +466,7 @@ msgstr ""
 "votre fichier ou de réessayer plus tard."
 
 #: exam/views.py:217
-msgid "You must add one new score at least to access to the statistics."
+msgid "You must add your score to access to the statistics."
 msgstr ""
 
 #: exam/views.py:282

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index 9107513aff159c9e73f8138054137269ef74502c..7316ea2550c25b7b0a8e42793623d1434524f507 100644 (file)
Binary files a/teleforma/locale/fr/LC_MESSAGES/django.mo and b/teleforma/locale/fr/LC_MESSAGES/django.mo differ

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po
index 1be26057a3f38d7d1529a230093e6748d5c3a847..c943a4c2c1fcd152060eb7f557dd1876f6207dcf 100644 (file)
--- a/teleforma/locale/fr/LC_MESSAGES/django.po
+++ b/teleforma/locale/fr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-04 22:52+0200\n"
+"POT-Creation-Date: 2015-08-05 01:43+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n"
 "Language-Team: LANGUAGE <lists@parisson.com>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "period"
 msgstr "période"
 
-#: exam/models.py:62 exam/models.py:436
+#: exam/models.py:62 exam/models.py:438
 msgid "rejected"
 msgstr "rejetée"
 
@@ -39,7 +39,7 @@ msgstr "soumise"
 msgid "pending"
 msgstr "en attente"
 
-#: exam/models.py:63 exam/models.py:421
+#: exam/models.py:63 exam/models.py:423
 msgid "marked"
 msgstr "corrigée"
 
@@ -251,7 +251,7 @@ msgstr ""
 msgid "Session"
 msgstr "Séance"
 
-#: exam/models.py:258 exam/models.py:420 exam/models.py:435
+#: exam/models.py:258 exam/models.py:422 exam/models.py:437
 msgid "Script"
 msgstr "Copie"
 
@@ -468,9 +468,8 @@ msgstr ""
 "votre fichier ou de réessayer plus tard."
 
 #: exam/views.py:217
-msgid "You must add one new score at least to access to the statistics."
-msgstr ""
-"Vous devez ajouter au moins une nouvelle note pour accéder aux statistiques."
+msgid "You must add your score to access to the statistics."
+msgstr "Vous devez ajouter votre note pour accéder aux statistiques."
 
 #: exam/views.py:282
 msgid "all courses"