sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

get dates timeperiod updates to work better with local time zones

Browse Source
This commit is contained in:
Sander Roosendaal
2021-09-21 11:04:36 +02:00
parent 8205fd3c3f
commit 5b11413068
8 changed files with 170 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rowers/plannedsessions.py
View File

@@ -888,8 +888,17 @@ def get_dates_timeperiod(request,startdatestring='',enddatestring='',
tz = pytz.timezone(rower.defaulttimezone)
startdate = arrow.get(startdate)
enddate = arrow.get(enddate)
startdate = startdate.astimezone(tz)
enddate = enddate.astimezone(tz)
startdate = startdate.replace(tzinfo=tz)
enddate = enddate.replace(tzinfo=tz)
else:
startdate = dt.datetime.combine(startdate,dt.datetime.min.time())
enddate = dt.datetime.combine(enddate,dt.datetime.min.time())
startdate = startdate.astimezone(pytz.utc)
enddate = enddate.astimezone(pytz.utc)
# set time to 00:00 in local time
startdate = startdate.replace(hour=0,minute=0,second=0,microsecond=0)
enddate = enddate.replace(hour=0,minute=0,second=0,microsecond=0)
return startdate,enddate
@@ -949,6 +958,8 @@ def get_dates_timeperiod(request,startdatestring='',enddatestring='',
try:
startdate = dt.datetime.strptime(tstartdatestring,'%Y-%m-%d').date()
enddate = dt.datetime.strptime(tenddatestring,'%Y-%m-%d').date()
startdate = dt.datetime.combine(startdate,dt.datetime.min.time())
enddate = dt.datetime.combine(enddate,dt.datetime.min.time())
if startdate > enddate: # pragma: no cover
startdate2 = enddate
enddate = startdate
@@ -981,6 +992,10 @@ def get_dates_timeperiod(request,startdatestring='',enddatestring='',
enddate = enddate.astimezone(tz)
# set time to 00:00 in local time
startdate = startdate.replace(hour=0,minute=0,second=0,microsecond=0)
enddate = enddate.replace(hour=0,minute=0,second=0,microsecond=0)
return startdate,enddate
def get_sessions_manager(m,teamid=0,startdate=timezone.now(),