Initial updates (rowerpowerform) and ftp everywhere rrower is called

rowers/tests.py

@@ -235,7 +235,7 @@ class DataTest(TestCase):
 	
 	rr = rrower(hrmax=r.max,hrut2=r.ut2,
 		    hrut1=r.ut1,hrat=r.at,
-		    hrtr=r.tr,hran=r.an)
+		    hrtr=r.tr,hran=r.an,ftp=r.ftp)
 	row = rdata(filename,rower=rr)
 	totaldist = row.df['cum_dist'].max()
 	totaltime = row.df['TimeStamp (sec)'].max()-row.df['TimeStamp (sec)'].min()
@@ -871,6 +871,7 @@ class PlotTests(TestCase):
 	    'hrat':r.at,
 	    'hrtr':r.tr,
 	    'hran':r.an,
+	    'ftp':r.ftp,
 	    }
 
 
@@ -971,6 +972,16 @@ class PlotTests(TestCase):
 			   filename=fullpathimagename)
 	os.remove(fullpathimagename)
 
+	plotnr = 13
+	if (w.workouttype=='water'):
+	    plotnr = plotnr+3
+		    
+	res = handle_makeplot(f1,w.csvfilename,
+			      w.name,self.hrdata,plotnr,imagename)
+	i = GraphImage(workout=w,creationdatetime=self.nu,
+			   filename=fullpathimagename)
+	os.remove(fullpathimagename)
+
     def test_otw_plots(self):
 	w = self.wotw
 	f1 = 'testdata.csv'[:-4] 
@@ -1067,3 +1078,23 @@ class PlotTests(TestCase):
 	i = GraphImage(workout=w,creationdatetime=self.nu,
 			   filename=fullpathimagename)
 	os.remove(fullpathimagename)
+
+	plotnr = 9
+	if (w.workouttype=='water'):
+	    plotnr = plotnr+3
+		    
+	res = handle_makeplot(f1,w.csvfilename,
+			      w.name,self.hrdata,plotnr,imagename)
+	i = GraphImage(workout=w,creationdatetime=self.nu,
+			   filename=fullpathimagename)
+	os.remove(fullpathimagename)
+
+	plotnr = 13
+	if (w.workouttype=='water'):
+	    plotnr = plotnr+3
+		    
+	res = handle_makeplot(f1,w.csvfilename,
+			      w.name,self.hrdata,plotnr,imagename)
+	i = GraphImage(workout=w,creationdatetime=self.nu,
+			   filename=fullpathimagename)
+	os.remove(fullpathimagename)