From 44cd9e0920480a809f158097fb3124e72910070d Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Fri, 5 Aug 2016 20:44:05 +0000 Subject: [PATCH] Moved the materials start, cutoff, and revision dates into the Meeting object - Legacy-Id: 11760 --- ietf/doc/tests.py | 2 +- ietf/meeting/models.py | 16 ++++++++++++---- ietf/secr/meetings/tests.py | 6 ++++++ ietf/secr/proceedings/views.py | 3 ++- ietf/settings.py | 6 +++--- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py index fc363e973..f90c358ef 100644 --- a/ietf/doc/tests.py +++ b/ietf/doc/tests.py @@ -928,7 +928,7 @@ class DocumentMeetingTests(TestCase): self.other_group.role_set.create(name_id='chair',person=self.other_chair,email=self.other_chair.email()) today = datetime.date.today() - cut_days = settings.MEETING_MATERIALS_SUBMISSION_CORRECTION_DAYS + cut_days = settings.MEETING_MATERIALS_DEFAULT_SUBMISSION_CORRECTION_DAYS self.past_cutoff = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=1+cut_days)) self.past = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=cut_days/2)) self.inprog = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=1)) diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py index d34f48a25..9a3445d5a 100644 --- a/ietf/meeting/models.py +++ b/ietf/meeting/models.py @@ -72,7 +72,15 @@ class Meeting(models.Model): idsubmit_cutoff_warning_days = timedelta.fields.TimedeltaField(blank=True, default=settings.IDSUBMIT_DEFAULT_CUTOFF_WARNING_DAYS, help_text = "How long before the 00 cutoff to start showing cutoff warnings. Use for example 21 days or 3 weeks.") - # + submission_start_day_offset = models.IntegerField(blank=True, + default=settings.MEETING_MATERIALS_DEFAULT_SUBMISSION_START_DAYS, + help_text = "The number of days before the meeting start date after which meeting materials will be accepted.") + submission_cutoff_day_offset = models.IntegerField(blank=True, + default=settings.MEETING_MATERIALS_DEFAULT_SUBMISSION_CUTOFF_DAYS, + help_text = "The number of days after the meeting start date in which new meeting materials will be accepted.") + submission_correction_day_offset = models.IntegerField(blank=True, + default=settings.MEETING_MATERIALS_DEFAULT_SUBMISSION_CORRECTION_DAYS, + help_text = "The number of days after the meeting start date in which updates to existing meeting materials will be accepted.") venue_name = models.CharField(blank=True, max_length=255) venue_addr = models.TextField(blank=True) break_area = models.CharField(blank=True, max_length=255) @@ -149,11 +157,11 @@ class Meeting(models.Model): # the various dates are currently computed def get_submission_start_date(self): - return self.date + datetime.timedelta(days=settings.MEETING_MATERIALS_SUBMISSION_START_DAYS) + return self.date - datetime.timedelta(days=self.submission_start_day_offset) def get_submission_cut_off_date(self): - return self.date + datetime.timedelta(days=settings.MEETING_MATERIALS_SUBMISSION_CUTOFF_DAYS) + return self.date + datetime.timedelta(days=self.submission_cutoff_day_offset) def get_submission_correction_date(self): - return self.date + datetime.timedelta(days=settings.MEETING_MATERIALS_SUBMISSION_CORRECTION_DAYS) + return self.date + datetime.timedelta(days=self.submission_correction_day_offset) def get_schedule_by_name(self, name): return self.schedule_set.filter(name=name).first() diff --git a/ietf/secr/meetings/tests.py b/ietf/secr/meetings/tests.py index 8ff64df0e..4d7daabc5 100644 --- a/ietf/secr/meetings/tests.py +++ b/ietf/secr/meetings/tests.py @@ -77,6 +77,9 @@ class SecrMeetingTestCase(TestCase): idsubmit_cutoff_day_offset_01=20, idsubmit_cutoff_time_utc =datetime.timedelta(hours=23, minutes=59, seconds=59), idsubmit_cutoff_warning_days =datetime.timedelta(days=21), + submission_start_day_offset=90, + submission_cutoff_day_offset=26, + submission_correction_day_offset=50, ) self.client.login(username='secretary', password='secretary+password') response = self.client.post(url, post_data, follow=True) @@ -95,6 +98,9 @@ class SecrMeetingTestCase(TestCase): idsubmit_cutoff_day_offset_01=20, idsubmit_cutoff_time_utc =datetime.timedelta(hours=23, minutes=59, seconds=59), idsubmit_cutoff_warning_days =datetime.timedelta(days=21), + submission_start_day_offset=90, + submission_cutoff_day_offset=26, + submission_correction_day_offset=50, ) self.client.login(username="secretary", password="secretary+password") response = self.client.post(url, post_data,follow=True) diff --git a/ietf/secr/proceedings/views.py b/ietf/secr/proceedings/views.py index f6b418fff..e49f848d6 100644 --- a/ietf/secr/proceedings/views.py +++ b/ietf/secr/proceedings/views.py @@ -394,7 +394,8 @@ def main(request): meetings = Meeting.objects.filter(type='ietf').order_by('-number') else: # select meetings still within the cutoff period - meetings = Meeting.objects.filter(type='ietf',date__gt=datetime.datetime.today() - datetime.timedelta(days=settings.MEETING_MATERIALS_SUBMISSION_CORRECTION_DAYS)).order_by('number') + today = datetime.datetime.today() + meetings = [m for m in Meeting.objects.filter(type='ietf').order_by('-number') if m.get_submission_correction_date()>=today] groups = get_my_groups(request.user) interim_meetings = Meeting.objects.filter(type='interim',session__group__in=groups,session__status='sched').order_by('-date') diff --git a/ietf/settings.py b/ietf/settings.py index 52f38c1ba..c538c322e 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -558,9 +558,9 @@ XML_LIBRARY = "/www/tools.ietf.org/tools/xml2rfc/web/public/rfc/" # === Meeting Related Settings ================================================= -MEETING_MATERIALS_SUBMISSION_START_DAYS = -90 -MEETING_MATERIALS_SUBMISSION_CUTOFF_DAYS = 26 -MEETING_MATERIALS_SUBMISSION_CORRECTION_DAYS = 50 +MEETING_MATERIALS_DEFAULT_SUBMISSION_START_DAYS = 90 +MEETING_MATERIALS_DEFAULT_SUBMISSION_CUTOFF_DAYS = 26 +MEETING_MATERIALS_DEFAULT_SUBMISSION_CORRECTION_DAYS = 50 INTERNET_DRAFT_DAYS_TO_EXPIRE = 185