disallowing wrong boat class
This commit is contained in:
@@ -61,6 +61,7 @@ def get_indoorraces(workout):
|
||||
|
||||
registrations = IndoorVirtualRaceResult.objects.filter(
|
||||
race__in = races,
|
||||
boatclass = workout.workouttype,
|
||||
userid=workout.user.id)
|
||||
|
||||
races = [r.race for r in registrations]
|
||||
@@ -1008,7 +1009,10 @@ def add_workout_indoorrace(ws,race,r,recordid=0):
|
||||
record.distance = ws[0].distance
|
||||
record.duration = ws[0].duration
|
||||
|
||||
|
||||
if ws[0].workouttype != record.boatclass:
|
||||
errors.append('Your workout boat class is different than on your race registration')
|
||||
return 0,comments,errors,0
|
||||
|
||||
if ws[0].workouttype not in mytypes.otetypes:
|
||||
errors.append('You must submit a indoor rowing workout')
|
||||
return 0,comments, errors, 0
|
||||
@@ -1109,6 +1113,9 @@ def add_workout_race(ws,race,r,splitsecond=0,recordid=0):
|
||||
errors.append('You have to submit a rowing on water workout')
|
||||
return 0,comments,errors,0
|
||||
|
||||
if ws[0].workouttype != record.boatclass:
|
||||
errors.append('Your workout boat class is different than on your race registration')
|
||||
return 0,comments,errors,0
|
||||
|
||||
if ws[0].boattype != record.boattype:
|
||||
errors.append('Your workout boat type did not match the boat type you registered')
|
||||
|
||||
@@ -335,6 +335,8 @@ data-text="@rowsandall #rowingdata Participate in Indoor Rowing virtual race '{{
|
||||
{% if race.sessiontype == 'race' %}
|
||||
<th>Class</th>
|
||||
<th>Boat</th>
|
||||
{% else %}
|
||||
<th>Class</th>
|
||||
{% endif %}
|
||||
<th>Age</th>
|
||||
<th>Gender</th>
|
||||
@@ -348,6 +350,8 @@ data-text="@rowsandall #rowingdata Participate in Indoor Rowing virtual race '{{
|
||||
{% if race.sessiontype == 'race' %}
|
||||
<td>{{ record.boatclass }}</td>
|
||||
<td>{{ record.boattype }}</td>
|
||||
{% else %}
|
||||
<td>{{ record.boatclass }}</td>
|
||||
{% endif %}
|
||||
<td>{{ record.age }}</td>
|
||||
<td>{{ record.sex }}</td>
|
||||
|
||||
Reference in New Issue
Block a user