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

Merge branch 'develop' into feature/revisedimports

Browse Source
This commit is contained in:
Sander Roosendaal
2018-07-04 16:35:29 +02:00
parent 6723194a30 f1d3326a2d
commit 5960c276a8
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
rowers/views.py
View File

@@ -6,6 +6,7 @@ import zipfile
import bleach
import arrow
import pytz
from pytz import UnknownTimeZoneError
import operator
import warnings
import urllib
@@ -4776,7 +4777,7 @@ def workouts_join_select(request,
message='',
successmessage='',
startdate=timezone.now()-datetime.timedelta(days=30),
enddate=timezone.now(),
enddate=timezone.now()+datetime.timedelta(days=1),
teamid=0):
try:
@@ -4784,12 +4785,12 @@ def workouts_join_select(request,
except Rower.DoesNotExist:
raise Http404("Rower doesn't exist")
if 'startdate' in request.session:
startdate = iso8601.parse_date(request.session['startdate'])
# if 'startdate' in request.session:
# startdate = iso8601.parse_date(request.session['startdate'])
if 'enddate' in request.session:
enddate = iso8601.parse_date(request.session['enddate'])
# if 'enddate' in request.session:
# enddate = iso8601.parse_date(request.session['enddate'])
if 'waterboattype' in request.session:
@@ -4943,12 +4944,12 @@ def team_comparison_select(request,
except Rower.DoesNotExist:
raise Http404("Rower doesn't exist")
if 'startdate' in request.session:
startdate = iso8601.parse_date(request.session['startdate'])
# if 'startdate' in request.session:
# startdate = iso8601.parse_date(request.session['startdate'])
if 'enddate' in request.session:
enddate = iso8601.parse_date(request.session['enddate'])
# if 'enddate' in request.session:
# enddate = iso8601.parse_date(request.session['enddate'])
if 'waterboattype' in request.session:
@@ -8789,17 +8790,23 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
date,starttime
)
startdatetime = pytz.timezone(thetimezone).localize(
startdatetime
try:
startdatetime = pytz.timezone(thetimezone).localize(
startdatetime
)
except UnknownTimeZoneError:
pass
try:
# aware object can be in any timezone
out = startdatetime.astimezone(pytz.utc)
except (ValueError, TypeError):
startdatetime = timezone.make_aware(startdatetime)
startdatetime = startdatetime.astimezone(pytz.timezone(thetimezone))
try:
startdatetime = startdatetime.astimezone(pytz.timezone(thetimezone))
except UnknownTimeZoneError:
thetimezone = 'UTC'
# check if user is owner of this workout