From da7f679c308d0e4d497e68c16e2812a32a90945b Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 28 Nov 2016 17:58:32 +0100
Subject: [PATCH] boatcoach

---
 rowers/mailprocessing.py |  6 +++++-
 rowers/models.py         |  1 -
 rowers/tests.py          | 27 +++++++++++++++++++++++++++
 rowers/views.py          |  9 +++++++++
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/rowers/mailprocessing.py b/rowers/mailprocessing.py
index b004cd39..90678217 100644
--- a/rowers/mailprocessing.py
+++ b/rowers/mailprocessing.py
@@ -11,7 +11,7 @@ from rowingdata import rower as rrower
 from rowingdata import main as rmain
 from rowingdata import rowingdata as rrdata
 from rowingdata import TCXParser,RowProParser,ErgDataParser,TCXParserNoHR
-from rowingdata import MysteryParser
+from rowingdata import MysteryParser,BoatCoachParser
 from rowingdata import painsledDesktopParser,speedcoachParser,ErgStickParser
 from rowingdata import SpeedCoach2Parser,FITParser,fitsummarydata
 from rowingdata import make_cumvalues
@@ -131,6 +131,10 @@ def make_new_workout_from_email(rr,f2,name,cntr=0):
 	if (fileformat == 'ergdata'):
 	    row = ErgDataParser('media/'+f2)
 
+	# handle BoatCoach
+	if (fileformat == 'boatcoach'):
+	    row = BoatCoachParser('media/'+f2)
+
 	# handle painsled desktop
 	if (fileformat == 'painsleddesktop'):
 	    row = painsledDesktopParser('media/'+f2)
diff --git a/rowers/models.py b/rowers/models.py
index c3b7bfc0..62d9897b 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -77,7 +77,6 @@ class Rower(models.Model):
 
     team = models.ForeignKey(Team,blank=True,null=True)
 
-
     def __str__(self):
 	return self.user.username
 
diff --git a/rowers/tests.py b/rowers/tests.py
index a556c64c..d162a5ee 100644
--- a/rowers/tests.py
+++ b/rowers/tests.py
@@ -851,6 +851,33 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
 	os.remove(f_to_be_deleted)
 
+    def test_upload_view_sled_boatcoach(self):
+	self.c.login(username='john',password='koeinsloot')
+	
+	filename = 'C:\\python\\rowingdata\\testdata\\boatcoach.csv'
+	f = open(filename,'rb')
+	file_data = {'file': f}
+	form_data = {
+	    'title':'test',
+	    'workouttype':'rower',
+	    '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)
+	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_sled_ergstick(self):
 	self.c.login(username='john',password='koeinsloot')
 	
diff --git a/rowers/views.py b/rowers/views.py
index dd72faee..06ec779b 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -47,6 +47,7 @@ from rowingdata import rower as rrower
 from rowingdata import main as rmain
 from rowingdata import rowingdata as rrdata
 from rowingdata import TCXParser,RowProParser,ErgDataParser,TCXParserNoHR
+from rowingdata import BoatCoachParser
 from rowingdata import MysteryParser
 from rowingdata import painsledDesktopParser,speedcoachParser,ErgStickParser
 from rowingdata import SpeedCoach2Parser,FITParser,fitsummarydata
@@ -3563,6 +3564,10 @@ def workout_upload_view(request,message=""):
 		    if (fileformat == 'ergdata'):
 			row = ErgDataParser(f2)
 
+		    # handle BoatCoach
+		    if (fileformat == 'boatcoach'):
+			row = BoatCoachParser(f2)
+
 		    # handle painsled desktop
 		    if (fileformat == 'painsleddesktop'):
 			row = painsledDesktopParser(f2)
@@ -3851,6 +3856,10 @@ def workout_upload_view_debug(request,message=""):
 		if (fileformat == 'ergdata'):
 		    row = ErgDataParser(f2)
 
+		# handle BoatCoach
+		if (fileformat == 'boatcoach'):
+		    row = BoatCoachParser(f2)
+
 
 		# handle painsled desktop
 		if (fileformat == 'painsleddesktop'):