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

5
rowers/models.py
View File

@@ -1810,6 +1810,11 @@ class WorkoutForm(ModelForm):
self.fields['private'] = forms.BooleanField(initial=False, self.fields['private'] = forms.BooleanField(initial=False,
required=False, required=False,
label='Private') label='Private')
self.fields['timezone'] = forms.ChoiceField(
choices = [(x,x) for x in pytz.common_timezones]
)
if 'instance' in kwargs: if 'instance' in kwargs:
if kwargs['instance'].privacy == 'visible': if kwargs['instance'].privacy == 'visible':
self.fields['private'].initial = False self.fields['private'].initial = False

4
rowers/utils.py
View File

@@ -6,7 +6,11 @@ from django.conf import settings
import uuid import uuid
import datetime import datetime
import json import json
from django.http import HttpResponse
import requests import requests
from django.http import HttpResponse from django.http import HttpResponse

25
rowers/views.py
View File

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