-
Select one of the following workouts that you rowed within the race window
@@ -42,24 +41,6 @@
{% endfor %}
-
-
-
The "Only Evaluate After" field allows you to tell the site to
- discard the first N minutes fo the workout. This is useful if you
- paddled through the start polygon as part of your warming up.
- Fill out the
- time at which you want to start the evaluation, or leave empty to
- evaluate the entire workout.
-
Use any of the following formats:
-
- - H:MM:SS.d, e.g. 1:45:00.0 for one hour and 45 minutes
- - H:MM:SS, e.g. 1:45:00 for one hour and 45 minutes
- - MM:SS.d, e.g. 30:00.0 for thirty minutes
- - MM, e.g. 30 for thirty minutes
-
-
-
-
{% csrf_token %}
diff --git a/rowers/templates/virtualevent.html b/rowers/templates/virtualevent.html
index 0765650b..95081e27 100644
--- a/rowers/templates/virtualevent.html
+++ b/rowers/templates/virtualevent.html
@@ -83,6 +83,9 @@
{% if button == 'withdrawbutton' %}
Withdraw
{% endif %}
+ {% if button == 'adddisciplinebutton' %}
+
Register New Boat
+ {% endif %}
{% if button == 'editbutton' %}
Edit Race
{% endif %}
@@ -167,6 +170,11 @@
{{ record.boattype }} |
{{ record.age }} |
{{ record.weightcategory }} |
+ {% if record.userid == rower.id %}
+
+ Withdraw
+ |
+ {% endif %}
{% endfor %}
diff --git a/rowers/urls.py b/rowers/urls.py
index 23117eac..de5d498d 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -149,6 +149,8 @@ urlpatterns = [
url(r'^virtualevent/(?P
\d+)$',views.virtualevent_view),
url(r'^virtualevent/(?P\d+)/edit$',views.virtualevent_edit_view),
url(r'^virtualevent/(?P\d+)/register$',views.virtualevent_register_view),
+ url(r'^virtualevent/(?P\d+)/adddiscipline$',views.virtualevent_addboat_view),
+ url(r'^virtualevent/(?P\d+)/withdraw/(?P\d+)$',views.virtualevent_withdraw_view),
url(r'^virtualevent/(?P\d+)/withdraw$',views.virtualevent_withdraw_view),
url(r'^virtualevent/(?P\d+)/submit$',
views.virtualevent_submit_result_view),
diff --git a/rowers/views.py b/rowers/views.py
index 41277afc..8482b363 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -13440,6 +13440,9 @@ def virtualevent_view(request,id=0):
if race_can_register(r,race):
buttons += ['registerbutton']
+ if race_can_adddiscipline(r,race):
+ buttons += ['adddisciplinebutton']
+
if race_can_submit(r,race):
buttons += ['submitbutton']
@@ -13485,7 +13488,7 @@ def virtualevent_view(request,id=0):
})
@login_required()
-def virtualevent_withdraw_view(request,id=0):
+def virtualevent_withdraw_view(request,id=0,recordid=None):
r = getrower(request.user)
try:
race = VirtualRace.objects.get(id=id)
@@ -13493,7 +13496,7 @@ def virtualevent_withdraw_view(request,id=0):
raise Http404("Virtual Race does not exist")
if race_can_withdraw(r,race):
- remove_rower_race(r,race)
+ remove_rower_race(r,race,recordid=recordid)
messages.info(request,
"You have successfully withdrawn from this race.")
else:
@@ -13506,6 +13509,106 @@ def virtualevent_withdraw_view(request,id=0):
return HttpResponseRedirect(url)
+@login_required()
+def virtualevent_addboat_view(request,id=0):
+ r = getrower(request.user)
+ try:
+ race = VirtualRace.objects.get(id=id)
+ except VirtualRace.DoesNotExist:
+ raise Http404("Virtual Race does not exist")
+
+ if not race_can_adddiscipline(r,race):
+ messages.error(request,"You cannot register for this race")
+
+ url = reverse(virtualevent_view,
+ kwargs = {
+ 'id':race.id
+ })
+
+ return HttpResponseRedirect(url)
+
+ records = VirtualRaceResult.objects.filter(
+ userid = r.id,
+ race = race
+ )
+
+ boattypes = [record.boattype for record in records]
+ allowedboats = tuple([ type for type in types.boattypes if type[0] not in boattypes] )
+
+
+ # we're still here
+ if request.method == 'POST':
+ # process form
+ form = VirtualRaceResultForm(request.POST)
+ if form.is_valid():
+ cd = form.cleaned_data
+ teamname = cd['teamname']
+ boattype = cd['boattype']
+ weightcategory = cd['weightcategory']
+ age = cd['age']
+ if boattype == '1x' and r.birthdate:
+ age = calculate_age(r.birthdate)
+
+ if boattype in boattypes:
+ messages.error(request,"You have already registered in that boat type")
+ url = reverse(virtualevent_view,
+ kwargs = {
+ 'id': race.id
+ }
+ )
+
+ return HttpResponseRedirect(url)
+
+ record = VirtualRaceResult(
+ userid=r.id,
+ teamname=teamname,
+ race=race,
+ username = u'{f} {l}'.format(
+ f = r.user.first_name,
+ l = r.user.last_name
+ ),
+ weightcategory=weightcategory,
+ duration=datetime.time(0,0),
+ boattype=boattype,
+ coursecompleted=False,
+ sex=r.sex,
+ age=age
+ )
+
+ record.save()
+
+ add_rower_race(r,race)
+
+
+
+ messages.info(
+ request,
+ "You have successfully registered for this race. Good luck!"
+ )
+
+ url = reverse(virtualevent_view,
+ kwargs = {
+ 'id':race.id
+ })
+
+ return HttpResponseRedirect(url)
+
+ else:
+ initial = {
+ 'age': calculate_age(r.birthdate),
+ 'weightcategory': r.weightcategory,
+ }
+
+ form = VirtualRaceResultForm(initial=initial,boattypes=allowedboats)
+
+ return render(request,'virtualeventregister.html',
+ {
+ 'form':form,
+ 'race':race,
+ 'rowerid':r.id,
+
+ })
+
@login_required()
def virtualevent_register_view(request,id=0):
r = getrower(request.user)
@@ -13672,15 +13775,27 @@ def virtualevent_create_view(request):
dotweet = False
else:
dotweet = True
- sa = SiteAnnouncement(
- announcement = "New Virtual Race on rowsandall.com: {name} on course {course}".format(
- name = name,
- course = course.name.encode('utf8')
+ try:
+ sa = SiteAnnouncement(
+ announcement = "New Virtual Race on rowsandall.com: {name} on course {course}".format(
+ name = name.encode('utf8'),
+ course = course.name.encode('utf8')
),
- dotweet = dotweet
+ dotweet = dotweet
)
- sa.save()
+ sa.save()
+ except UnicodeEncodeError:
+ sa = SiteAnnouncement(
+ announcement = "New Virtual Race on rowsandall.com: {name} on course {course}".format(
+ name = name,
+ course = str(course.name.encode('utf8','ignore'))
+ ),
+ dotweet = dotweet
+ )
+
+
+ sa.save()
url = reverse(virtualevents_view)
return HttpResponseRedirect(url)
@@ -13775,6 +13890,21 @@ def virtualevent_submit_result_view(request,id=0):
can_submit = race_can_submit(r,race) or race_can_resubmit(r,race)
+ records = VirtualRaceResult.objects.filter(
+ userid = r.id,
+ race=race
+ )
+
+ entrychoices = []
+
+ for record in records:
+ rtpl = (record.id, record.__unicode__())
+ entrychoices.append(rtpl)
+
+ entries = {}
+ entries['choices'] = entrychoices
+ entries['initial'] = [records[0].id]
+
if not can_submit:
messages.error(request,'You cannot submit a result to this race')
url = reverse(virtualevent_view,
@@ -13808,18 +13938,20 @@ def virtualevent_submit_result_view(request,id=0):
workoutdata['choices'] = tuple(choices)
if request.method == 'POST':
- w_form = WorkoutRaceSelectForm(workoutdata,request.POST)
+ w_form = WorkoutRaceSelectForm(workoutdata,entries,request.POST)
if w_form.is_valid():
selectedworkout = w_form.cleaned_data['workouts']
- splittime = w_form.cleaned_data['evaluate_after']
- if splittime is not None:
- splitsecond = splittime.hour*3600
- splitsecond += splittime.minute*60
- splitsecond += splittime.second
- splitsecond += splittime.microsecond/1.e6
- else:
- splitsecond = 0
+ splitsecond = 0
+ recordid = w_form.cleaned_data['record']
+# splittime = w_form.cleaned_data['evaluate_after']
+# if splittime is not None:
+# splitsecond = splittime.hour*3600
+# splitsecond += splittime.minute*60
+# splitsecond += splittime.second
+# splitsecond += splittime.microsecond/1.e6
+# else:
+# splitsecond = 0
else:
selectedworkout = None
@@ -13831,11 +13963,11 @@ def virtualevent_submit_result_view(request,id=0):
result,comments,errors,jobid = add_workout_race(
workouts,race,r,
- splitsecond=splitsecond)
- if result:
- for w in ws:
- remove_workout_plannedsession(w,race)
- delete_race_result(w,race)
+ splitsecond=splitsecond,recordid=recordid)
+# if result:
+# for w in ws:
+# remove_workout_plannedsession(w,race)
+# delete_race_result(w,race)
for c in comments:
messages.info(request,c)
@@ -13859,7 +13991,7 @@ def virtualevent_submit_result_view(request,id=0):
return HttpResponseRedirect(url)
else:
- w_form = WorkoutRaceSelectForm(workoutdata=workoutdata)
+ w_form = WorkoutRaceSelectForm(workoutdata,entries)
return render(request,'race_submit.html',
{