From 5f28f4c4dae26b12cf08ab11d07131082a7d0f96 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Sat, 20 Jul 2019 23:01:35 +0200 Subject: [PATCH] hotfix no Quota.corrector --- teleforma/exam/models.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/teleforma/exam/models.py b/teleforma/exam/models.py index fc3ce42c..75cec3ef 100755 --- a/teleforma/exam/models.py +++ b/teleforma/exam/models.py @@ -165,13 +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) - 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) - 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) + return q.count() + else: + return None + @property def all_script_count(self): @@ -310,11 +313,11 @@ class Script(BaseResource): date_end__gte=self.date_submitted, session=self.session, period=self.period) - + quotas = all_quotas.filter(script_type=self.type) if not quotas: quotas = all_quotas.filter(script_type=None) - + if quotas: for quota in quotas: if quota.value: -- 2.39.5