From 6c7a1820e15a462a44121918db8e63fe8fa1c1a7 Mon Sep 17 00:00:00 2001 From: "J.-S. Caux" <J.S.Caux@uva.nl> Date: Tue, 6 Feb 2018 09:35:52 +0100 Subject: [PATCH] Debug --- submissions/management/commands/email_fellows_tasklist.py | 2 +- submissions/managers.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/submissions/management/commands/email_fellows_tasklist.py b/submissions/management/commands/email_fellows_tasklist.py index 1dce36913..eec5ee2c8 100644 --- a/submissions/management/commands/email_fellows_tasklist.py +++ b/submissions/management/commands/email_fellows_tasklist.py @@ -16,7 +16,7 @@ class Command(BaseCommand): for fellow in fellows: assignments_ongoing = fellow.editorial_assignments.ongoing() assignments_to_consider = fellow.editorial_assignments.open() - assignments_upcoming_deadline = fellow.editorial_assignments_deadline_within(days=7) + assignments_upcoming_deadline = assignments_ongoing.refereeing_deadline_within(days=7) if assignments_ongoing or assignments_to_consider or assignments_upcoming_deadline: SubmissionUtils.load( { diff --git a/submissions/managers.py b/submissions/managers.py index 1c8db3f2c..8379bc753 100644 --- a/submissions/managers.py +++ b/submissions/managers.py @@ -258,8 +258,8 @@ class EditorialAssignmentQuerySet(models.QuerySet): def refereeing_deadline_within(self, days=7): return self.exclude( - submission__reporting_deadline_gt=timezone.now() + timezone.timedelta(days=days) - ).exclude(submission__reporting_deadline_lt=timezone.now()) + submission__reporting_deadline__gt=timezone.now() + timezone.timedelta(days=days) + ).exclude(submission__reporting_deadline__lt=timezone.now()) class EICRecommendationQuerySet(models.QuerySet): -- GitLab