Merge branch 'feature/types' into develop

rowers/dataprep.py

@@ -1076,7 +1076,7 @@ def checkbreakthrough(w, r):
 
 # Processes painsled CSV file to database
 def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
-                          boattype='1x',
+                          boattype='static',
                           adaptiveclass='None',
                           weightcategory='hwt',
                           dosummary=True, title='Workout',
@@ -1366,7 +1366,7 @@ def new_workout_from_file(r, f2,
                           workouttype='rower',
                           workoutsource=None,
                           title='Workout',
-                          boattype='1x',
+                          boattype='static',
                           rpe=-1,
                           makeprivate=False,
                           startdatetime='',
@@ -1552,7 +1552,7 @@ def new_workout_from_file(r, f2,
 def new_workout_from_df(r, df,
                         title='New Workout',
                         workoutsource='unknown',
-                        boattype='1x',
+                        boattype='static',
                         workouttype='rower',
                         parent=None,
                         workoutid='',

rowers/forms.py

@@ -1111,6 +1111,7 @@ class PowerIntervalUpdateForm(forms.Form):
 
 
 boattypes = mytypes.boattypes
+ergtypes = mytypes.ergtypes
 workouttypes = mytypes.workouttypes
 ww = list(workouttypes)
 ww.append(tuple(('all', 'All')))
@@ -1119,7 +1120,7 @@ workouttypes = tuple(ww)
 
 class DataFrameColumnsForm(forms.Form):
     cols = ['ftime', 'cumdist', 'fpace', 'spm',
-            'hr', 'power', 'driveenergy', 'drivelength', 'averageforce',
+            'hr', 'grpower', 'driveenergy', 'drivelength', 'averageforce',
             'peakforce', 'distance', 'drivespeed', 'workoutstate',
             'catch', 'finish', 'peakforceangle', 'wash', 'slip', 'rhythm',
             'effectiveangle', 'totalangle', 'distanceperstroke', 'velo']
@@ -1143,7 +1144,7 @@ class AnalysisOptionsForm(forms.Form):
     modality = forms.ChoiceField(choices=workouttypes,
                                  label='Workout Type',
                                  initial='all')
-    waterboattype = forms.MultipleChoiceField(choices=boattypes,
+    waterboattype = forms.MultipleChoiceField(choices=boattypes+ergtypes,
                                               label='Water Boat Type',
                                               initial=mytypes.waterboattype)
 
@@ -1156,7 +1157,7 @@ class TrendFlexModalForm(forms.Form):
     modality = forms.ChoiceField(choices=workouttypes,
                                  label='Workout Type',
                                  initial='all')
-    waterboattype = forms.MultipleChoiceField(choices=boattypes,
+    waterboattype = forms.MultipleChoiceField(choices=boattypes+ergtypes,
                                               label='Water Boat Type',
                                               initial=mytypes.waterboattype)
 

rowers/models.py

@@ -3443,6 +3443,7 @@ class PlannedSessionFormSmall(ModelForm):
 
 
 boattypes = mytypes.boattypes
+ergtypes = mytypes.ergtypes
 
 # Workout
 rpechoices = (
@@ -3481,9 +3482,9 @@ class Workout(models.Model):
                                    verbose_name='Exercise/Boat Class')
     workoutsource = models.CharField(max_length=100,
                                      default='unknown')
-    boattype = models.CharField(choices=boattypes, max_length=50,
+    boattype = models.CharField(choices=boattypes+ergtypes, max_length=50,
                                 default='1x',
-                                verbose_name='Boat Type')
+                                verbose_name='Boat/Rower Type')
     boatbrand = models.CharField(choices=boatbrands, max_length=50,
                                  default='', verbose_name='Boat Brand')
     adaptiveclass = models.CharField(choices=adaptivetypes, max_length=50,
@@ -3568,6 +3569,11 @@ class Workout(models.Model):
         if self.timezone == 'tzutc()':
             self.timezone = 'UTC'  # pragma: no cover
 
+        if self.workouttype in mytypes.otwtypes and self.boattype in mytypes.ergtypes:
+            self.boattype = '1x'
+        elif self.workouttype in mytypes.otetypes and self.boattype in mytypes.boattypes:
+            self.boattype = 'static'
+
         super(Workout, self).save(*args, **kwargs)
 
     def __str__(self):
@@ -3581,7 +3587,7 @@ class Workout(models.Model):
         boattype = self.boattype
         workouttype = self.workouttype
 
-        if workouttype != 'water':
+        if workouttype not in ['water','rower']:
             try:
                 stri = u'{d} {n} {dist}m {duration} {workouttype} {ownerfirst} {ownerlast}'.format(
                     d=date.strftime('%Y-%m-%d'),

rowers/mytypes.py

@@ -8,8 +8,8 @@ workouttypes_ordered = collections.OrderedDict({
     'rower': 'Indoor Rower',
     'skierg': 'Ski Erg',
     'bikeerg': 'Bike Erg',
-    'dynamic': 'Dynamic Indoor Rower',
+#    'dynamic': 'Dynamic Indoor Rower',
-    'slides': 'Indoor Rower on Slides',
+#    'slides': 'Indoor Rower on Slides',
     'paddle': 'Paddle Adapter',
     'snow': 'On-snow',
     'coastal': 'Coastal',
@@ -340,8 +340,6 @@ otwtypes = (
 
 otetypes = (
     'rower',
-    'dynamic',
-    'slides'
 )
 
 rowtypes = (
@@ -432,6 +430,17 @@ boattypes = (
     ('8x+', '8x+ (octuple scull)'),
 )
 
+ergtypes = (
+    ('static','Concept2 static'),
+    ('dynamic','Concept2 dynamic'),
+    ('slides', 'Concept2 slides'),
+    ('rp3','RP3'),
+    ('waterrower','Water Rower'),
+    ('other','Other Indoor Rower'),
+)
+
+
+
 adaptivetypes = (
     ('None', 'Open'),
     ('PR1', 'PR1 (Arms and Shoulders)'),

rowers/sqlcode/boattypes.sql

@@ -0,0 +1,4 @@
+UPDATE rowers_workout
+SET workouttype = 'rower', boattype = 'dynamic'
+WHERE workouttype = 'dynamic';
+

rowers/tasks.py

@@ -3354,8 +3354,8 @@ def handle_rp3_async_workout(userid, rp3token, rp3id, startdatetime, max_attempt
         'secret': UPLOAD_SERVICE_SECRET,
         'user': userid,
         'file': filename,
-        'workouttype': 'dynamic',
+        'workouttype': 'rower',
-        'boattype': '1x',
+        'boattype': 'rp3',
         'rp3id': int(rp3id),
         'startdatetime': startdatetime,
         'timezone': timezone,
@@ -3552,7 +3552,12 @@ def handle_c2_async_workout(alldata, userid, c2token, c2id, delaysec,
         # rest_time = 0
     distance = distance+rest_distance
     c2id = data['id']
+    if data['type'] in ['rower','dynamic','slides']:
+        workouttype = 'rower'
+        boattype = data['type']
+    else:
         workouttype = data['type']
+        boattype = '1x'
     # verified = data['verified']
 
     # weightclass = data['weight_class']
@@ -3696,7 +3701,7 @@ def handle_c2_async_workout(alldata, userid, c2token, c2id, delaysec,
         'file': csvfilename,
         'title': title,
         'workouttype': workouttype,
-        'boattype': '1x',
+        'boattype': boattype,
         'c2id': c2id,
         'startdatetime': startdatetime.isoformat(),
         'timezone': str(timezone)

rowers/templates/alert_create.html

@@ -65,9 +65,33 @@
         deleteText: '<div><p>&nbsp;</p></div><div>remove</div>'
     });
 </script>
-
 <script>
   $( document ).ready(function() {
+      var boattypes = {
+	  '1x': '1x (single)',
+	  '2x': '2x (double)',
+	  '2x+': '2x+ (coxed double)',
+	  '2-': '2- (pair)',
+	  '2+': '2+ (coxed pair)',
+	  '3x+': '3x+ (coxed triple)',
+	  '3x-': '3x- (triple)',
+	  '4x': '4x (quad)',
+	  '4x+': '4x+ (coxed quad)',
+	  '4-': '4- (four)',
+	  '4+': '4+ (coxed four)',
+	  '8+': '8+ (eight)',
+	  '8x+': '8x+ (octuple scull)',
+      }
+      
+      var ergtypes = {
+	  'static': 'Concept2 static',
+	  'dynamic': 'Concept2 dynamic',
+	  'slides': 'Concept2 slides',
+	  'rp3': 'RP3',
+	  'waterrower': 'Water Rower',
+	  'other': 'Other Indoor Rower',	  
+      }
+
       $('#id_workouttype').on('change', function(){
           if (
               $(this).val() == 'water'
@@ -75,11 +99,46 @@ $( document ).ready(function() {
 		  || $(this).val() == 'c-boat'
 		  || $(this).val() == 'churchboat'
           ) {
-            $('#id_boattype').toggle(true);
+              var $el = $('#id_boattype');
+	      $el.empty();
+	      $.each(boattypes, function(key,value) {
+		  if ( key == '{{ workout.boattype }}') {
+		      $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
 		  } else {
+		      $el.append($("<option></option").attr("value", key).text(value));
+		  }
+	      });
+	      $el.toggle(true);
+	      
+          }
+	  else if (
+	      $(this).val() == 'rower'
+	  ) {
+              var $el = $('#id_boattype');
+	      $el.empty();
+	      $.each(ergtypes, function(key,value) {
+		  if ( key == '{{ workout.boattype }}') {
+		      $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
+		  } else {
+		      $el.append($("<option></option").attr("value", key).text(value));
+		  }
+	      });
+	      $el.toggle(true);	    
+	  }
+	  else {
               $('#id_boattype').toggle(false);
               $('#id_boattype').val('1x');
 	  }
+	  if (
+              $(this).val() == 'rower'
+		  || $(this).val() == 'dynamic'
+		  || $(this).val() == 'slides'
+	  ) {
+              $('#id_dragfactor').toggle(true);
+	  } else {
+              $('#id_dragfactor').toggle(false);
+              $('#id_dragfactor').val('0');
+	  }
 	  
       });
       $('#id_workouttype').change();

rowers/templates/alert_edit.html

@@ -66,6 +66,31 @@
     </script>
 <script>
   $( document ).ready(function() {
+      var boattypes = {
+	  '1x': '1x (single)',
+	  '2x': '2x (double)',
+	  '2x+': '2x+ (coxed double)',
+	  '2-': '2- (pair)',
+	  '2+': '2+ (coxed pair)',
+	  '3x+': '3x+ (coxed triple)',
+	  '3x-': '3x- (triple)',
+	  '4x': '4x (quad)',
+	  '4x+': '4x+ (coxed quad)',
+	  '4-': '4- (four)',
+	  '4+': '4+ (coxed four)',
+	  '8+': '8+ (eight)',
+	  '8x+': '8x+ (octuple scull)',
+      }
+      
+      var ergtypes = {
+	  'static': 'Concept2 static',
+	  'dynamic': 'Concept2 dynamic',
+	  'slides': 'Concept2 slides',
+	  'rp3': 'RP3',
+	  'waterrower': 'Water Rower',
+	  'other': 'Other Indoor Rower',	  
+      }
+
       $('#id_workouttype').on('change', function(){
           if (
               $(this).val() == 'water'
@@ -73,11 +98,46 @@ $( document ).ready(function() {
 		  || $(this).val() == 'c-boat'
 		  || $(this).val() == 'churchboat'
           ) {
-            $('#id_boattype').toggle(true);
+              var $el = $('#id_boattype');
+	      $el.empty();
+	      $.each(boattypes, function(key,value) {
+		  if ( key == '{{ workout.boattype }}') {
+		      $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
 		  } else {
+		      $el.append($("<option></option").attr("value", key).text(value));
+		  }
+	      });
+	      $el.toggle(true);
+	      
+          }
+	  else if (
+	      $(this).val() == 'rower'
+	  ) {
+              var $el = $('#id_boattype');
+	      $el.empty();
+	      $.each(ergtypes, function(key,value) {
+		  if ( key == '{{ workout.boattype }}') {
+		      $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
+		  } else {
+		      $el.append($("<option></option").attr("value", key).text(value));
+		  }
+	      });
+	      $el.toggle(true);	    
+	  }
+	  else {
               $('#id_boattype').toggle(false);
               $('#id_boattype').val('1x');
 	  }
+	  if (
+              $(this).val() == 'rower'
+		  || $(this).val() == 'dynamic'
+		  || $(this).val() == 'slides'
+	  ) {
+              $('#id_dragfactor').toggle(true);
+	  } else {
+              $('#id_dragfactor').toggle(false);
+              $('#id_dragfactor').val('0');
+	  }
 	  
       });
       $('#id_workouttype').change();

rowers/templates/document_form.html

@@ -11,8 +11,6 @@
 <script type='text/javascript'
         src='https://ajax.aspnetcdn.com/ajax/jquery.validate/1.14.0/jquery.validate.min.js'>
 </script>
-<script>
-</script>
 {% endblock %}
 
 {% block main %}
@@ -83,6 +81,31 @@
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
 <script>
   $( document ).ready(function() {
+      var boattypes = {
+	  '1x': '1x (single)',
+	  '2x': '2x (double)',
+	  '2x+': '2x+ (coxed double)',
+	  '2-': '2- (pair)',
+	  '2+': '2+ (coxed pair)',
+	  '3x+': '3x+ (coxed triple)',
+	  '3x-': '3x- (triple)',
+	  '4x': '4x (quad)',
+	  '4x+': '4x+ (coxed quad)',
+	  '4-': '4- (four)',
+	  '4+': '4+ (coxed four)',
+	  '8+': '8+ (eight)',
+	  '8x+': '8x+ (octuple scull)',
+      }
+      
+      var ergtypes = {
+	  'static': 'Concept2 static',
+	  'dynamic': 'Concept2 dynamic',
+	  'slides': 'Concept2 slides',
+	  'rp3': 'RP3',
+	  'waterrower': 'Water Rower',
+	  'other': 'Other Indoor Rower',	  
+      }
+
       $('#id_workouttype').on('change', function(){
           if (
               $(this).val() == 'water'
@@ -90,15 +113,50 @@ $( document ).ready(function() {
 		  || $(this).val() == 'c-boat'
 		  || $(this).val() == 'churchboat'
           ) {
-            $('#id_boattype').toggle(true);
+              var $el = $('#id_boattype');
+	      $el.empty();
+	      $.each(boattypes, function(key,value) {
+		  if ( key == '{{ workout.boattype }}') {
+		      $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
 		  } else {
+		      $el.append($("<option></option").attr("value", key).text(value));
+		  }
+	      });
+	      $el.toggle(true);
+	      
+          }
+	  else if (
+	      $(this).val() == 'rower'
+	  ) {
+              var $el = $('#id_boattype');
+	      $el.empty();
+	      $.each(ergtypes, function(key,value) {
+		  if ( key == '{{ workout.boattype }}') {
+		      $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
+		  } else {
+		      $el.append($("<option></option").attr("value", key).text(value));
+		  }
+	      });
+	      $el.toggle(true);	    
+	  }
+	  else {
               $('#id_boattype').toggle(false);
               $('#id_boattype').val('1x');
 	  }
+	  if (
+              $(this).val() == 'rower'
+		  || $(this).val() == 'dynamic'
+		  || $(this).val() == 'slides'
+	  ) {
+              $('#id_dragfactor').toggle(true);
+	  } else {
+              $('#id_dragfactor').toggle(false);
+              $('#id_dragfactor').val('0');
+	  }
+	  
       });
       $('#id_workouttype').change();
   });
-
   </script>
 
 <script>

rowers/templates/manualadd.html

@@ -14,6 +14,31 @@
 </script>
 <script>
 $( document ).ready(function() {
+      var boattypes = {
+	  '1x': '1x (single)',
+	  '2x': '2x (double)',
+	  '2x+': '2x+ (coxed double)',
+	  '2-': '2- (pair)',
+	  '2+': '2+ (coxed pair)',
+	  '3x+': '3x+ (coxed triple)',
+	  '3x-': '3x- (triple)',
+	  '4x': '4x (quad)',
+	  '4x+': '4x+ (coxed quad)',
+	  '4-': '4- (four)',
+	  '4+': '4+ (coxed four)',
+	  '8+': '8+ (eight)',
+	  '8x+': '8x+ (octuple scull)',
+      }
+      
+      var ergtypes = {
+	  'static': 'Concept2 static',
+	  'dynamic': 'Concept2 dynamic',
+	  'slides': 'Concept2 slides',
+	  'rp3': 'RP3',
+	  'waterrower': 'Water Rower',
+	  'other': 'Other Indoor Rower',	  
+      }
+
       $('#id_workouttype').on('change', function(){
           if (
               $(this).val() == 'water'
@@ -21,11 +46,47 @@ $( document ).ready(function() {
 		  || $(this).val() == 'c-boat'
 		  || $(this).val() == 'churchboat'
           ) {
-            $('#id_boattype').toggle(true);
+              var $el = $('#id_boattype');
+	      $el.empty();
+	      $.each(boattypes, function(key,value) {
+		  if ( key == '{{ workout.boattype }}') {
+		      $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
 		  } else {
+		      $el.append($("<option></option").attr("value", key).text(value));
+		  }
+	      });
+	      $el.toggle(true);
+	      
+          }
+	  else if (
+	      $(this).val() == 'rower'
+	  ) {
+              var $el = $('#id_boattype');
+	      $el.empty();
+	      $.each(ergtypes, function(key,value) {
+		  if ( key == '{{ workout.boattype }}') {
+		      $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
+		  } else {
+		      $el.append($("<option></option").attr("value", key).text(value));
+		  }
+	      });
+	      $el.toggle(true);	    
+	  }
+	  else {
               $('#id_boattype').toggle(false);
               $('#id_boattype').val('1x');
 	  }
+	  if (
+              $(this).val() == 'rower'
+		  || $(this).val() == 'dynamic'
+		  || $(this).val() == 'slides'
+	  ) {
+              $('#id_dragfactor').toggle(true);
+	  } else {
+              $('#id_dragfactor').toggle(false);
+              $('#id_dragfactor').val('0');
+	  }
+	  
       });
       $('#id_workouttype').change();
   });

rowers/templates/team_document_form.html

@@ -77,6 +77,31 @@
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
 <script>
   $( document ).ready(function() {
+      var boattypes = {
+	  '1x': '1x (single)',
+	  '2x': '2x (double)',
+	  '2x+': '2x+ (coxed double)',
+	  '2-': '2- (pair)',
+	  '2+': '2+ (coxed pair)',
+	  '3x+': '3x+ (coxed triple)',
+	  '3x-': '3x- (triple)',
+	  '4x': '4x (quad)',
+	  '4x+': '4x+ (coxed quad)',
+	  '4-': '4- (four)',
+	  '4+': '4+ (coxed four)',
+	  '8+': '8+ (eight)',
+	  '8x+': '8x+ (octuple scull)',
+      }
+      
+      var ergtypes = {
+	  'static': 'Concept2 static',
+	  'dynamic': 'Concept2 dynamic',
+	  'slides': 'Concept2 slides',
+	  'rp3': 'RP3',
+	  'waterrower': 'Water Rower',
+	  'other': 'Other Indoor Rower',	  
+      }
+
       $('#id_workouttype').on('change', function(){
           if (
               $(this).val() == 'water'
@@ -84,14 +109,49 @@ $( document ).ready(function() {
 		  || $(this).val() == 'c-boat'
 		  || $(this).val() == 'churchboat'
           ) {
-            $('#id_boattype').toggle(true);
+              var $el = $('#id_boattype');
+	      $el.empty();
+	      $.each(boattypes, function(key,value) {
+		  if ( key == '{{ workout.boattype }}') {
+		      $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
 		  } else {
+		      $el.append($("<option></option").attr("value", key).text(value));
+		  }
+	      });
+	      $el.toggle(true);
+	      
+          }
+	  else if (
+	      $(this).val() == 'rower'
+	  ) {
+              var $el = $('#id_boattype');
+	      $el.empty();
+	      $.each(ergtypes, function(key,value) {
+		  if ( key == '{{ workout.boattype }}') {
+		      $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
+		  } else {
+		      $el.append($("<option></option").attr("value", key).text(value));
+		  }
+	      });
+	      $el.toggle(true);	    
+	  }
+	  else {
               $('#id_boattype').toggle(false);
               $('#id_boattype').val('1x');
 	  }
+	  if (
+              $(this).val() == 'rower'
+		  || $(this).val() == 'dynamic'
+		  || $(this).val() == 'slides'
+	  ) {
+              $('#id_dragfactor').toggle(true);
+	  } else {
+              $('#id_dragfactor').toggle(false);
+              $('#id_dragfactor').val('0');
+	  }
+	  
       });
       $('#id_workouttype').change();
   });
-
   </script>
 {% endblock %}

rowers/templates/user_analysis_select.html

@@ -20,6 +20,30 @@
       // Get the form fields and hidden div
       var modality = $("#id_modality");
       var hidden = $("#id_waterboattype");
+      var boattypes = {
+	  '1x': '1x (single)',
+	  '2x': '2x (double)',
+	  '2x+': '2x+ (coxed double)',
+	  '2-': '2- (pair)',
+	  '2+': '2+ (coxed pair)',
+	  '3x+': '3x+ (coxed triple)',
+	  '3x-': '3x- (triple)',
+	  '4x': '4x (quad)',
+	  '4x+': '4x+ (coxed quad)',
+	  '4-': '4- (four)',
+	  '4+': '4+ (coxed four)',
+	  '8+': '8+ (eight)',
+	  '8x+': '8x+ (octuple scull)',
+      }
+      
+      var ergtypes = {
+	  'static': 'Concept2 static',
+	  'dynamic': 'Concept2 dynamic',
+	  'slides': 'Concept2 slides',
+	  'rp3': 'RP3',
+	  'waterrower': 'Water Rower',
+	  'other': 'Other Indoor Rower',	  
+      }
 
 
       // Hide the fields.
@@ -30,6 +54,20 @@
 
       if (modality.val() == 'water') {
 	  hidden.show();
+	  var $el = $('#id_waterboattype');
+	  $el.empty();
+	  $.each(boattypes, function(key,value) {
+	      $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
+	  });
+	  $el.toggle(true);
+      } else if  (modality.val() == 'rower') {
+	  hidden.show();
+	  var $el = $('#id_waterboattype');
+	  $el.empty();
+	  $.each(ergtypes, function(key,value) {
+	      $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
+	  });
+	  $el.toggle(true);	  
       }
 
 
@@ -44,6 +82,24 @@
 	  if (otwtypes.includes(Value)) {
 	      // Show the hidden fields.
 	      hidden.show();
+	      var $el = $('#id_waterboattype');
+	      var $label = $("label[for='"+$el.attr('id') + "']")
+	      $el.empty();
+	      $.each(boattypes, function(key,value) {
+		  $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
+	      });
+	      $label.text("Water Boat Type")
+	      $el.toggle(true);
+	  } else if (Value == 'rower') {
+	      hidden.show();
+	      var $el = $('#id_waterboattype');
+	      var $label = $("label[for='"+$el.attr('id') + "']")
+	      $el.empty();
+	      $.each(ergtypes, function(key,value) {
+		  $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
+	      });
+	      $label.text("Erg Boat Type")
+	      $el.toggle(true);	      
 	  } else {
 	      // Make sure that the hidden fields are indeed
 	      // hidden.

rowers/templates/workout_form.html

@@ -24,9 +24,34 @@
 <script type='text/javascript'
         src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
 </script>
-
+<script type='test/javascript' src='/static/js/boattypes.js'></script>
 <script>
   $( document ).ready(function() {
+      var boattypes = {
+	  '1x': '1x (single)',
+	  '2x': '2x (double)',
+	  '2x+': '2x+ (coxed double)',
+	  '2-': '2- (pair)',
+	  '2+': '2+ (coxed pair)',
+	  '3x+': '3x+ (coxed triple)',
+	  '3x-': '3x- (triple)',
+	  '4x': '4x (quad)',
+	  '4x+': '4x+ (coxed quad)',
+	  '4-': '4- (four)',
+	  '4+': '4+ (coxed four)',
+	  '8+': '8+ (eight)',
+	  '8x+': '8x+ (octuple scull)',
+      }
+      
+      var ergtypes = {
+	  'static': 'Concept2 static',
+	  'dynamic': 'Concept2 dynamic',
+	  'slides': 'Concept2 slides',
+	  'rp3': 'RP3',
+	  'waterrower': 'Water Rower',
+	  'other': 'Other Indoor Rower',	  
+      }
+
       $('#id_workouttype').on('change', function(){
           if (
               $(this).val() == 'water'
@@ -34,8 +59,33 @@ $('#id_workouttype').on('change', function(){
 		  || $(this).val() == 'c-boat'
 		  || $(this).val() == 'churchboat'
           ) {
-            $('#id_boattype').toggle(true);
+              var $el = $('#id_boattype');
+	      $el.empty();
+	      $.each(boattypes, function(key,value) {
+		  if ( key == '{{ workout.boattype }}') {
+		      $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
 		  } else {
+		      $el.append($("<option></option").attr("value", key).text(value));
+		  }
+	      });
+	      $el.toggle(true);
+	      
+          }
+	  else if (
+	      $(this).val() == 'rower'
+	  ) {
+              var $el = $('#id_boattype');
+	      $el.empty();
+	      $.each(ergtypes, function(key,value) {
+		  if ( key == '{{ workout.boattype }}') {
+		      $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
+		  } else {
+		      $el.append($("<option></option").attr("value", key).text(value));
+		  }
+	      });
+	      $el.toggle(true);	    
+	  }
+	  else {
               $('#id_boattype').toggle(false);
               $('#id_boattype').val('1x');
 	  }

rowers/templates/workout_join_select.html

@@ -16,50 +16,85 @@
 </script>
 <script src="https://code.jquery.com/jquery-1.9.1.min.js"></script>
 <script>
-  $(function() {
+  $( document ).ready(function() {
+      var boattypes = {
+	  '1x': '1x (single)',
+	  '2x': '2x (double)',
+	  '2x+': '2x+ (coxed double)',
+	  '2-': '2- (pair)',
+	  '2+': '2+ (coxed pair)',
+	  '3x+': '3x+ (coxed triple)',
+	  '3x-': '3x- (triple)',
+	  '4x': '4x (quad)',
+	  '4x+': '4x+ (coxed quad)',
+	  '4-': '4- (four)',
+	  '4+': '4+ (coxed four)',
+	  '8+': '8+ (eight)',
+	  '8x+': '8x+ (octuple scull)',
+      }
       
-  // Get the form fields and hidden div
+      var ergtypes = {
-  var modality = $("#id_modality");
+	  'static': 'Concept2 static',
-  var hidden = $("#id_waterboattype");
+	  'dynamic': 'Concept2 dynamic',
+	  'slides': 'Concept2 slides',
+	  'rp3': 'RP3',
+	  'waterrower': 'Water Rower',
+	  'other': 'Other Indoor Rower',	  
+      }
 
-
+      $('#id_modality').on('change', function(){
-  // Hide the fields.
+          if (
-  // Use JS to do this in case the user doesn't have JS
+              $(this).val() == 'water'
-  // enabled.
+		  || $(this).val() == 'coastal'
-
+		  || $(this).val() == 'c-boat'
-  hidden.hide();
+		  || $(this).val() == 'churchboat'
-
+          ) {
-
+              var $el = $('#id_waterboattype');
-
+	      $el.empty();
-  // Setup an event listener for when the state of the
+	      $.each(boattypes, function(key,value) {
-  // checkbox changes.
+		  if ( key == '{{ workout.boattype }}') {
-  modality.change(function() {
+		      $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
-    // Check to see if the checkbox is checked.
-    // If it is, show the fields and populate the input.
-  // If not, hide the fields.
-    var Value = modality.val();
-    if (Value=='water') {
-  // Show the hidden fields.
-  hidden.show();
 		  } else {
-  // Make sure that the hidden fields are indeed
+		      $el.append($("<option></option").attr("value", key).text(value));
-  // hidden.
-  hidden.hide();
-
-      // You may also want to clear the value of the
-      // hidden fields here. Just in case somebody
-      // shows the fields, enters data to them and then
-      // unticks the checkbox.
-      //
-      // This would do the job:
-      //
-      // $("#hidden_field").val("");
 		  }
 	      });
+	      $el.toggle(true);
 	      
+          }
+	  else if (
+	      $(this).val() == 'rower'
+	  ) {
+              var $el = $('#id_waterboattype');
+	      $el.empty();
+	      $.each(ergtypes, function(key,value) {
+		  if ( key == '{{ workout.boattype }}') {
+		      $el.append($("<option></option").attr("value", key).attr("selected", "selected").text(value));
+		  } else {
+		      $el.append($("<option></option").attr("value", key).text(value));
+		  }
+	      });
+	      $el.toggle(true);	    
+	  }
+	  else {
+              $('#id_waterboattype').toggle(false);
+              $('#id_waterboattype').val('1x');
+	  }
+	  if (
+              $(this).val() == 'rower'
+		  || $(this).val() == 'dynamic'
+		  || $(this).val() == 'slides'
+	  ) {
+              $('#id_dragfactor').toggle(true);
+	  } else {
+              $('#id_dragfactor').toggle(false);
+              $('#id_dragfactor').val('0');
+	  }
 	  
       });
-
+      $('#id_modality').change();
+  });
+  </script>
+<script>
 $(document).ready(function(){
     console.log('kill parents')
     $("#id_killparents").change(function() {

rowers/uploads.py

@@ -1,4 +1,4 @@
-from rowers.mytypes import workouttypes, boattypes, otwtypes, workoutsources, workouttypes_ordered
+from rowers.mytypes import workouttypes, boattypes, ergtypes, otwtypes, workoutsources, workouttypes_ordered
 
 from rowers.rower_rules import is_promember
 

rowers/views/analysisviews.py

@@ -100,6 +100,11 @@ def analysis_new(request,
 
     waterboattype = mytypes.waterboattype
 
+    try:
+        waterboattype = options['waterboattype']
+    except KeyError:
+        pass
+
     if request.method == 'POST':
         thediv = get_call()
         dateform = DateRangeForm(request.POST)
@@ -122,7 +127,7 @@ def analysis_new(request,
                 modalities = [m[0] for m in mytypes.workouttypes]
             else:  # pragma: no cover
                 modalities = [modality]
-            if modality != 'water':
+            if modality not in ['water','rower']:
                 waterboattype = [b[0] for b in mytypes.boattypes]
 
             options['modalities'] = modalities
@@ -160,6 +165,9 @@ def analysis_new(request,
     for b in mytypes.boattypes:
         if b[0] not in waterboattype:  # pragma: no cover
             negtypes.append(b[0])
+    for b in mytypes.ergtypes:
+        if b[0] not in waterboattype:  # pragma: no cover
+            negtypes.append(b[0])
 
     startdate = datetime.datetime.combine(startdate, datetime.time())
     enddate = datetime.datetime.combine(enddate, datetime.time(23, 59, 59))
@@ -179,11 +187,6 @@ def analysis_new(request,
     except (ValueError, AttributeError):  # pragma: no cover
         pass
 
-    negtypes = []
-    for b in mytypes.boattypes:
-        if b[0] not in waterboattype:  # pragma: no cover
-            negtypes.append(b[0])
-
     rankingtypes = [False,True]
     if ranking:
         rankingtypes = [True]

rowers/views/workoutviews.py

@@ -1219,6 +1219,9 @@ def workouts_join_select(request,
     for b in mytypes.boattypes:
         if b[0] not in waterboattype:
             negtypes.append(b[0])
+    for b in mytypes.ergtypes:
+        if b[0] not in waterboattype:  # pragma: no cover
+            negtypes.append(b[0])
 
     startdate = datetime.datetime.combine(startdate, datetime.time())
     enddate = datetime.datetime.combine(enddate, datetime.time(23, 59, 59))