ready for merge back

rowers/forms.py

@@ -67,13 +67,12 @@ class FlexibleDecimalField(forms.DecimalField):
 
 
 class ResampleForm(forms.Form):
-    resamplechoices = (
-        ('overwrite', 'Overwrite Workout'),
-        ('copy', 'Create a Duplicate Workout')
-    )
-
+    # add resamplechoice field, the result is a True or False boolean, labels are "overwrite" and "create copy"
     resamplechoice = forms.ChoiceField(
-        initial='copy', choices=resamplechoices, label='Copy behavior')
+        required=True,
+        choices=((True, 'overwrite'), (False, 'create copy')),
+        label='Resample choice',
+        widget=forms.RadioSelect)
 
 
 class TrainingZonesForm(forms.Form):
@@ -582,6 +581,11 @@ class UploadOptionsForm(forms.Form):
         races = VirtualRace.objects.filter(
             registration_closure__gt=timezone.now())
 
+        # set upload_to_X based on r.X_auto_export
+        for field in ['C2', 'Strava', 'SportTracks', 'TrainingPeaks', 'Intervals']:
+            if getattr(r, field.lower()+'_auto_export') and r.rowerplan in ['pro', 'plan','coach']:
+                self.fields['upload_to_'+field].initial = True
+
         registrations = IndoorVirtualRaceResult.objects.filter(
             race__in=races,
             userid=r.id)
@@ -665,6 +669,10 @@ class TeamUploadOptionsForm(forms.Form):
     upload_to_TrainingPeaks = forms.BooleanField(initial=False,
                                                  required=False,
                                                  label='Export to TrainingPeaks')
+
+    upload_to_Intervals = forms.BooleanField(initial=False,
+                                                 required=False,
+                                                 label='Export to TrainingPeaks')
     # do_physics = forms.BooleanField(initial=False,required=False,label='Power Estimate (OTW)')
     makeprivate = forms.BooleanField(initial=False, required=False,
                                      label='Make Workout Private')