Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

timezone horror pt 2 #456

Merged
merged 1 commit into from
Feb 11, 2025
+5 −5
Merged

timezone horror pt 2 #456

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions freezing/web/views/general.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
from freezing.web.autolog import log
from freezing.web.exc import MultipleTeamsError, NoTeamsError
from freezing.web.utils import auth
from freezing.web.views.chartdata import competition_start, now_or_competition_end
from freezing.web.views.shared_sql import team_leaderboard_query

blueprint = Blueprint("general", __name__)
Expand Down Expand Up @@ -160,7 +159,7 @@ def index():
.limit(12)
)

now_tz = datetime.now(config.START_DATE.tzinfo)
now_tz = datetime.now(config.TIMEZONE)
after_competition_start = now_tz >= config.START_DATE
before_competition_end = now_tz < config.END_DATE

Expand Down Expand Up @@ -326,8 +325,9 @@ def _rider_stats(athlete_id):
.fetchall()
)
)
start = competition_start().date()
today = now_or_competition_end().date()
start = config.START_DATE.date()
now_tz = datetime.now(config.TIMEZONE)
today = min(now_tz, config.END_DATE).date()
yesterday = today - timedelta(days=1)
total_days = 1 + (today - start).days
streak = next(
Expand Down Expand Up @@ -472,7 +472,7 @@ def __init__(self, athlete_id: int, firstname: str, lastname: str):
if not no_teams:
auth.login_athlete(strava_athlete)
# Thanks https://stackoverflow.com/a/32926295/424301 for the hint on tzinfo aware compares
after_competition_start = datetime.now(config.START_DATE.tzinfo) > config.START_DATE
after_competition_start = datetime.now(config.TIMEZONE) > config.START_DATE
return render_template(
"authorization_success.html",
after_competition_start_start=after_competition_start,
Expand Down
Loading