From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sat, 3 Aug 2019 15:21:56 +0000 (+0200)
Subject: Merge branch 'pdfannotator' into dev
X-Git-Tag: 1.4.1~17^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6b2453202d954d9a6ea16a5f553a362c694f2eb9;p=teleforma.git

Merge branch 'pdfannotator' into dev

Conflicts:
	teleforma/exam/models.py
---

6b2453202d954d9a6ea16a5f553a362c694f2eb9
diff --cc teleforma/exam/models.py
index b793e992,c649043a..d0fdf353
--- a/teleforma/exam/models.py
+++ b/teleforma/exam/models.py
@@@ -165,15 -165,14 +165,16 @@@ class Quota(models.Model)
          return title
  
      def script_count(self, statuses):
 -        q = self.corrector.corrector_scripts.filter(status__in = statuses)
 -        q = q.filter(course=self.course)
 -        # Careful, MySQL considers '2019-07-28 11:42:00" to not be >= "2019-07-28"
 -        start = self.date_start
 -        end = self.date_end + datetime.timedelta(days = 1)
 -        q = q.filter(date_submitted__gte=start).filter(date_submitted__lte=end)
 -        return q.count()
 -        
 +        if self.corrector:
 +            q = self.corrector.corrector_scripts.filter(status__in = statuses)
 +            q = q.filter(course=self.course)
-             q = q.filter(period=self.period)
-             q = q.filter(session=self.session)
-             q = q.filter(date_submitted__gte=self.date_start).filter(date_submitted__lte=self.date_end)
++            # Careful, MySQL considers '2019-07-28 11:42:00" to not be >= "2019-07-28"
++            start = self.date_start
++            end = self.date_end + datetime.timedelta(days = 1)
++            q = q.filter(date_submitted__gte=start).filter(date_submitted__lte=end)
 +            return q.count()
 +        else:
 +            return 0
  
      @property
      def all_script_count(self):