cleaning up

rowers/forms.py

@@ -182,7 +182,8 @@ class UploadOptionsForm(forms.Form):
                                      label='Make Workout Private')
 
     landingpage = forms.ChoiceField(choices=landingpages,
-                                    initial='workout_edit_view')
+                                    initial='workout_edit_view',
+                                    label='Landing Page')
 
     class Meta:
 	fields = ['make_plot','plottype','upload_toc2','makeprivate']

rowers/templates/document_form.html

@@ -38,23 +38,10 @@
           You can select one static plot to be generated immediately for
           this workout. You can select to export to major fitness
           platforms automatically.
-          If you check "make private", this workout will not be visible to your followers and will not show up in your teams' workouts list.
+          If you check "make private", this workout will not be visible to your followers and will not show up in your teams' workouts list. With the Landing Page option, you can select to which (workout related) page you will be
+          taken after a successfull upload.
         </p>
         
-	<p>
-	Valid file types are:
-	<ul>
-		<li>Painsled iOS Stroke Export (CSV)</li>
-		<li>Painsled desktop version Stroke Export (CSV)</li>
-		<li>A TCX file with location data (lat,long) - with or without Heart Rate value, for example from RiM or CrewNerd</li>
-		<li>RowPro CSV export</li>
-		<li>SpeedCoach GPS and SpeedCoach GPS 2 CSV export</li>
-		<li>ErgData CSV export</li>
-		<li>ErgStick CSV export</li>
-                <li>BoatCoach CSV export</li>
-		<li>A FIT file with location data (experimental)</li>
-	</ul>
-	</p>
 </div>
 
 

rowers/views.py

@@ -7627,34 +7627,39 @@ def workout_upload_view(request,
         plottype = 'timeplot'
 
     try:
-        upload_toc2 = uploadoptions['upload_to_C2']
+        landingpage = uploadoptions['landingpage']
     except KeyError:
-        upload_toc2 = False
+        landingpage = r.defaultlandingpage
 
     try:
-        upload_tostrava = uploadoptions['upload_to_Strava']
+        upload_to_c2 = uploadoptions['upload_to_C2']
     except KeyError:
-        upload_tostrava = False
+        upload_to_c2 = False
 
     try:
-        upload_tost = uploadoptions['upload_to_SportTracks']
+        upload_to_strava = uploadoptions['upload_to_Strava']
     except KeyError:
-        upload_tost = False
+        upload_to_strava = False
 
     try:
-        upload_tork = uploadoptions['upload_to_RunKeeper']
+        upload_to_st = uploadoptions['upload_to_SportTracks']
     except KeyError:
-        upload_tork = False
+        upload_to_st = False
 
     try:
-        upload_toua = uploadoptions['upload_to_MapMyFitness']
+        upload_to_rk = uploadoptions['upload_to_RunKeeper']
     except KeyError:
-        upload_toua = False
+        upload_to_rk = False
 
     try:
-        upload_totp = uploadoptions['upload_to_TrainingPeaks']
+        upload_to_ua = uploadoptions['upload_to_MapMyFitness']
     except KeyError:
-        upload_totp = False
+        upload_to_ua = False
+
+    try:
+        upload_to_tp = uploadoptions['upload_to_TrainingPeaks']
+    except KeyError:
+        upload_to_tp = False
 
     if request.method == 'POST':
 	form = DocumentsForm(request.POST,request.FILES)
@@ -7832,7 +7837,6 @@ def workout_upload_view(request,
 	return response
     else:
 	form = DocumentsForm(initial=docformoptions)
-        print uploadoptions
 	optionsform = UploadOptionsForm(initial=uploadoptions)
 	return render(request, 'document_form.html',
 		      {'form':form,