fix levels and then auto corrector assignement

diff --git a/teleforma/exam/models.py b/teleforma/exam/models.py
index 198c1c977c34703c5ddfb5f556559c7feea74705..99c9970aa6f97c7fe7d691a21efcccb0fb5e4771 100644 (file)
--- a/teleforma/exam/models.py
+++ b/teleforma/exam/models.py
@@ -123,7 +123,7 @@ class Quota(models.Model):
     def level(self):
         if self.value:
             if self.value != 0:
-                level = 100*self.user.scripts.filter(Q(status=2) | Q(status=3) | Q(status=4)).count()/self.value
+                level = 100*self.corrector.corrector_scripts.filter(Q(status=2) | Q(status=3) | Q(status=4)).count()/self.value
                 return level
             else:
                 return 0
@@ -228,8 +228,8 @@ class Script(BaseResource):
 
     def auto_set_corrector(self):
         quota_list = []
-        quotas = self.course.quotas.filter(date_start__gte=self.date_submitted,
-                                            date_end__lte=self.date_submitted)
+        quotas = self.course.quotas.filter(date_start__lte=self.date_submitted,
+                                            date_end__gte=self.date_submitted)
         if quotas:
             for quota in quotas:
                 if quota.value:
@@ -281,9 +281,9 @@ class Script(BaseResource):
         # self.url = settings.MEDIA_URL + unicode(self.file)
         self.url='http://files.parisson.com/pre-barreau/LATRILLE Adeline - Procedure civile 1.pdf'
         self.box_uuid = crocodoc.document.upload(url=self.url)
+        self.status = 3
         if not self.corrector:
             self.auto_set_corrector()
-        self.status = 3
 
     def mark(self):
         self.date_marked = datetime.datetime.now()
@@ -292,7 +292,7 @@ class Script(BaseResource):
         a = _('script')
         v = _('marked')
         subject = '%s : %s - %s %s' % (unicode(self), a, self.session, v)
-        mess = Message(sender=self.corrector.user, recipient=self.author, subject=subject[:119], body=text)
+        mess = Message(sender=self.corrector, recipient=self.author, subject=subject[:119], body=text)
         mess.moderation_status = 'a'
         mess.save()
         #notify_user(mess, 'acceptance')
@@ -305,7 +305,7 @@ class Script(BaseResource):
         a = _('script')
         v = _('rejected')
         subject = '%s : %s - %s %s' % (unicode(self), a, self.session, v)
-        mess = Message(sender=self.corrector.user, recipient=self.author, subject=subject[:119], body=text)
+        mess = Message(sender=self.corrector, recipient=self.author, subject=subject[:119], body=text)
         mess.moderation_status = 'a'
         mess.save()
         #notify_user(mess, 'acceptance')

diff --git a/teleforma/exam/templates/exam/script_detail.html b/teleforma/exam/templates/exam/script_detail.html
index cdd2851822b49dd18c296c5b29bdcc2b7bac1371..a76e055b98fd0dca0f87832fa0ff169162838fd4 100644 (file)
--- a/teleforma/exam/templates/exam/script_detail.html
+++ b/teleforma/exam/templates/exam/script_detail.html
@@ -95,7 +95,7 @@
         {% elif script.status == 0 %}
         <a href="#" class="component_icon button icon_delete">{% trans "Rejected" %}</a>
         {% else %}
-         {% if user.correctors.all %}
+         {% if user.quotas.all %}
                <a id="opener_mark" href="#" class="component_icon button icon_edit">{% trans "Scoring" %}</a>
                <a id="opener_reject" href="#" class="component_icon button icon_delete">{% trans "Reject" %}</a>
          {% else %}
@@ -170,7 +170,7 @@
 <br /><br />
 <div class="media">
  <div class="script">
-    <iframe id="box-iframe" style="position:fixed; top:14%; left:0px; bottom:0px; right:0px; width:100%; height:85%; border:none; margin:0; padding:0; z-index:0;" src="{% if user.correctors.all %}{{ script.box_admin_url }}{% else %}{{ script.box_user_url }}{% endif %}">
+    <iframe id="box-iframe" style="position:fixed; top:14%; left:0px; bottom:0px; right:0px; width:100%; height:85%; border:none; margin:0; padding:0; z-index:0;" src="{% if user.quotas.all %}{{ script.box_admin_url }}{% else %}{{ script.box_user_url }}{% endif %}">
     </iframe>
  </div>
 </div>