Merge tag 'nkempowerplots' into develop

NK EMpower plots

rowers/templates/about_us.html

@@ -94,14 +94,18 @@ and inspired by the RowPro Dan Burpee spreadsheet
 
 <p>Beyond the basics, rowsandall.com provides a rich tool set for
   OTW rowing.  You can use it to estimate stroke power and to correct
-  for the effects of wind and current.  For indoor rowing, when used
-  with painsled, the tools enable graphical analsis of stroke metrics
+  for the effects of wind and current.  For indoor rowing, when
+  used with painsled, and OTW rowing, when used
+  with a NK Empower Oarlock, 
+  the tools enable graphical analsis of stroke metrics
   including:
 <ul>
 <li> Peak and average force</li>
 <li> drive length</li>
 <li> work per stroke</li>
 <li> drive and recovery time</li>
+<li> catch and finish angles (OTW)</li>
+<li> slip and wash (OTW)</li>
 </ul>
 
 These can be analyzed versus time, distance, stroke rate or other
@@ -138,6 +142,8 @@ You will be taken to the secure PayPal payment site.
 
 <p>
   <ul>
+    <li>2016-12-01 Support for NK Empower Oarlock parameters (catch and
+    finish angles, slip and wash, and power as measured by the Oarlock</li>
     <li>2016-11-10 Power based Pie Charts</li>
     <li>2016-11-01 Sliders to select subsets of data on some plots</li>
     <li>2016-11-01 Emailing workouts to workouts@rowsandall.com </li>
@@ -155,7 +161,7 @@ You will be taken to the secure PayPal payment site.
     <li>2016-06-08 Added possibility to upload CrewNerd summary CSV file for Premium Members</li>
     <li>2016-06-08 Added workout summaries</li>
     <li>2016-06-05 Export to Strava is working</li>
-    <li>2016-06-01 We're approved on the Concept2 logbook!!!!
+    <li>2016-06-01 We're approved on the Concept2 logbook!!!!</li>
   </ul>
 </p>
 

rowers/tests.py

@@ -690,6 +690,37 @@ class ViewTest(TestCase):
 	os.remove(f_to_be_deleted)
 
 
+    def test_upload_view_SpeedCoach2v127intervals(self):
+	self.c.login(username='john',password='koeinsloot')
+	
+	filename = 'C:\\python\\rowingdata\\testdata\\SpeedCoach2Link_interval.csv'
+	f = open(filename,'rb')
+	file_data = {'file': f}
+
+	form_data = {
+	    'title':'test',
+	    'workouttype':'water',
+	    'notes':'aap noot mies',
+	    'make_plot':False,
+	    'upload_to_c2':False,
+	    'plottype':'timeplot',
+	    'file': f,
+	    }
+
+	form = DocumentsForm(form_data,file_data)
+
+	response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
+	f.close()
+	self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
+			     status_code=302,target_status_code=200)
+
+	self.assertEqual(response.status_code, 200)
+
+	w = Workout.objects.get(id=1)
+	f_to_be_deleted = w.csvfilename
+	os.remove(f_to_be_deleted)
+
+
     def test_upload_view_TCX_NoHR(self):
 	self.c.login(username='john',password='koeinsloot')