Private
Public Access
1
0

indoor racing improvements

more descriptive form labels, new race set to organizer time zone,
link back to race from workout view
This commit is contained in:
Sander Roosendaal
2018-12-10 10:17:09 +01:00
parent de69e76aa2
commit 00154596a7
3 changed files with 48 additions and 2 deletions

View File

@@ -7342,7 +7342,10 @@ def workout_view(request,id=0):
]
u = row.user.user
recordsindoor = IndoorVirtualRaceResult.objects.filter(workoutid= row.id)
records = VirtualRaceResult.objects.filter(workoutid= row.id)
return render(request, 'workout_view.html',
{'workout':row,
'rower':rower,
@@ -7350,6 +7353,8 @@ def workout_view(request,id=0):
'active':'nav-workouts',
'graphs':g,
'last_name':u.last_name,
'records':records,
'recordsindoor':recordsindoor,
'first_name':u.first_name,
'interactiveplot':script,
'aantalcomments':aantalcomments,
@@ -17048,7 +17053,7 @@ def indoorvirtualevent_create_view(request):
return HttpResponseRedirect(url)
else:
racecreateform = IndoorVirtualRaceForm()
racecreateform = IndoorVirtualRaceForm(timezone=r.defaulttimezone)
breadcrumbs = [
@@ -17464,6 +17469,20 @@ def virtualevent_submit_result_view(request,id=0,workoutid=0):
startdatetime__lte=enddatetime,
).order_by("date","startdatetime","id")
if not ws:
messages.info(
request,
'You have no workouts executed during the race window. Please upload a result or enter it manually.'
)
url = reverse(virtualevent_view,
kwargs = {
'id':id
})
return HttpResponseRedirect(url)
initialworkouts = [w.id for w in Workout.objects.filter(
user=r,plannedsession=race
)]