|
|
|
@ -1014,8 +1014,9 @@ class Tournament(BaseModel): |
|
|
|
return self.has_started(hour_delta=hour_delta) |
|
|
|
return self.has_started(hour_delta=hour_delta) |
|
|
|
|
|
|
|
|
|
|
|
def supposedly_in_progress(self): |
|
|
|
def supposedly_in_progress(self): |
|
|
|
|
|
|
|
start = self.start_date - timedelta(hours=1) |
|
|
|
end = self.start_date + timedelta(days=self.day_duration + 1) |
|
|
|
end = self.start_date + timedelta(days=self.day_duration + 1) |
|
|
|
return self.start_date <= timezone.now() <= end |
|
|
|
return start <= timezone.now() <= end |
|
|
|
|
|
|
|
|
|
|
|
# end = self.start_date + timedelta(days=self.day_duration + 1) |
|
|
|
# end = self.start_date + timedelta(days=self.day_duration + 1) |
|
|
|
# return self.start_date.replace(hour=0, minute=0) <= timezone.now() <= end |
|
|
|
# return self.start_date.replace(hour=0, minute=0) <= timezone.now() <= end |
|
|
|
@ -1040,7 +1041,8 @@ class Tournament(BaseModel): |
|
|
|
# start = timezoned_datetime.replace(hour=0, minute=0) |
|
|
|
# start = timezoned_datetime.replace(hour=0, minute=0) |
|
|
|
# now_utc = timezone.now() |
|
|
|
# now_utc = timezone.now() |
|
|
|
# now = now_utc.astimezone(self.timezone()) |
|
|
|
# now = now_utc.astimezone(self.timezone()) |
|
|
|
return self.start_date >= timezone.now() |
|
|
|
start = self.start_date - timedelta(hours=1) |
|
|
|
|
|
|
|
return start >= timezone.now() |
|
|
|
|
|
|
|
|
|
|
|
def has_ended(self): |
|
|
|
def has_ended(self): |
|
|
|
return self.end_date is not None |
|
|
|
return self.end_date is not None |
|
|
|
|