Merge branch 'release/v10.47'

rowers/dataprep.py

@@ -2534,9 +2534,11 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
     if id != 0:
         data['workoutid'] = id
         data.fillna(0,inplace=True)
-        data = data.astype(
-            dtype=dtypes,
-             )
+        for k, v in dtypes.items():
+            try:
+                data[k] = data[k].astype(v)
+            except KeyError:
+                pass
 
 
         filename = 'media/strokedata_{id}.parquet.gz'.format(id=id)

rowers/dataprepnodjango.py

@@ -1254,7 +1254,13 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
     # write data if id given
     if id != 0:
         data['workoutid'] = id
-        data = data.astype(dtype=dtypes)
+        data.fillna(0,inplace=True)
+        for k, v in dtypes.items():
+            try:
+                data[k] = data[k].astype(v) 
+            except KeyError:
+                pass
+
         filename = 'media/strokedata_{id}.parquet.gz'.format(id=id)
         df = dd.from_pandas(data,npartitions=1)
         df.to_parquet(filename,engine='fastparquet',compression='GZIP')

rowers/tests/test_plans.py

@@ -243,7 +243,7 @@ class SessionLinkTest(TestCase):
         self.assertEqual(response.status_code,200)
 
         url2 = '/rowers/sessions/manage/'
-        response = self.c.post(url2,post_data)
+        response = self.c.get(url2,post_data)
         self.assertEqual(response.status_code,200)
 
         pss = PlannedSession.objects.filter(startdate=startdate,enddate=enddate)
@@ -265,6 +265,13 @@ class SessionLinkTest(TestCase):
         plannedsessionstuple = tuple(plannedsessionstuple)
 
 
+        url2 += '?startdate={startdate}&enddate={enddate}'.format(
+            startdate=startdate.strftime("%Y-%m-%d"),
+            enddate = enddate.strftime("%Y-%m-%d"),
+        )
+
+
+
         workoutdata = {}
         workoutdata['initial'] = []
 

rowers/views/planviews.py

@@ -1337,6 +1337,7 @@ def plannedsessions_manage_view(request,userid=0,
                     messages.error(request,er)
 
 
+
     ps_form = PlannedSessionSelectForm(plannedsessionstuple,
                                        initialsession=initialsession)
     w_form = WorkoutSessionSelectForm(workoutdata=workoutdata)