Merge branch 'hotfix/v3.68'

rowers/dataprep.py

@@ -568,7 +568,10 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
 
     workoutdate = row.rowdatetime.strftime('%Y-%m-%d')
     workoutstarttime = row.rowdatetime.strftime('%H:%M:%S')
-    workoutstartdatetime = thetimezone.localize(row.rowdatetime).astimezone(utc)
+    try:
+        workoutstartdatetime = thetimezone.localize(row.rowdatetime).astimezone(utc)
+    except ValueError:
+        workoutstartdatetime = row.rowdatetime
 
     if makeprivate:
         privacy = 'hidden'

rowers/stravastuff.py

@@ -30,6 +30,8 @@ from rowingdata import rowingdata
 import pandas as pd
 from rowers.models import Rower,Workout
 from rowers.models import checkworkoutuser
+import dataprep
+from dataprep import columndict
 
 import stravalib
 from stravalib.exc import ActivityUploadFailed,TimeoutExceeded
@@ -247,8 +249,25 @@ def get_strava_workout(user,stravaid):
 # Generate Workout data for Strava (a TCX file)
 def createstravaworkoutdata(w,dozip=True):
     filename = w.csvfilename
+    try:
+        row = rowingdata(filename)
+    except IOError:
+        data = dataprep.read_df_sql(w.id)
+        try:
+            datalength = len(data)
+        except AttributeError:
+            datalength = 0
 
-    row = rowingdata(filename)
+        if datalength != 0:
+            data.rename(columns = columndict,inplace=True)
+            res = data.to_csv(w.csvfilename+'.gz',
+                              index_label='index',
+                              compression='gzip')
+            try:
+                row = rowingdata(filename)
+            except IOError:
+                return '','Error - could not find rowing data'
+        
     tcxfilename = filename[:-4]+'.tcx'
     try:
         newnotes = w.notes+'\n from '+w.workoutsource+' via rowsandall.com'