From 8a0f419ae5ead3b377957398856919d0fd633d6f Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Wed, 24 Jan 2024 16:08:18 +0100
Subject: [PATCH] hopefully completing types features

---
 rowers/dataprep.py                        |   6 +-
 rowers/forms.py                           |   4 +-
 rowers/models.py                          |   5 +
 rowers/mytypes.py                         |   2 -
 rowers/templates/alert_create.html        |  95 +++-
 rowers/templates/alert_edit.html          |  96 +++-
 rowers/templates/document_form.html       | 506 ++++++++++++----------
 rowers/templates/team_document_form.html  |  94 +++-
 rowers/templates/workout_join_select.html | 131 ++++--
 rowers/tests/testdata/testdata.tcx.gz     | Bin 4000 -> 3999 bytes
 rowers/uploads.py                         |   2 +-
 rowers/views/workoutviews.py              |   3 +
 12 files changed, 611 insertions(+), 333 deletions(-)

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 8197c6d8..35a7ec9f 100644
--- a/rowers/dataprep.py
+++ b/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='',
diff --git a/rowers/forms.py b/rowers/forms.py
index 4a5df3d8..bb29caa2 100644
--- a/rowers/forms.py
+++ b/rowers/forms.py
@@ -1120,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']
@@ -1157,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)
 
diff --git a/rowers/models.py b/rowers/models.py
index b46f727a..20be9e6f 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -3569,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):
diff --git a/rowers/mytypes.py b/rowers/mytypes.py
index 182886d5..fef3969d 100644
--- a/rowers/mytypes.py
+++ b/rowers/mytypes.py
@@ -340,8 +340,6 @@ otwtypes = (
 
 otetypes = (
     'rower',
-    'dynamic',
-    'slides'
 )
 
 rowtypes = (
diff --git a/rowers/templates/alert_create.html b/rowers/templates/alert_create.html
index 9940fa8e..3cb0b5bd 100644
--- a/rowers/templates/alert_create.html
+++ b/rowers/templates/alert_create.html
@@ -65,26 +65,85 @@
         deleteText: '<div><p>&nbsp;</p></div><div>remove</div>'
     });
 </script>
-
 <script>
