From 33ff6f6d81de19353cdcf5c79dcf66f1b39e4645 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 21 Aug 2014 10:32:14 +0200 Subject: [PATCH] fix scripts count for each quota --- teleforma/exam/models.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/teleforma/exam/models.py b/teleforma/exam/models.py index 0b27c879..0d14e2c8 100644 --- a/teleforma/exam/models.py +++ b/teleforma/exam/models.py @@ -134,15 +134,21 @@ class Quota(models.Model): @property def all_script_count(self): - return self.corrector.corrector_scripts.filter(Q(status=3) | Q(status=4) | Q(status=5)).count() + q = self.corrector.corrector_scripts.filter(Q(status=3) | Q(status=4) | Q(status=5)) + q = q.filter(date_submitted__gte=self.date_start).filter(date_submitted__lte=self.date_end) + return q.count() @property def pending_script_count(self): - return self.corrector.corrector_scripts.filter(Q(status=3)).count() + q = self.corrector.corrector_scripts.filter(Q(status=3)) + q = q.filter(date_submitted__gte=self.date_start).filter(date_submitted__lte=self.date_end) + return q.count() @property def marked_script_count(self): - return self.corrector.corrector_scripts.filter(Q(status=4) | Q(status=5)).count() + q = self.corrector.corrector_scripts.filter(Q(status=4) | Q(status=5)) + q = q.filter(date_submitted__gte=self.date_start).filter(date_submitted__lte=self.date_end) + return q.count() @property def level(self): -- 2.39.5