Use importantdates for material submisssion cutoff and revision if they exist. Fixes #2514. Commit ready for merge.

- Legacy-Id: 15123
This commit is contained in:
Robert Sparks 2018-05-04 18:01:49 +00:00
parent 1c16926ee6
commit c75b5e9386

View file

@ -165,9 +165,18 @@ class Meeting(models.Model):
def get_submission_start_date(self): def get_submission_start_date(self):
return self.date - datetime.timedelta(days=self.submission_start_day_offset) return self.date - datetime.timedelta(days=self.submission_start_day_offset)
def get_submission_cut_off_date(self): def get_submission_cut_off_date(self):
return self.date + datetime.timedelta(days=self.submission_cutoff_day_offset) importantdate = self.importantdate_set.filter(name_id='procsub').first()
if importantdate:
return importantdate.date
else:
return self.date + datetime.timedelta(days=self.submission_cutoff_day_offset)
def get_submission_correction_date(self): def get_submission_correction_date(self):
return self.date + datetime.timedelta(days=self.submission_correction_day_offset) importantdate = self.importantdate_set.filter(name_id='revsub').first()
if importantdate:
return importantdate.date
else:
return self.date + datetime.timedelta(days=self.submission_correction_day_offset)
def get_schedule_by_name(self, name): def get_schedule_by_name(self, name):
return self.schedule_set.filter(name=name).first() return self.schedule_set.filter(name=name).first()