sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

submitting race result when arriving at upload page from race page

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-06 08:46:03 +02:00
parent 265bf8e99c
commit f752e07d77
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/forms.py
View File

@@ -385,6 +385,7 @@ class UploadOptionsForm(forms.Form):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.request = kwargs.pop('request',None) self.request = kwargs.pop('request',None)
raceid = kwargs.pop('raceid',0)
super(UploadOptionsForm, self).__init__(*args, **kwargs) super(UploadOptionsForm, self).__init__(*args, **kwargs)
r = Rower.objects.get(user=self.request.user) r = Rower.objects.get(user=self.request.user)
races = VirtualRace.objects.filter( races = VirtualRace.objects.filter(
@@ -405,6 +406,9 @@ class UploadOptionsForm(forms.Form):
else: else:
del self.fields['submitrace'] del self.fields['submitrace']
if int(raceid) in raceids:
self.fields['submitrace'].initial = VirtualRace.objects.get(id=raceid)
# The form to indicate additional actions to be performed immediately # The form to indicate additional actions to be performed immediately
# after a successful upload. This version allows the Team manager to select # after a successful upload. This version allows the Team manager to select
# a team member # a team member

2
rowers/templates/virtualevent.html
View File

@@ -177,7 +177,7 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<a href="/rowers/workout/upload">Upload your race result</a> <a href="/rowers/workout/upload/{{ race.id }}/">Upload your race result</a>
</td> </td>
<td> <td>
Upload a new workout to the site and submit it as a result. You Upload a new workout to the site and submit it as a result. You

1
rowers/urls.py
View File

@@ -295,6 +295,7 @@ urlpatterns = [
re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/toggle-ranking/$',views.workout_toggle_ranking, re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/toggle-ranking/$',views.workout_toggle_ranking,
name='workout_toggle_ranking'), name='workout_toggle_ranking'),
re_path(r'^workout/upload/team/$',views.team_workout_upload_view,name='team_workout_upload_view'), re_path(r'^workout/upload/team/$',views.team_workout_upload_view,name='team_workout_upload_view'),
re_path(r'^workout/upload/(?P<raceid>\d+)/$',views.workout_upload_view,name='workout_upload_view'),
re_path(r'^workout/upload/$',views.workout_upload_view,name='workout_upload_view'), re_path(r'^workout/upload/$',views.workout_upload_view,name='workout_upload_view'),
re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/histo/$',views.workout_histo_view, re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/histo/$',views.workout_histo_view,
name='workout_histo_view'), name='workout_histo_view'),

7
rowers/views/workoutviews.py
View File

@@ -4614,7 +4614,8 @@ def workout_upload_view(request,
}, },
docformoptions={ docformoptions={
'workouttype':'rower', 'workouttype':'rower',
}): },
raceid=0):
is_ajax = False is_ajax = False
if request.is_ajax(): if request.is_ajax():
@@ -4727,7 +4728,7 @@ def workout_upload_view(request,
response = {} response = {}
if request.method == 'POST': if request.method == 'POST':
form = DocumentsForm(request.POST,request.FILES) form = DocumentsForm(request.POST,request.FILES)
optionsform = UploadOptionsForm(request.POST,request=request) optionsform = UploadOptionsForm(request.POST,request=request,raceid=raceid)
if form.is_valid(): if form.is_valid():
# f = request.FILES['file'] # f = request.FILES['file']
@@ -5031,7 +5032,7 @@ def workout_upload_view(request,
form = DocumentsForm(initial=docformoptions) form = DocumentsForm(initial=docformoptions)
optionsform = UploadOptionsForm(initial=uploadoptions, optionsform = UploadOptionsForm(initial=uploadoptions,
request=request) request=request,raceid=raceid)
return render(request, 'document_form.html', return render(request, 'document_form.html',
{'form':form, {'form':form,
'active':'nav-workouts', 'active':'nav-workouts',