Merge branch 'feature/multitests' into develop

rowers/tests/test_models.py

@@ -283,15 +283,26 @@ class ListWorkoutTest(TestCase):
 
     @patch('rowers.dataprep.create_engine')
     @patch('rowers.dataprep.getsmallrowdata_db')
-    def list_workouts(self, mocked_sqlalchemy,
+    def test_list_workouts(self, mocked_sqlalchemy,
                               mocked_getsmallrowdata_db):
 
         login = self.c.login(username=self.u.username, password=self.password)
         self.assertTrue(login)
 
+        startdate = (self.user_workouts[0].startdatetime-datetime.timedelta(days=3)).date()
+        enddate = (self.user_workouts[0].startdatetime+datetime.timedelta(days=3)).date()
+
+        form_data = {
+            'startdate':startdate,
+            'enddate':enddate,
+            }
+
+        workouts = Workout.objects.filter(startdatetime__gte=startdate,
+                                          startdatetime__lte=enddate)
+
         url = '/rowers/list-workouts/'
 
-        response = self.c.get(url)
+        response = self.c.post(url, form_data)
         self.assertEqual(response.status_code,200)
 
         

rowers/views.py

@@ -7312,6 +7312,7 @@ def boxplot_view_data(request,userid=0,
 
     workouts = []
 
+
     if not ids:
         return JSONResponse({
             "script":'',
@@ -7343,6 +7344,7 @@ def boxplot_view_data(request,userid=0,
     datadf,extracols = dataprep.read_cols_df_sql(ids,fieldlist)
 
 
+    
     datadf = dataprep.clean_df_stats(datadf,workstrokesonly=workstrokesonly)
 
     datadf = dataprep.filter_df(datadf,'spm',spmmin,
@@ -7716,6 +7718,7 @@ def workouts_view(request,message='',successmessage='',
                                            g_enddate,
                                            stack=stack)
 
+    
     messages.info(request,successmessage)
     messages.error(request,message)