Merge branch 'feature/errors' into develop

rowers/models.py

@@ -106,7 +106,7 @@ class TemplateListField(models.TextField):
 
         return value.split(self.token)
 
-    def from_db_value(self,value, expression, connection, context):
+    def from_db_value(self,value, expression, connection):
         if value is None:
             return value
         if isinstance(value, list):
@@ -149,7 +149,7 @@ class PowerZonesField(models.TextField):
 
         return value.split(self.token)
 
-    def from_db_value(self,value, expression, connection, context):
+    def from_db_value(self,value, expression, connection):
         if value is None:
             return value
         if isinstance(value, list):
@@ -3030,7 +3030,6 @@ strokedatafields = {
     'hr_an':models.IntegerField(null=True),
     'hr_max':models.IntegerField(null=True),
     'hr_bottom':models.IntegerField(null=True),
-    'x_right':models.FloatField(null=True),
     'ergpace':models.FloatField(null=True),
     'nowindpace':models.FloatField(null=True),
     'equivergpower':models.FloatField(null=True),

rowers/ownapistuff.py

@@ -190,7 +190,7 @@ def get_ownapi_workout(user,ownapiid):
 
 def createownapiworkoutdata(w):
     filename = w.csvfilename
-    row = rowingdata(filename)
+    row = rowingdata(csvfile=filename)
     averagehr = int(row.df[' HRCur (bpm)'].mean())
     maxhr = int(row.df[' HRCur (bpm)'].max())
 
@@ -283,5 +283,3 @@ def getidfromresponse(response):
     id = uri[len(uri)-13:len(uri)-5]
 
     return int(id)
-
-    

rowers/runkeeperstuff.py

@@ -111,7 +111,7 @@ def get_workout(user,runkeeperid):
 def createrunkeeperworkoutdata(w):
     filename = w.csvfilename
     try:
-        row = rowingdata(filename)
+        row = rowingdata(csvfile=filename)
     except:
         return 0
 
@@ -505,4 +505,3 @@ def add_workout_from_data(user,importid,data,strokedata,source='runkeeper',
                                                 notes=comments)
 
     return (id,message)
-

rowers/sporttracksstuff.py

@@ -120,7 +120,7 @@ def createsporttracksworkoutdata(w):
 
     filename = w.csvfilename
     try:
-        row = rowingdata(filename)
+        row = rowingdata(csvfile=filename)
     except:
         return 0
 

rowers/stravastuff.py

@@ -388,7 +388,7 @@ def get_workout(user,stravaid):
 def createstravaworkoutdata(w,dozip=True):
     filename = w.csvfilename
     try:
-        row = rowingdata(filename)
+        row = rowingdata(csvfile=filename)
     except IOError:
         data = dataprep.read_df_sql(w.id)
         try:
@@ -402,7 +402,7 @@ def createstravaworkoutdata(w,dozip=True):
                               index_label='index',
                               compression='gzip')
             try:
-                row = rowingdata(filename)
+                row = rowingdata(csvfile=filename)
             except IOError:
                 return '','Error - could not find rowing data'
         else:

rowers/tpstuff.py

@@ -97,7 +97,7 @@ def getidfromresponse(response):
 
 def createtpworkoutdata(w):
     filename = w.csvfilename
-    row = rowingdata(filename)
+    row = rowingdata(csvfile=filename)
     tcxfilename = filename[:-4]+'.tcx'
     try:
         newnotes = w.notes+'\n from '+w.workoutsource+' via rowsandall.com'

rowers/underarmourstuff.py

@@ -97,7 +97,7 @@ def get_workout(user,underarmourid):
 def createunderarmourworkoutdata(w):
     filename = w.csvfilename
     try:
-        row = rowingdata(filename)
+        row = rowingdata(csvfile=filename)
     except:
         return 0
 
@@ -540,4 +540,3 @@ def add_workout_from_data(user,importid,data,strokedata,
                                                 notes=comments)
 
     return (id,message)
-