diff --git a/rowers/models.py b/rowers/models.py
index b7497c72..945bbd39 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -1645,6 +1645,10 @@ class VirtualRaceResultForm(ModelForm):
if boattypes:
self.fields['boattype'].choices = boattypes
+
+ self.fields['mix'] = forms.BooleanField(initial=False,
+ required=False,
+ label='Mixed Gender')
from rowers.metrics import rowingmetrics
diff --git a/rowers/templates/virtualevent.html b/rowers/templates/virtualevent.html
index 9d8cacba..071567cd 100644
--- a/rowers/templates/virtualevent.html
+++ b/rowers/templates/virtualevent.html
@@ -160,6 +160,7 @@
@@ -169,6 +170,7 @@
{{ record.teamname }} |
{{ record.boattype }} |
{{ record.age }} |
+ {{ record.sex }} |
{{ record.weightcategory }} |
{% if record.userid == rower.id and 'withdrawbutton' in buttons %}
diff --git a/rowers/templates/virtualeventregister.html b/rowers/templates/virtualeventregister.html
index 79b7ffe1..e7501437 100644
--- a/rowers/templates/virtualeventregister.html
+++ b/rowers/templates/virtualeventregister.html
@@ -31,6 +31,13 @@
value from your user settings. For other boat types, please fill out
crew weight class and average age.
+
+
+ You will register as a crew with the gender of your user settings. If
+ your user settings have gender "not specified", you will be registered
+ as a Male crew. Check the "Mixed gender" check box to register as a
+ mixed gender crew (except for 1x where this check box does nothing).
+
{{ form.as_table }}
diff --git a/rowers/views.py b/rowers/views.py
index 5f1a7ad8..b23d6137 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -13558,9 +13558,19 @@ def virtualevent_addboat_view(request,id=0):
boattype = cd['boattype']
weightcategory = cd['weightcategory']
age = cd['age']
+ mix = cd['mix']
+
+ sex = r.sex
+ if mix:
+ sex = 'mixed'
+
if boattype == '1x' and r.birthdate:
age = calculate_age(r.birthdate)
+ sex = r.sex
+ if sex == 'not specified':
+ sex = 'male'
+
if boattype in boattypes:
messages.error(request,"You have already registered in that boat type")
url = reverse(virtualevent_view,
@@ -13583,7 +13593,7 @@ def virtualevent_addboat_view(request,id=0):
duration=datetime.time(0,0),
boattype=boattype,
coursecompleted=False,
- sex=r.sex,
+ sex=sex,
age=age
)
@@ -13649,8 +13659,18 @@ def virtualevent_register_view(request,id=0):
boattype = cd['boattype']
weightcategory = cd['weightcategory']
age = cd['age']
+ mix = cd['mix']
+
+ sex = r.sex
+ if mix:
+ sex = 'mixed'
+
if boattype == '1x' and r.birthdate:
age = calculate_age(r.birthdate)
+ sex = r.sex
+
+ if sex == 'not specified':
+ sex = 'male'
record = VirtualRaceResult(
userid=r.id,
@@ -13664,7 +13684,7 @@ def virtualevent_register_view(request,id=0):
duration=datetime.time(0,0),
boattype=boattype,
coursecompleted=False,
- sex=r.sex,
+ sex=sex,
age=age
)
|