diff --git a/rowers/forms.py b/rowers/forms.py index b6191619..a63d62cb 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -325,12 +325,15 @@ class UpdateWindForm(forms.Form): # Form to select a data range to show workouts from a certain time period class DateRangeForm(forms.Form): - startdate = forms.DateField(initial=timezone.now()-datetime.timedelta(days=365), - widget=SelectDateWidget(years=range(1990,2050)), - label='Start Date') - enddate = forms.DateField(initial=timezone.now(), - widget=SelectDateWidget(years=range(1990,2050)), - label='End Date') + startdate = forms.DateField( + initial=timezone.now()-datetime.timedelta(days=365), + # widget=SelectDateWidget(years=range(1990,2050)), + widget=AdminDateWidget(), + label='Start Date') + enddate = forms.DateField( + initial=timezone.now(), + widget=AdminDateWidget(), + label='End Date') class Meta: fields = ['startdate','enddate'] @@ -393,11 +396,17 @@ class RegistrationFormSex(RegistrationFormUniqueEmail): ('lwt','light-weight'), ) - birthdate = forms.DateTimeField(widget=SelectDateWidget( - years=range(timezone.now().year-100,timezone.now().year-10)), - initial = datetime.date(year=1970, - month=4, - day=15)) + birthdate = forms.DateTimeField( + widget=SelectDateWidget(), + initial = datetime.date(year=1970, + month=4, + day=15)) + + def clean_birthdate(self): + dob = self.cleaned_data['birthdate'] + age = (timezone.now() - dob).days/365 + if age < 16: + raise forms.ValidationError('Must be at least 16 years old to register') sex = forms.ChoiceField(required=True, choices=sexcategories, diff --git a/rowers/models.py b/rowers/models.py index 91aec132..5b30abb6 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -914,8 +914,8 @@ class PlannedSessionForm(ModelForm): widgets = { 'comment': forms.Textarea, - 'startdate': DateInput(), - 'enddate': DateInput(), + 'startdate': AdminDateWidget(), + 'enddate': AdminDateWidget(), } @@ -1164,7 +1164,7 @@ class WorkoutForm(ModelForm): model = Workout fields = ['name','date','starttime','timezone','duration','distance','workouttype','notes','privacy','rankingpiece','boattype'] widgets = { - 'date': DateInput(), + 'date': AdminDateWidget(), 'notes': forms.Textarea, 'duration': forms.TimeInput(format='%H:%M:%S.%f'), } diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index 8e2c337e..3cc15766 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -145,7 +145,7 @@ def is_session_complete_ws(ws,ps): trimp = dataprep.workout_trimp(w) score += trimp elif ps.sessionmode == 'rScore': - rscore = dataprep.workout_rscore(w) + rscore = dataprep.workout_rscore(w)[0] score += rscore value = ps.sessionvalue diff --git a/rowers/templates/plannedsessioncreate.html b/rowers/templates/plannedsessioncreate.html index 97cfb0a9..b2d643cd 100644 --- a/rowers/templates/plannedsessioncreate.html +++ b/rowers/templates/plannedsessioncreate.html @@ -125,3 +125,47 @@ {% endblock %} + +{% block scripts %} + + +{% endblock %} diff --git a/rowers/templates/plannedsessionedit.html b/rowers/templates/plannedsessionedit.html index 306028b8..b01ae7d7 100644 --- a/rowers/templates/plannedsessionedit.html +++ b/rowers/templates/plannedsessionedit.html @@ -11,8 +11,8 @@
-

Edit Session {{ thesession.name }}

-
+

Edit Session

+