Moved the materials start, cutoff, and revision dates into the Meeting object

 - Legacy-Id: 11760

Author: rjsparks

ietf/doc/tests.py

@@ -928,7 +928,7 @@ def setUp(self):
         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))

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 @@ def get_materials_path(self):
 
     # 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()

ietf/secr/meetings/tests.py

@@ -77,6 +77,9 @@ def test_add_meeting(self):
                          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 @@ def test_edit_meeting(self):
                          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)

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')

ietf/settings.py

@@ -558,9 +558,9 @@ def skip_unreadable_post(record):
 
 # === 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