-$( document ).ready(function() {
-    $('#id_workouttype').on('change', function(){
-        if (
-            $(this).val() == 'water'
-            || $(this).val() == 'coastal'
-            || $(this).val() == 'c-boat'
-            || $(this).val() == 'churchboat'
-        ) {
-            $('#id_boattype').toggle(true);
-        } else { 
-            $('#id_boattype').toggle(false);
-            $('#id_boattype').val('1x');        
-}
+  $( 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').change(); 
-});
-</script>
+      $('#id_workouttype').on('change', function(){
+          if (
+              $(this).val() == 'water'
+		  || $(this).val() == 'coastal'
+		  || $(this).val() == 'c-boat'
+		  || $(this).val() == 'churchboat'
+          ) {
+              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 %}
 
 
diff --git a/rowers/templates/alert_edit.html b/rowers/templates/alert_edit.html
index 04f92ce2..d8712700 100644
--- a/rowers/templates/alert_edit.html
+++ b/rowers/templates/alert_edit.html
@@ -63,26 +63,86 @@
         addText: '<div>&nbsp;</div><div>add filter</div>',
         deleteText: '<div><p>&nbsp;</p></div><div>remove</div>'
     });
-</script>
+    </script>
 <script>
-$( document ).ready(function() {
-    $('#id_workouttype').on('change', function(){
-        if (
-            $(this).val() == 'water'
-            || $(this).val() == 'coastal'
-            || $(this).val() == 'c-boat'
-            || $(this).val() == 'churchboat'
-        ) {
-            $('#id_boattype').toggle(true);
-        } else { 
-            $('#id_boattype').toggle(false);
-            $('#id_boattype').val('1x');        
-}
+  $( 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').change(); 
-});
-</script>
+      $('#id_workouttype').on('change', function(){
+          if (
+              $(this).val() == 'water'
+		  || $(this).val() == 'coastal'
+		  || $(this).val() == 'c-boat'
+		  || $(this).val() == 'churchboat'
+          ) {
+              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 %}
 
 
diff --git a/rowers/templates/document_form.html b/rowers/templates/document_form.html
index 85d7be01..dd591307 100644
--- a/rowers/templates/document_form.html
+++ b/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 %}
@@ -80,244 +78,304 @@
 
     {% block scripts %}
 
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
 <script>
-$( document ).ready(function() {
-    $('#id_workouttype').on('change', function(){
-        if (
-            $(this).val() == 'water'
-            || $(this).val() == 'coastal'
-            || $(this).val() == 'c-boat'
-            || $(this).val() == 'churchboat'
-        ) {
-            $('#id_boattype').toggle(true);
-        } else {
-            $('#id_boattype').toggle(false);
-            $('#id_boattype').val('1x');
-        }
-});
-$('#id_workouttype').change();
-});
+  $( 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',	  
+      }
 
-</script>
+      $('#id_workouttype').on('change', function(){
+          if (
+              $(this).val() == 'water'
+		  || $(this).val() == 'coastal'
+		  || $(this).val() == 'c-boat'
+		  || $(this).val() == 'churchboat'
+          ) {
+              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>
-      var td = new FormData();
-      var formdatasetok = false;
-      try {
+<script>
+  var td = new FormData();
+  var formdatasetok = false;
+  try {
       td.set('aap','noot');
       formdatasetok = true;
       console.log('FormData.set OK');
-      }
+  }
   catch(err) {
-  console.log('FormData.set not OK');
-  formdatasetok = false;
+      console.log('FormData.set not OK');
+      formdatasetok = false;
   }
-
-      if (!formdatasetok) {
+  
+  if (!formdatasetok) {
       $("#id_dropregion").remove();
-      }
-
+  }
+  
   if (formdatasetok) {
-
+      
       $(document).ready(function() {
-  var csrftoken = jQuery("[name=csrfmiddlewaretoken]").val();
-  console.log("CSRF token",csrftoken);
-
-  function csrfSafeMethod(method) {
-  // these HTTP methods do not require CSRF protection
-  return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));
-  }
-  $.ajaxSetup({
-  beforeSend: function(xhr, settings) {
-  if (!csrfSafeMethod(settings.type) && !this.crossDomain) {
-  xhr.setRequestHeader("X-CSRFToken", csrftoken);
-  }
-  }
-  });
-  console.log("Loading dropper");
-  jQuery.event.props.push('dataTransfer');
-
-      $(window).on('dragenter', function() {
-      $("#id_drop-files").css("background-color","#E9E9E4");
-      $("#id_dropregion").addClass("watermark").removeClass("invisible");})
-
-      $(window).on('dragleave', function() {
-      $("#id_drop-files").css("background-color","#FFFFFF");
-      $("#id_dropregion").removeClass("watermark").addClass("invisible");})
-
-  var frm = $("#file_form");
-
-  if( window.FormData === undefined ) {
-  console.log('no formdata');
-  alert("No FormData");
-  } else {
-  console.log('we have formdata');
-  }
-
-  var data = new FormData(frm[0]);
-
-  $('#id_file').on('change', function(evt) {
-     var f = this.files[0];
-  console.log(f);
-    var istcx = false;
-  var isgzip = false;
-  var size1 = 10485760;
-  var size2 = 2097152;
-  if ((/\.(tcx|TCX)/i).test(f.name)) {
-  istcx = true;
-  console.log('tcx');
-  if ((/\.(gz|GZ)/i).test(f.name)) {
-  isgzip = true;
-  console.log('gzip');
-  size1 /= 5;
-  size2 /= 5;
-  }
-  }
-  console.log(size1)
-  console.log(size2)
-  if (f.size > size1) {
-  alert("File Size must be smaller than 10 MB");
-  this.value = null;
-  } else {
-
-  if (f.size > size2) {
-  $('#id_offline').val('True');
-  $('#id_offline').prop('checked','True');
-  data.set($('#id_offline').attr('name'),$('#id_offline').prop('checked'));
-  console.log("Set offline to True");
-  $('#extra_message').text('Because of the large size, we recommend to use  background processing. You will receive email when it is done.');
-  $('#extra_message').addClass('message');
-}
-  }
-
-});
-
-  $('input').each(function( i ) {
-  $(this).change(function() {
-  if ($(this).attr('type') == 'checkbox') {
-    data.set($(this).attr('name'),$(this).prop('checked'));
-    console.log($(this).attr('id'),$(this).attr('name'),$(this).prop('checked'));
-  } else {
-    data.set($(this).attr('name'),$(this).val());
-      if ($(this).attr('id') == 'id_file') {
-        data.set("file",this.files[0]);
-    }
-    console.log($(this).attr('id'),$(this).attr('name'),$(this).val());
-  };
-      });});
-
-  $('textarea').each(function( i ) {
-  $(this).change(function() {
-    data.set($(this).attr('name'),$(this).val());
-    console.log($(this).attr('id'),$(this).attr('name'),$(this).val());
-  });});
-
-  $('select').each(function( i ) {
-  console.log($(this).attr('name'),$(this).val());
-  $(this).change(function() {
-  data.set($(this).attr('name'),$(this).val());
-  console.log($(this).attr('id'),$(this).attr('name'),$(this).val());
-  });
-  });
-
-      frm.submit(function() {
-  console.log("Form submission");
-  $(data.values()).each(function(value) {
-  console.log(value);
-  });
-
-  $("#id_main").replaceWith(
-  '<div id="id_waiting"><img src="/static/img/rowingtimer.gif" width="60" height="50" style="width:60px">'
-  );
-  $.ajax({
-    data: data,
-    type: $(this).attr('method'),
-    url: '/rowers/workout/upload/',
-    contentType: false,
-    processData: false,
+	  var csrftoken = jQuery("[name=csrfmiddlewaretoken]").val();
+	  console.log("CSRF token",csrftoken);
+	  
+	  function csrfSafeMethod(method) {
+	      // these HTTP methods do not require CSRF protection
+	      return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));
+	  }
+	  $.ajaxSetup({
+	      beforeSend: function(xhr, settings) {
+		  if (!csrfSafeMethod(settings.type) && !this.crossDomain) {
+		      xhr.setRequestHeader("X-CSRFToken", csrftoken);
+		  }
+	      }
+	  });
+	  console.log("Loading dropper");
+	  jQuery.event.props.push('dataTransfer');
+	  
+	  $(window).on('dragenter', function() {
+	      $("#id_drop-files").css("background-color","#E9E9E4");
+	      $("#id_dropregion").addClass("watermark").removeClass("invisible");})
+	  
+	  $(window).on('dragleave', function() {
+	      $("#id_drop-files").css("background-color","#FFFFFF");
+	      $("#id_dropregion").removeClass("watermark").addClass("invisible");})
+	  
+	  var frm = $("#file_form");
+	  
+	  if( window.FormData === undefined ) {
+	      console.log('no formdata');
+	      alert("No FormData");
+	  } else {
+	      console.log('we have formdata');
+	  }
+	  
+	  var data = new FormData(frm[0]);
+	  
+	  $('#id_file').on('change', function(evt) {
+	      var f = this.files[0];
+	      console.log(f);
+	      var istcx = false;
+	      var isgzip = false;
+	      var size1 = 10485760;
+	      var size2 = 2097152;
+	      if ((/\.(tcx|TCX)/i).test(f.name)) {
+		  istcx = true;
+		  console.log('tcx');
+		  if ((/\.(gz|GZ)/i).test(f.name)) {
+		      isgzip = true;
+		      console.log('gzip');
+		      size1 /= 5;
+		      size2 /= 5;
+		  }
+	      }
+	      console.log(size1)
+	      console.log(size2)
+	      if (f.size > size1) {
+		  alert("File Size must be smaller than 10 MB");
+		  this.value = null;
+	      } else {
+		  
+		  if (f.size > size2) {
+		      $('#id_offline').val('True');
+		      $('#id_offline').prop('checked','True');
+		      data.set($('#id_offline').attr('name'),$('#id_offline').prop('checked'));
+		      console.log("Set offline to True");
+		      $('#extra_message').text('Because of the large size, we recommend to use  background processing. You will receive email when it is done.');
+		      $('#extra_message').addClass('message');
+		  }
+	      }
+	      
+	  });
+	  
+	  $('input').each(function( i ) {
+	      $(this).change(function() {
+		  if ($(this).attr('type') == 'checkbox') {
+		      data.set($(this).attr('name'),$(this).prop('checked'));
+		      console.log($(this).attr('id'),$(this).attr('name'),$(this).prop('checked'));
+		  } else {
+		      data.set($(this).attr('name'),$(this).val());
+		      if ($(this).attr('id') == 'id_file') {
+			  data.set("file",this.files[0]);
+		      }
+		      console.log($(this).attr('id'),$(this).attr('name'),$(this).val());
+		  };
+	      });});
+	  
+	  $('textarea').each(function( i ) {
+	      $(this).change(function() {
+		  data.set($(this).attr('name'),$(this).val());
+		  console.log($(this).attr('id'),$(this).attr('name'),$(this).val());
+	      });});
+	  
+	  $('select').each(function( i ) {
+	      console.log($(this).attr('name'),$(this).val());
+	      $(this).change(function() {
+		  data.set($(this).attr('name'),$(this).val());
+		  console.log($(this).attr('id'),$(this).attr('name'),$(this).val());
+	      });
+	  });
+	  
+	  frm.submit(function() {
+	      console.log("Form submission");
+	      $(data.values()).each(function(value) {
+		  console.log(value);
+	      });
+	      
+	      $("#id_main").replaceWith(
+		  '<div id="id_waiting"><img src="/static/img/rowingtimer.gif" width="60" height="50" style="width:60px">'
+	      );
+	      $.ajax({
+		  data: data,
+		  type: $(this).attr('method'),
+		  url: '/rowers/workout/upload/',
+		  contentType: false,
+		  processData: false,
     error: function(result) {
-    $("#id_waiting").replaceWith(
+	$("#id_waiting").replaceWith(
     '<div id="id_failed" class="grid_12 alpha message">Your upload failed</div>'
-    );
+	);
     setTimeout(function() {
-    location.reload();
+	location.reload();
     },1000);
     },
-    success: function(result) {
-    console.log('got something back');
-        console.log(result);
-    if (result.result == 1) {
-        window.location.href = result.url;
-        } else {
-        console.log(result," reloading");
-        location.reload();
-        };
-    }
-    });
-  return false;
-    });
-
-
-    $('#id_drop-files').bind({
-  drop: function(e) {
-  e.preventDefault();
-  console.log("you dropped something");
-  var files = e.dataTransfer.files;
-  console.log(files[0]);
-
-    var f = files[0];
-    var istcx = false;
-    var isgzip = false;
-    var size1 = 10485760;
-    var size2 = 1048576;
-    if ((/\.(tcx|TCX)/i).test(f.name)) {
-    istcx = true;
-    console.log('tcx');
-    if ((/\.(gz|GZ)/i).test(f.name)) {
-    isgzip = true;
-    console.log('gzip');
-    size1 /= 5;
-    size2 /= 5;
-    }
-    }
-    console.log(f);
-    console.log(size1)
-    console.log(size2)
-    if (f.size > size1) {
-    alert("File Size must be smaller than 10 MB");
-    $("#id_file").value = 0;
-    return false;
-    }
-    if (f.size > size2) {
+		  success: function(result) {
+		      console.log('got something back');
+		      console.log(result);
+		      if (result.result == 1) {
+			  window.location.href = result.url;
+		      } else {
+			  console.log(result," reloading");
+			  location.reload();
+		      };
+		  }
+	      });
+	      return false;
+	  });
+	  
+	  
+	  $('#id_drop-files').bind({
+	      drop: function(e) {
+		  e.preventDefault();
+		  console.log("you dropped something");
+		  var files = e.dataTransfer.files;
+		  console.log(files[0]);
+		  
+		  var f = files[0];
+		  var istcx = false;
+		  var isgzip = false;
+		  var size1 = 10485760;
+		  var size2 = 1048576;
+		  if ((/\.(tcx|TCX)/i).test(f.name)) {
+		      istcx = true;
+		      console.log('tcx');
+		      if ((/\.(gz|GZ)/i).test(f.name)) {
+			  isgzip = true;
+			  console.log('gzip');
+			  size1 /= 5;
+			  size2 /= 5;
+		      }
+		  }
+		  console.log(f);
+		  console.log(size1)
+		  console.log(size2)
+		  if (f.size > size1) {
+		      alert("File Size must be smaller than 10 MB");
+		      $("#id_file").value = 0;
+		      return false;
+		  }
+		  if (f.size > size2) {
     $('#id_offline').val('True');
-    $('#id_offline').prop('checked','True');
-    data.set($('#id_offline').attr('name'),$('#id_offline').prop('checked'));
-    console.log("Set offline to True");
-    $('#extra_message').text('Because of the large size, we recommend to use  background processing. You will receive email when it is done.');
-    $('#extra_message').addClass('message');
-        }
-        data.set("file",f);
-//    data.append("file",f);
-
-        $("#id_file").replaceWith('<div id="id_file">'+files[0].name+'&nbsp; <a class="remove" href="javascript:void(0);"><b><font color="red">X</font></b></a></div>');
-  },
-  mouseenter:function(){$("#id_drop-files").css("background-color","#E9E9E4");},
-  mouseleave:function(){$("#id_drop-files").css("background-color","#FFFFFF");},
-  dragover:function(e){
-  e.preventDefault();
-  $("#id_drop-files").css("background-color","#E9E9E4");},
-  dragleave:function(e){ e.preventDefault();},
-    });
-    $(document).on("click", "a.remove", function() {
-    $(this).parent().replaceWith('<td><input id="id_file" name="file" type="file" /></td>');
-    });
-  });
-};
-    </script>
-    {% endblock %}
+		      $('#id_offline').prop('checked','True');
+		      data.set($('#id_offline').attr('name'),$('#id_offline').prop('checked'));
+		      console.log("Set offline to True");
+		      $('#extra_message').text('Because of the large size, we recommend to use  background processing. You will receive email when it is done.');
+		      $('#extra_message').addClass('message');
+		  }
+		  data.set("file",f);
+		  //    data.append("file",f);
+		  
+		  $("#id_file").replaceWith('<div id="id_file">'+files[0].name+'&nbsp; <a class="remove" href="javascript:void(0);"><b><font color="red">X</font></b></a></div>');
+	      },
+	      mouseenter:function(){$("#id_drop-files").css("background-color","#E9E9E4");},
+	      mouseleave:function(){$("#id_drop-files").css("background-color","#FFFFFF");},
+	      dragover:function(e){
+		  e.preventDefault();
+		  $("#id_drop-files").css("background-color","#E9E9E4");},
+	      dragleave:function(e){ e.preventDefault();},
+	  });
+	  $(document).on("click", "a.remove", function() {
+	      $(this).parent().replaceWith('<td><input id="id_file" name="file" type="file" /></td>');
+	  });
+      });
+  };
+  </script>
+{% endblock %}
 
 
-    {% block sidebar %}
-    {% include 'menu_workouts.html' %}
-    {% endblock %}
+{% block sidebar %}
+{% include 'menu_workouts.html' %}
+{% endblock %}
diff --git a/rowers/templates/team_document_form.html b/rowers/templates/team_document_form.html
index 54260f6d..c011697e 100644
--- a/rowers/templates/team_document_form.html
+++ b/rowers/templates/team_document_form.html
@@ -76,22 +76,82 @@
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
 <script>
-$( document ).ready(function() {
-    $('#id_workouttype').on('change', function(){
-        if (
-            $(this).val() == 'water'
-            || $(this).val() == 'coastal'
-            || $(this).val() == 'c-boat'
-            || $(this).val() == 'churchboat'
-        ) {
-            $('#id_boattype').toggle(true);
-        } else { 
-            $('#id_boattype').toggle(false);
-            $('#id_boattype').val('1x');        
-        }
-});
-$('#id_workouttype').change(); 
-});
+  $( 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',	  
+      }
 
-</script>
+      $('#id_workouttype').on('change', function(){
+          if (
+              $(this).val() == 'water'
+		  || $(this).val() == 'coastal'
+		  || $(this).val() == 'c-boat'
+		  || $(this).val() == 'churchboat'
+          ) {
+              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 %}
diff --git a/rowers/templates/workout_join_select.html b/rowers/templates/workout_join_select.html
index 4baa15d5..5b58836d 100644
--- a/rowers/templates/workout_join_select.html
+++ b/rowers/templates/workout_join_select.html
@@ -16,58 +16,93 @@
 </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)',
+      }
+      
+      var ergtypes = {
+	  'static': 'Concept2 static',
+	  'dynamic': 'Concept2 dynamic',
+	  'slides': 'Concept2 slides',
+	  'rp3': 'RP3',
+	  'waterrower': 'Water Rower',
+	  'other': 'Other Indoor Rower',	  
+      }
 
-  // Get the form fields and hidden div
-  var modality = $("#id_modality");
-  var hidden = $("#id_waterboattype");
-
-
-  // Hide the fields.
-  // Use JS to do this in case the user doesn't have JS
-  // enabled.
-
-  hidden.hide();
-
-
-
-  // Setup an event listener for when the state of the
-  // checkbox changes.
-  modality.change(function() {
-    // 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
-  // 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("");
-    }
+      $('#id_modality').on('change', function(){
+          if (
+              $(this).val() == 'water'
+		  || $(this).val() == 'coastal'
+		  || $(this).val() == 'c-boat'
+		  || $(this).val() == 'churchboat'
+          ) {
+              var $el = $('#id_waterboattype');
+	      $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_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() {
-		if (this.checked) {
-			$("#id_killparentswarning").html("<p><em>Warning: Deleted workouts cannot be recovered</em></p>");
+    console.log('kill parents')
+    $("#id_killparents").change(function() {
+	if (this.checked) {
+	    $("#id_killparentswarning").html("<p><em>Warning: Deleted workouts cannot be recovered</em></p>");
 	};
-
-});
+	
+    });
 });
 </script>
 
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index cb21fdd402fb85a04b0f834d9c41cb3e34098d1b..f3b3717493a93eea0ecf925869aa69f73a34cab3 100644
GIT binary patch
literal 3999
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
F0RSXYLlFP~

literal 4000
zcmV;R4`1*fiwFpE0kLHQ|8!+@bYx+4VJ>uIcmVC4TW=Ic7J%RR6&4T4!zwlBQl~DC
zaYP`iMFKVoD4VxcV<u*H?Xl%)ZvTF(X22M5D;#^fRNX2bkf*0_(_f#ebFYJ+-kqN8
zy;)vtR%h#bchSJzy`K*696Z11R_oRJ_`!1BFE1W;efOf<EcepR>&?BpuloLcf3bM`
z_N_VYE>2f#b98pPNMCM_UM)|%&EopQ7jNk9?iBmoyKgwl{iA;MX4Sv{<z2sA=Nr6o
zf_IzMXJ>fJ=Ir8lK>)b;<H_S^+f)3oT5tMpeY8wRZC3lc^FBU1>iX@kz0nQq>5qCt
z=H2GyUmy7Qu7A*-oL#Jzo5dUa>;3=i`lH?c%gamQw_R!w&`l5B{l>e8clP!UK0JW*
zGxEnz8{Y3dJ3qVV@7?`p|7v-0clTxb`q9fn0(3us{6O#=dEeqbITIamguemo0~{>U
zP9OJw+@0?|>${8o`Ra6e@9tk6dwHRB=<~C_JIRMVTOOUQUv3VC{lVg^t)C8fxZ1rz
zPnPM&Zqj|`d--DHr@cSoJ46fzi_1@+cDSEJtvg=+W0~&$x2|9Qe15upHT(DH>6ct?
zezg91+4Y-Wmlsb~>(~AA-~E*zkxuh_ck+69h&Ekh_vfc8EUvl4m9L+4?^dU;PybIh
zAnuwQxaJa9zJ9dczN-EE!|hwKOk^*&Tz!x)m+1i?66VLa`}+#Ti`DUQy0vBh>g?s=
zlWzUGJ4qBj+j@2H?&!at-TijU`PpjSU)`L)NbkTmyo=l2K0oq{S3-;(eoeLq+>*dm
z3go|{up@Cjg3lf>T=RUlJ6w)lo3AeW{MSFec_z4a4FB?s>74)S`aX$GJXq}h`tq8K
zbkQ$=-u1VbUxe%MYN<1rB<*4q)R7HN1ABhZ6>%q55%&ZU!370(N_ta4?&0R#sV;f9
zQW1A&h*34lry+t1a*wm&?rcTeW0H3(Uc)_>ly`>NaQ78)x3nGSor1d!h6-}WTX4s!
zxCf|+yCm*Os5IKVH*O-_>yr1t6>;|_cyJnh-no)y9MgQb`+B$w7$4AT<lT#riEyuM
zoUh1^6E+cS)Nl_{(te+lyoZXoJL7;rqt`_#s?X0y-VrKN>?9gyotqY+EP1{Kd8&&%
zRWrrYJ|t64bfz4ll=R)OosZ13R7BpIn3Q^z%#)Z<ki5)@e5{CkGUo(2sKPU@s2%U-
zL*BZ2$RikMkyJ9DjQ^6JJ3pU!UZ5iKY%HU&hJ0b)U7Qhls))QZ=yXmTbiU*~Z=sF$
zqmU0Kl2}c64t*%;zq=LrHrfx8Cp3=0t48}!mi&AobSM>Bb!3eIqDsSyv7|jeC-OE_
zL_X>1OsGn}f><(2XK6;GJyt|Mnt<S~D($Y3p8<I$<03{C`J9|vko=7N_BD<6EQTF;
z%{))GEO|R4@)bpFI2Zu%q9HF(GCFT><G1H#)eVtP@@pNc(y&NkNgv*<$XDdUvuqgA
zYNE8{i)Pq2@*|OV2CR~NfXT>wZS#CZQCb^}Pp_iNo{wOB)9|J~&kLF)@+y0t0g6U!
zW;EK@B=cfTdbU6s@`#hs?OT*~n7lJyFleH*Ojy*OpA-3t?D=e=u~p6U%xL07$YY!5
zuP4tr_m%-k<H<=cO3AEi>zdzw6!Kz#A*f_tsA$BdkspV=Hz7$pYREfoGJiwzTn~8!
zBLRY{Nrva5GVhyiKMHv^Y*AG6eBh!Qo^LWg3VCNRqNrp(+M?duCiCNv-{#(`TA<mo
z6_vLlkIjcSL_X)<idE_MwroYE4Nc}pA#Y6@>Z3-tx8#b-d}vnPDCE7Nh)(0Zwd{)K
z+lMyVk3pVc+Y(Eo+gt03>h__<=SLw=#xX=y6FezPeohsYt|IbctT3zQc~`WSc2?x2
zBJ#l`?y3w-TehN7pvn9g<Sm+{aXM19JT2PmR%TR1Ew&=^Y`oJ&X>E)pb8_ZHzMdKz
z&bhbFBWgx_L70rpH+z1Vd^8jw1{L|(bo=Q?Y=m;R6jhW~7@BTBeVG?)LelM3GH=Uf
zUB^~SI|_Mkgmn=ck+S5Q4{rqWHo-RNtt#tUTqA!|^0p%KWP;aKSBb~T#OIsL50e*T
z302iq63W)qwH}z`kPn6sRh<(gmaVbzO}8I|Jc5ZxtnuDDz?OSEeVIo#5{NWWT8Gmi
z&&`uFNZ#eFYgH#iM_5$1pA-3-M*C<0F=*oRj;UxBwQuqHG05lK+kipS_tse|ntMAZ
z@)g<hWDPlF)jTgWncQ1$_49+|y+Mnl8tokwwdZF<-cd#5bLRwNO@Djmx#&DUC-N2P
z_DNggh^ke~T;LX^odJ0<0HW%0?jpA+?es@`_C`e43DH9%e^c@m>Gl>3dr^6EJlc{P
z-mUWRnua$_o^$t8mG{;sOE9(!%*m4%<E=wYtj;IhpkS;{a7OlgMe%tXj73IGPL5A+
zi=7Dh+I)DS9`b^@mR7Z<g_olB^K+8<nlwCN<AqS;!}HFS^xMyBp0CKBPx8x=R5do<
zyH-(oL-G|xX(bw90@Y|A++=k7=Di&tFZ+PTD}8uA7F~sWRx&RYk+;TzsAN7s(Y2^&
zCG)N#^4=g2Xso(`VKOq`$Pbf`#-+htGuj6VMeX@HjrO4)@<_&7jGC<Lz_H2v4avuf
z$curX9PMq<l?rF&$*E|xM{m4{s#{8MMOP=CllRtBJ>&^;Z!Fe$azfcPDuo*PQOL7F
z()GX$q3Eh*b0S~UJWpbRVANz_hKNNoGiXNhyswCSFp^|mQ)v-_n#@l<Rww(6#xkig
zGa_;$KlO-BB5w_)e=71+bRC;qf7&uLMj-EV9-gWnUgV<d*od7`_tTolM-v=ImCP5;
z#<H#N?HJ@O87I2xs#rK1YfkIZRurX8@++*=?VT%X)y;`~MV=fR3`GJ>zJ2t*=xFcS
zTGV5Z-{s!w=J^ncT6J?GUy&zAl7+?uD)KQD&B<|Xo*#w0Gr<yTqO=H5HcUGw^cA^s
zB<6&B2rBdh4gC%KpH?&8yWIKKMcsIhz*scp{x;~LGW1drddUq_KsVr9nhbhu{jLYm
z2O~&GD)dP;<cS#dP3i~H=XR!qtV8c?QQJ=1Tt5nWYpkHkhl}8)N&OAcQ$^@~Zjt3t
zg+92+NPT7K+0}zS*=aTqSQYx{i>i5Z8t}0q^ql5;0@YlP5GI4ZwgJB;sdt6}Nj29a
zmMyoL6MC))easqu)Jc8WRSO&XanR>ZsE$>cS(s+5rs2;3z2pI36|zMXDjKbylbTnN
zamT@s$Dq>i(KT=0O^v%y5BfBAgUkK#H0XWNKDf8a$b@Fx4WhROfLJH>!A=G}Hsfv(
zy-(<MO*C>gS5frb(2s&XnrM|S9RgR>xTEIH8v}h()+6f5ZjiF$ze)Y%(Tj0ji=N81
zN}H3^Lq+I=5g}CrY@}on`i6emE*+mcV_GMoGVUlT2r`lOIoOt^A4G2rdtLjSyfDUO
zIwv)|ei*$s6eQ>dd=Etn>#?bMW1z<*z{-L<q=1v@h>I;Pa}Yfnbh@rtNU`X`rL!9F
zsUq~wfF)f<E(1?yjhi;t52Ftzin98K(H3>-w7Gs1^n@l7fhs|ZX*z3~H6Q*kdTRnJ
zt8bXyWSXY6ES+KW-gqml((u`qUFU{c&D|L2bB3j$uD+h7Y&#WdYThX5*$80NNxch`
z8St?sXbqxw#-eU5Lu4O|Hcq2v*N=ie8j5Ij8h$7nzTxK08w0(i+&@d_&EpuGnm7Fc
z---cI7G7C|$;9hxOUAA!Xls+kh7_X;JyDzMr;lF1MCHQ8Xqk#e?wSvO9Q16WL(-wQ
zJelRqnj?1@{kCPISE+ecY;);M-;uj*nTTFD*E^X^f>uk*96%qoEfYbv<PBOc&A6Mo
zT_1AGL@R<SN3IR6`sSwSLq+IA?x3aXs$pZ<@C~;Ce+=}9hFP3S>IKR!SI;w2^PnR1
zcH3G(rRGWDHcE4<ueTMU_lB%8Xe$gwy?M3`_+y|aFi4E7LT_O*Ya2Fi-Z1)Yku|B}
z^~oY=Mb<NrdY8LuL>+oZMUA`GRbw3VAxpj24fviXBlT^-A4Jb+g0L=LFTobo@LSM!
z9Q4*WL{xRvkZ7AXZ~Bg0_Qo?=RnXRfn@p-kQ}YJVCp*nL)Me>7bZx+&dTw4q&qgRa
zX*B3*IwcsbjnXiBXDsAIOAUGsZNQ(tBiF`+o=8=A<!qcxrESa78ALB+SnI=g4%%El
z1N35uv}&G*mXSO4!mE&5CSuyALmzN54ON<&H-J9omWhBEb#{HEmX<jK^lSnsy?GwW
zE@up_m(D2YT}B^OcD+X~T5|`@xElq1G#-_C_@2s^U_cAnj)5L2H&jtdJ(n%PfEKhJ
z1-;~kDx{NoD@7xB(A2z9&<DeUK_~U%il%BbHE$I3l#Dx4wpQ@YHAn8$T{<zhOa$$k
zw%+^6%=OfQwu9(%ku`%VeB*;}cKr;{M<dC)(@A~wld<cmsd+=_nT%Mg3*Q6?&90vT
zddY=XphJ&E(dVUt+JHX-`e1-j*AGAB<o$`Dr{>KYLZ4T%1`Im%94CXmtzSQko=p(a
zMefpzQc}auohTam5zss1*+!L1CpawW(wP-{sR(_{YubWN>OB@6@O>-67z4eKaTbFr
zODBY)mA1D+-)ioL(Mztr395|T5Q|pY-fF;ay>y1rhrFh(E^-&4=wfHH((r4^(h=CM
zWDV$5j@*bc8J7;UzIlV_w<}re*13yRHfRfNt{(-x&($|d^z0|Ix@DW|2hr!1tQkq=
z&5PC-t-hhwH*Xa5yj{dxW!y!HZFS3ud-F1SmkY0y=v^!-^{r9rIOt<8ywchAF+gjc
zHgRuWLcd+fS{b>E5nE^M8KAc&&Gf1TPza#)$h|3gKNk8ATR(0%SUm2|FF!mz>zA9u
z?@sz3e>qv6F4z6u_uEb1?{)niyz_s)h-u{STo>WH<Nn8k#qNMRyEA?KjrsHCr`7KJ
zg9jIh<JrZBeV=ye?YTI6yXn?1yOWdc(@Gy#>*JSQ-=*_*ySFP*`E=aD{n!1gvx_UQ
z$^G;5lhskzr=NcLVqBj4tCOYgetx|=d3pJBe^2jYI`qoJ`LN|l_n&mh>@2wY`Rm<Q
z>$KU+r~S4YE+6d|=RbI!Zu;=I<;k+!EE9+P>BFPDa$g6JyY=y-hljsB&1|-R?zaD$
z-r}dPPhTw4odNs+u>1dDapjBMlixn3!#i8lt95z~4-(4d#l!S8UZhJO-uWL7liR<<
GfB^u+z$3x{

diff --git a/rowers/uploads.py b/rowers/uploads.py
index 36b6ceac..781271f7 100644
--- a/rowers/uploads.py
+++ b/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
 
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 1b2705ac..e2134167 100644
--- a/rowers/views/workoutviews.py
+++ b/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))