diff --git a/rowers/forms.py b/rowers/forms.py index c8f28068..f40b3439 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -157,7 +157,7 @@ class DateRangeForm(forms.Form): # Form used to select workouts for the past N days class DeltaDaysForm(forms.Form): - deltadays = forms.IntegerField(initial=0,required=False,label='') + deltadays = forms.IntegerField(initial=7,required=False,label='') class RegistrationForm(UserCreationForm): """ diff --git a/rowers/views.py b/rowers/views.py index 4d5d5225..b7ee0c28 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -2702,7 +2702,7 @@ def cumstats(request,theuser=0, except User.DoesNotExist: u = '' - ids = [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 fields = StrokeData._meta.get_fields() @@ -2723,7 +2723,7 @@ def cumstats(request,theuser=0, fielddict.pop('fnowindpace') fielddict.pop('fergpace') fielddict.pop('equivergpower') - fielddict.pop('workoutstate') +# fielddict.pop('workoutstate') fielddict.pop('fpace') fielddict.pop('pace') fielddict.pop('id') @@ -2754,7 +2754,7 @@ def cumstats(request,theuser=0, # Create stats stats = {} - + fielddict.pop('workoutstate') for field,verbosename in fielddict.iteritems(): thedict = {