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

Merge branch 'hotfix/deltazero'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-02-06 22:06:49 +01:00
parent a16059e45d 80008f79c7
commit 74c579cfa0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/forms.py
View File

@@ -157,7 +157,7 @@ class DateRangeForm(forms.Form):
# Form used to select workouts for the past N days # Form used to select workouts for the past N days
class DeltaDaysForm(forms.Form): class DeltaDaysForm(forms.Form):
deltadays = forms.IntegerField(initial=0,required=False,label='') deltadays = forms.IntegerField(initial=7,required=False,label='')
class RegistrationForm(UserCreationForm): class RegistrationForm(UserCreationForm):
""" """

6
rowers/views.py
View File

@@ -2702,7 +2702,7 @@ def cumstats(request,theuser=0,
u = User.objects.get(id=theuser) u = User.objects.get(id=theuser)
except User.DoesNotExist: except User.DoesNotExist:
u = '' u = ''
ids = [int(workout.id) for workout in allergworkouts] ids = [int(workout.id) for workout in allergworkouts]
# Get field names and remove those that are not useful in stats # Get field names and remove those that are not useful in stats
@@ -2723,7 +2723,7 @@ def cumstats(request,theuser=0,
fielddict.pop('nowindpace') fielddict.pop('nowindpace')
fielddict.pop('fnowindpace') fielddict.pop('fnowindpace')
fielddict.pop('fergpace') fielddict.pop('fergpace')
fielddict.pop('equivergpower') fielddict.pop('equivergpower')
# fielddict.pop('workoutstate') # fielddict.pop('workoutstate')
fielddict.pop('fpace') fielddict.pop('fpace')
fielddict.pop('pace') fielddict.pop('pace')
@@ -2754,7 +2754,7 @@ def cumstats(request,theuser=0,
workstrokesonly = True workstrokesonly = True
# Create stats # Create stats
stats = {} stats = {}
fielddict.pop('workoutstate') fielddict.pop('workoutstate')
for field,verbosename in fielddict.iteritems(): for field,verbosename in fielddict.iteritems():