This commit is contained in:
@@ -130,15 +130,20 @@ class Command(BaseCommand):
|
||||
if data_vars:
|
||||
data_set = self._substitute_data_vars(data_set, data_vars)
|
||||
|
||||
if 'first_day_from_today' in data_set:
|
||||
data_set['first_day'] = datetime.date.today() + datetime.timedelta(data_set['first_day_from_today'])
|
||||
del data_set['first_day_from_today']
|
||||
if 'last_day_from_today' in data_set:
|
||||
data_set['last_day'] = datetime.date.today() + datetime.timedelta(data_set['last_day_from_today'])
|
||||
del data_set['last_day_from_today']
|
||||
if 'deadline_from_today' in data_set:
|
||||
data_set['deadline'] = datetime.date.today() + datetime.timedelta(data_set['deadline_from_today'])
|
||||
del data_set['deadline_from_today']
|
||||
for date_key in ('first_day', 'last_day', 'alt_first_day', 'alt_last_day', 'deadline'):
|
||||
k = '{}_from_today'.format(date_key)
|
||||
if k in data_set:
|
||||
d = datetime.date.today() + datetime.timedelta(data_set[k])
|
||||
data_set[date_key] = d
|
||||
del data_set[k]
|
||||
if 'pre_meeting_1_from_today' in data_set:
|
||||
day = datetime.date.today() + datetime.timedelta(data_set['pre_meeting_1_from_today'])
|
||||
data_set['pre_meeting_1'] = datetime.datetime.combine(day, datetime.time(19, 30))
|
||||
del data_set['pre_meeting_1_from_today']
|
||||
if 'pre_meeting_2_from_today' in data_set:
|
||||
day = datetime.date.today() + datetime.timedelta(data_set['pre_meeting_2_from_today'])
|
||||
data_set['pre_meeting_2'] = datetime.datetime.combine(day, datetime.time(19, 30))
|
||||
del data_set['pre_meeting_2_from_today']
|
||||
|
||||
status_updates = []
|
||||
if 'status_updates' in data_set:
|
||||
|
||||
Reference in New Issue
Block a user