Merged in [15123] from rjsparks@nostrum.com:

Use importantdates for material submisssion cutoff and revision if they exist. Fixes #2514.
 - Legacy-Id: 15132
Note: SVN reference [15123] has been migrated to Git commit c75b5e9386
This commit is contained in:
Henrik Levkowetz 2018-05-07 05:06:31 +00:00
commit fb6242d7c8

View file

@ -165,9 +165,18 @@ class Meeting(models.Model):
def get_submission_start_date(self):
return self.date - datetime.timedelta(days=self.submission_start_day_offset)
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):
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):
return self.schedule_set.filter(name=name).first()