Merge branch 'release/v6.79'

rowers/dataprep.py

@@ -821,6 +821,7 @@ from utils import totaltime_sec_to_string
     
 # Processes painsled CSV file to database
 def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
+                          boattype='1x',
                           dosummary=True, title='Workout',
                           workoutsource='unknown',
                           notes='', totaldist=0, totaltime=0,
@@ -854,7 +855,7 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
         except:
             pass
         return new_workout_from_df(r, newdf,
-                                   title=title)
+                                   title=title,boattype=boattype)
     try:
         checks = row.check_consistency()
         allchecks = 1
@@ -1001,6 +1002,7 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
 
     w = Workout(user=r, name=title, date=workoutdate,
                 workouttype=workouttype,
+                boattype=boattype,
                 duration=duration, distance=totaldist,
                 weightcategory=r.weightcategory,
                 starttime=workoutstarttime,
@@ -1229,6 +1231,7 @@ def handle_nonpainsled(f2, fileformat, summary=''):
 def new_workout_from_file(r, f2,
                           workouttype='rower',
                           title='Workout',
+                          boattype='1x',
                           makeprivate=False,
                           notes=''):
     message = None
@@ -1325,6 +1328,7 @@ def new_workout_from_file(r, f2,
     id, message = save_workout_database(
         f2, r,
         workouttype=workouttype,
+        boattype=boattype,
         makeprivate=makeprivate,
         dosummary=dosummary,
         workoutsource=fileformat,
@@ -1438,6 +1442,7 @@ def split_workout(r, parent, splitsecond, splitmode):
 
 def new_workout_from_df(r, df,
                         title='New Workout',
+                        boattype='1x',
                         parent=None,
                         setprivate=False,
                         forceunit='lbs',
@@ -1450,6 +1455,7 @@ def new_workout_from_df(r, df,
         oarlength = parent.oarlength
         inboard = parent.inboard
         workouttype = parent.workouttype
+        boattype = parent.boattype
         notes = parent.notes
         summary = parent.summary
         if parent.privacy == 'hidden':
@@ -1494,6 +1500,7 @@ def new_workout_from_df(r, df,
 
     id, message = save_workout_database(csvfilename, r,
                                         workouttype=workouttype,
+                                        boattype=boattype,
                                         title=title,
                                         notes=notes,
                                         oarlength=oarlength,

rowers/forms.py

@@ -78,14 +78,19 @@ class DocumentsForm(forms.Form):
 
     workouttype = forms.ChoiceField(required=True,
 				    choices=Workout.workouttypes)
-#				    initial='rower')
+    
+    boattype = forms.ChoiceField(required=True,
+                                 choices=types.boattypes,
+                                 label = "Boat Type")
+
+
     notes = forms.CharField(required=False,
 			    widget=forms.Textarea)
 
     offline = forms.BooleanField(initial=False,required=False,
                                           label='Process in Background')
     class Meta:
-	fields = ['title','file','workouttype','fileformat','offline']
+	fields = ['title','file','workouttype','boattype','fileformat','offline']
 
     def __init__(self, *args, **kwargs):
         from django.forms.widgets import HiddenInput

rowers/tasks.py

@@ -448,7 +448,7 @@ def long_test_task2(self,aantal,**kwargs):
 @app.task
 def handle_new_workout_from_file(r, f2,
                                  workouttype='rower',
-                                 title='Workout',
+                                 boattype='1x',
                                  makeprivate=False,
                                  notes='',debug=False):
     return new_workout_from_file(r, f2, workouttype,

rowers/templates/document_form.html

@@ -134,7 +134,6 @@
   
   var data = new FormData(frm[0]);
 
-
   $('#id_file').on('change', function(evt) {
      var f = this.files[0];
   console.log(f);

rowers/templates/virtualevent.html

@@ -170,7 +170,7 @@
             <td>{{ record.boattype }}</td>
             <td>{{ record.age }}</td>
             <td>{{ record.weightcategory }}</td>
-            {% if record.userid == rower.id %}
+            {% if record.userid == rower.id and 'withdrawbutton' in buttons %}
             <td>
               <a href="/rowers/virtualevent/{{ race.id }}/withdraw/{{ record.id }}" >Withdraw</a>
             </td>

rowers/tests.py

@@ -546,6 +546,7 @@ class DataTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    }
 
@@ -640,6 +641,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -709,6 +711,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -750,6 +753,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -781,6 +785,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'',
 	    'workouttype':'rower',
+            'boattype': '1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -813,6 +818,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -856,6 +862,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -886,6 +893,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -918,6 +926,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -948,6 +957,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -979,6 +989,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1010,6 +1021,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1039,6 +1051,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1066,6 +1079,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1093,6 +1107,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1120,6 +1135,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1148,6 +1164,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1175,6 +1192,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1202,6 +1220,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1229,6 +1248,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1259,6 +1279,7 @@ class ViewTest(TestCase):
 #	    form_data = {
 #		'title':'test',
 #		'workouttype':'water',
+#            'boattype':'1x',
 #		'notes':'aap noot mies',
 #		'make_plot':False,
 #		'upload_to_c2':False,

rowers/views.py

@@ -10150,6 +10150,11 @@ def workout_upload_view(request,
     except KeyError:
         workouttype = 'rower'
 
+    try:
+        boattype = docformoptions['boattype']
+    except KeyError:
+        boattype = '1x'
+
     try:
         plottype = uploadoptions['plottype']
     except KeyError:
@@ -10213,8 +10218,11 @@ def workout_upload_view(request,
                 
 	    t = form.cleaned_data['title']
 	    workouttype = form.cleaned_data['workouttype']
+            boattype = form.cleaned_data['boattype']
+
             request.session['docformoptions'] = {
                 'workouttype':workouttype,
+                'boattype': boattype,
                 }
             
 	    notes = form.cleaned_data['notes']
@@ -10243,6 +10251,8 @@ def workout_upload_view(request,
                     'upload_to_MapMyFitness':upload_to_ua,
                     'upload_to_TrainingPeaks':upload_to_tp,
                     'landingpage':landingpage,
+                    'boattype': boattype,
+                    'workouttype': workouttype,
                 }
 
 
@@ -10255,6 +10265,7 @@ def workout_upload_view(request,
                 id,message,f2 = dataprep.new_workout_from_file(
                     r,f2,
                     workouttype=workouttype,
+                    boattype=boattype,
                     makeprivate=makeprivate,
                     title = t,
                     notes=''
@@ -10529,6 +10540,7 @@ def team_workout_upload_view(request,message="",
                 id,message,f2 = dataprep.new_workout_from_file(
                     r,f2,
                     workouttype=workouttype,
+                    boattype=boattype,
                     makeprivate=False,
                     title = t,
                     notes=''