further cleanupp

rowers/templates/alert_delete_confirm.html

@@ -6,20 +6,20 @@
 {% block main %}
 <h1>Confirm Delete</h1>
 <p>This will permanently delete the alert</p>
-  
+
 <ul class="main-content">
   <li class="grid_2">
     <p>
       <form action="" method="post">
         {% csrf_token %}
         <p>Are you sure you want to delete <em>{{ object }}</em>?</p>
-        <input class="button red" type="submit" value="Confirm">
+        <input class="button" type="submit" value="Confirm">
       </form>
     </p>
   </li>
 
 </ul>
-  
+
 
 
 {% endblock %}

rowers/tests/test_analysis.py

@@ -75,104 +75,6 @@ class WorkoutCompareTest(TestCase):
         self.assertEqual(response.status_code,200)
 
 
-class BoxPlotTest(TestCase):
-    def setUp(self):
-        self.u = UserFactory()
-
-        self.r = Rower.objects.create(user=self.u,
-                                      birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,surveydone=True,
-                                      gdproptindate=timezone.now(),
-                                      rowerplan='coach')
-
-        self.c = Client()
-        self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
-
-        self.factory = RequestFactory()
-        self.password = faker.word()
-        self.u.set_password(self.password)
-        self.u.save()
-
-    def tearDown(self):
-        for workout in self.user_workouts:
-            try:
-                os.remove(workout.csvfilename)
-            except (IOError, FileNotFoundError,OSError):
-                pass
-
-    @patch('rowers.dataprep.create_engine')
-    @patch('rowers.dataprep.getsmallrowdata_db')
-    def test_workouts_boxplot(self, mocked_sqlalchemy,
-                              mocked_getsmallrowdata_db):
-
-        login = self.c.login(username=self.u.username, password=self.password)
-        self.assertTrue(login)
-
-        url = '/rowers/user-boxplot-select/'
-
-        response = self.c.get(url)
-        self.assertEqual(response.status_code,200)
-
-    @patch('rowers.dataprep.create_engine')
-    @patch('rowers.dataprep.getsmallrowdata_db')
-    @patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multi)
-    def donot_test_workouts_boxplot_submit(self, mocked_sqlalchemy,
-                                     mocked_getsmallrowdata_db,
-                                     mocked_df):
-
-        login = self.c.login(username=self.u.username,password=self.password)
-        self.assertTrue(login)
-
-        form_data = {
-            'workouts':['1','2','3'],
-            'includereststrokes':False,
-            'spmmax':55.0,
-            'spmmin':15.0,
-            'workmax':1500.0,
-            'workmin':0.0,
-            'yparam':'spm',
-            }
-
-        form = WorkoutMultipleCompareForm(form_data)
-        chartform = BoxPlotChoiceForm(form_data)
-
-        self.assertTrue(form.is_valid())
-        self.assertTrue(chartform.is_valid())
-
-        response = self.c.get('/rowers/user-boxplot/',follow=True)
-        self.assertEqual(response.status_code,200)
-        self.assertRedirects(response,
-                             expected_url='/rowers/user-boxplot-select/user/1/',
-                             status_code=302,target_status_code=200)
-
-        response = self.c.post('/rowers/user-boxplot/',form_data)
-
-        self.assertEqual(response.status_code,200)
-
-        options = {}
-        options['spmmin'] = 15
-        options['spmmax'] = 55
-        options['workmin'] = 0
-        options['workmax'] = 5500
-        options['ids'] = [1,2,3]
-        options['userid'] = 1
-        options['plotfield'] = 'spm'
-        options['rankingonly'] = False
-        options['cpfit'] = 'data'
-        options['piece'] = 4
-
-        session = self.c.session
-        session['options'] = options
-        session.save()
-        response = self.c.get('/')
-
-        sessionoptions = session['options']
-        self.assertEqual(sessionoptions['ids'],[1,2,3])
-
-        response = self.c.get('/rowers/user-boxplot-data/')
-
-
-        self.assertEqual(response.status_code,200)
 
 
 class ListWorkoutTest(TestCase):
@@ -316,382 +218,6 @@ class ForcecurveTest(TestCase):
         response = self.c.get(url)
         self.assertEqual(response.status_code,200)
 
-class CumStatsTest(TestCase):
-    def setUp(self):
-        self.u = UserFactory()
-
-        self.r = Rower.objects.create(user=self.u,
-                                      birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,surveydone=True,
-                                      gdproptindate=timezone.now(),
-                                      rowerplan='coach')
-
-        self.c = Client()
-        self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
-        self.factory = RequestFactory()
-        self.password = faker.word()
-        self.u.set_password(self.password)
-        self.u.save()
-
-    def tearDown(self):
-        for workout in self.user_workouts:
-            try:
-                os.remove(workout.csvfilename)
-            except (IOError, FileNotFoundError,OSError):
-                pass
-
-    @patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multistats)
-    def test_cumstats(self, mocked_df):
-        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()
-
-        # make sure the dates are not naive
-        try:
-            startdate = pytz.utc.localize(startdate)
-        except (ValueError, AttributeError):
-            pass
-        try:
-            enddate = pytz.utc.localize(enddate)
-        except (ValueError, AttributeError):
-            pass
-
-        url = '/rowers/cumstats/'
-        response = self.c.get(url)
-
-        self.assertEqual(response.status_code,200)
-
-class CumFlexTest(TestCase):
-    def setUp(self):
-        self.u = UserFactory()
-
-        self.r = Rower.objects.create(user=self.u,
-                                      birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,surveydone=True,
-                                      gdproptindate=timezone.now(),
-                                      rowerplan='coach')
-
-        self.c = Client()
-        self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
-        self.factory = RequestFactory()
-        self.password = faker.word()
-        self.u.set_password(self.password)
-        self.u.save()
-
-    def tearDown(self):
-        for workout in self.user_workouts:
-            try:
-                os.remove(workout.csvfilename)
-            except (IOError, FileNotFoundError,OSError):
-                pass
-
-    @patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multiflex)
-    def test_cumflex(self, mocked_df):
-        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()
-
-        # make sure the dates are not naive
-        try:
-            startdate = pytz.utc.localize(startdate)
-        except (ValueError, AttributeError):
-            pass
-        try:
-            enddate = pytz.utc.localize(enddate)
-        except (ValueError, AttributeError):
-            pass
-
-        waterboattype = [u'1x',
-                         u'2x',
-                         u'2x+',
-                         u'2-',
-                         u'2+',
-                         u'3x+',
-                         u'3x-',
-                         u'4x',
-                         u'4x+',
-                         u'4-',
-                         u'4+',
-                         u'8+',
-                         u'8x+']
-
-        form_data = {
-            'startdate':startdate,
-            'enddate':enddate,
-            'modality':u'all',
-            'waterboattype': waterboattype,
-            'xaxis':'spm',
-            'yaxis1':'hr',
-            'yaxis2':'power',
-            }
-
-        form = TrendFlexModalForm(form_data)
-        self.assertTrue(form.is_valid())
-
-        self.factory.user = self.u
-        form = FlexAxesForm(self.factory,form_data)
-
-
-        url = '/rowers/flexall/'
-
-        response = self.c.get(url)
-        self.assertEqual(response.status_code,200)
-
-        response = self.c.post(url, form_data)
-        self.assertEqual(response.status_code,200)
-
-
-        options = {'enddatestring': '2019-01-14',
-                   'includereststrokes': False,
-                   'modality': u'water',
-                   'rankingonly': False,
-                   'startdatestring': '2018-12-15',
-                   'theuser': 2,
-                   'waterboattype': [u'1x',
-                                     u'2x',
-                                     u'2x+',
-                                     u'2-',
-                                     u'2+',
-                                     u'3x+',
-                                     u'3x-',
-                                     u'4x',
-                                     u'4x+',
-                                     u'4-',
-                                     u'4+',
-                                     u'8+',
-                                     u'8x+'],
-                   'xparam': u'spm',
-                   'yparam1': u'hr',
-                   'yparam2': u'power'}
-
-        session = self.c.session
-        session['options'] = options
-        session.save()
-        response = self.c.get('/')
-
-        url = '/rowers/flexalldata/'
-        response = self.c.get(url)
-        self.assertEqual(response.status_code, 200)
-
-
-class MultiFlexTest(TestCase):
-    def setUp(self):
-        self.u = UserFactory()
-
-        self.r = Rower.objects.create(user=self.u,
-                                      birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,surveydone=True,
-                                      gdproptindate=timezone.now(),
-                                      rowerplan='coach')
-
-        self.c = Client()
-        self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
-        self.factory = RequestFactory()
-        self.password = faker.word()
-        self.u.set_password(self.password)
-        self.u.save()
-
-    def tearDown(self):
-        for workout in self.user_workouts:
-            try:
-                os.remove(workout.csvfilename)
-            except (IOError, FileNotFoundError,OSError):
-                pass
-
-    @patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multiflex)
-    def test_multiflex(self, mocked_df):
-        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()
-
-        # make sure the dates are not naive
-        try:
-            startdate = pytz.utc.localize(startdate)
-        except (ValueError, AttributeError):
-            pass
-        try:
-            enddate = pytz.utc.localize(enddate)
-        except (ValueError, AttributeError):
-            pass
-
-        waterboattype = [u'1x',
-                         u'2x',
-                         u'2x+',
-                         u'2-',
-                         u'2+',
-                         u'3x+',
-                         u'3x-',
-                         u'4x',
-                         u'4x+',
-                         u'4-',
-                         u'4+',
-                         u'8+',
-                         u'8x+']
-
-        form_data = {
-            'startdate':startdate,
-            'enddate':enddate,
-            'modality':u'all',
-            'waterboattype': waterboattype,
-            'binsize':u'1',
-            'palette':u'monochrome_blue',
-            'spmmax':55,
-            'spmmin':15,
-            'workmax':1500,
-            'workmin':0,
-            'workouts':[1,2,3,4,5],
-            'workoutselectform':'Create Chart',
-            'xparam':'spm',
-            'yparam':'power',
-            'groupby':'spm',
-            }
-
-        form = MultiFlexChoiceForm(form_data)
-        self.assertTrue(form.is_valid())
-
-        url = '/rowers/user-multiflex-select/'
-
-        response = self.c.get(url)
-        self.assertEqual(response.status_code,200)
-
-        url = '/rowers/user-multiflex/user/1/'
-        reponse = self.c.post(url, form_data,follow=True)
-        self.assertEqual(response.status_code, 200)
-
-        options={
-            'includereststrokes':False,
-            'ploterrorbars':True,
-            'userid':0,
-            'palette': 'monochrome_blue',
-            'groupby': 'power',
-            'binsize': 1,
-            'xparam': 'spm',
-            'yparam': 'power',
-            'spmmin': 15,
-            'spmmax': 55,
-            'workmin': 400,
-            'workmax': 1500,
-            'ids': [1,2,3,4,5],
-            'ploterrorbars':False,
-        }
-
-        session = self.c.session
-        session['options'] = options
-        session.save()
-        response = self.c.get('/')
-
-        url = '/rowers/user-multiflex-data/'
-        response = self.c.get(url)
-        self.assertEqual(response.status_code, 200)
-
-class HistoTest(TestCase):
-    def setUp(self):
-        self.u = UserFactory()
-
-        self.r = Rower.objects.create(user=self.u,
-                                      birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,surveydone=True,
-                                      gdproptindate=timezone.now(),
-                                      rowerplan='coach')
-
-        self.c = Client()
-        self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
-        self.factory = RequestFactory()
-        self.password = faker.word()
-        self.u.set_password(self.password)
-        self.u.save()
-
-    def tearDown(self):
-        for workout in self.user_workouts:
-            try:
-                os.remove(workout.csvfilename)
-            except (IOError, FileNotFoundError,OSError):
-                pass
-
-    @patch('rowers.dataprep.create_engine')
-    @patch('rowers.dataprep.getsmallrowdata_db', side_effect=mocked_getpowerdata_db)
-    def test_histo_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()
-
-        # make sure the dates are not naive
-        try:
-            startdate = pytz.utc.localize(startdate)
-        except (ValueError, AttributeError):
-            pass
-        try:
-            enddate = pytz.utc.localize(enddate)
-        except (ValueError, AttributeError):
-            pass
-
-        waterboattype = [u'1x',
-                         u'2x',
-                         u'2x+',
-                         u'2-',
-                         u'2+',
-                         u'3x+',
-                         u'3x-',
-                         u'4x',
-                         u'4x+',
-                         u'4-',
-                         u'4+',
-                         u'8+',
-                         u'8x+']
-
-        form_data = {
-            'startdate':startdate,
-            'enddate':enddate,
-            'modality':u'all',
-            'histoparam':'power',
-            'rankingonly': False,
-            'includereststrokes':False,
-            'workouttypes': ['water'],
-            'waterboattype': waterboattype
-            }
-
-        url = '/rowers/histo/'
-        response = self.c.get(url)
-        self.assertEqual(response.status_code,200)
-
-        response = self.c.post(url, form_data)
-        self.assertEqual(response.status_code,200)
-
-
-        options = {
-            'includereststrokes':False,
-            'rankingonly':False,
-            'modality':'all',
-            'waterboattype':waterboattype,
-            'theuser':0,
-            'enddatestring':enddate.strftime("%Y-%m-%d"),
-            'startdatestring':startdate.strftime("%Y-%m-%d"),
-        }
-
-        session = self.c.session
-        session['options'] = options
-        session.save()
-        response = self.c.get('/')
-
-        sessionoptions = session['options']
-
-        response = self.c.get('/rowers/histodata/')
-        self.assertEqual(response.status_code,200)
-
-
-        #--------------------------------------------------
-
-
 
 class WorkoutCompareTestNew(TestCase):
     def setUp(self):
@@ -1642,3 +1168,126 @@ class MarkerPerformanceTest(TestCase):
 
         response = self.c.post(url,form_data)
         self.assertEqual(response.status_code,200)
+
+class AlertTest(TestCase):
+    def setUp(self):
+        self.u = UserFactory()
+
+        self.r = Rower.objects.create(user=self.u,
+                                      birthdate=faker.profile()['birthdate'],
+                                      gdproptin=True,surveydone=True,
+                                      gdproptindate=timezone.now(),
+                                      rowerplan='coach')
+
+        self.c = Client()
+        self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
+        self.factory = RequestFactory()
+        self.password = faker.word()
+        self.u.set_password(self.password)
+        self.u.save()
+
+        # need a 2k, 5k, 1h row
+        self.werg2k = WorkoutFactory(
+            user=self.r,
+            duration=datetime.time(hour=0,minute=7,second=0),
+            distance=2000,
+            workouttype='rower',
+            rankingpiece=True,
+        )
+
+        # need a 2k, 5k, 1h row
+        self.werg5k = WorkoutFactory(
+            user=self.r,
+            duration=datetime.time(hour=0,minute=18,second=0),
+            distance=5000,
+            workouttype='rower',
+            rankingpiece=True,
+        )
+
+        # need a 2k, 5k, 1h row
+        self.werg1h = WorkoutFactory(
+            user=self.r,
+            duration=datetime.time(hour=1,minute=0,second=0),
+            distance=15000,
+            workouttype='rower',
+            rankingpiece=True,
+        )
+
+    def tearDown(self):
+        for workout in self.user_workouts:
+            try:
+                os.remove(workout.csvfilename)
+            except (IOError, FileNotFoundError, OSError):
+                pass
+
+    @patch('rowers.dataprep.create_engine')
+    @patch('rowers.alerts.getsmallrowdata_db')
+    def test_alerts(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()
+
+        url = reverse('alerts_view')
+        response = self.c.get(url)
+        self.assertEqual(response.status_code,200)
+
+        # create alert
+        url = reverse('alert_create_view')
+        response = self.c.get(url)
+        self.assertEqual(response.status_code,200)
+
+        data = {
+            'name': 'Ss',
+            'period':7,
+            'emailalert': True,
+            'boattype':'1x',
+            'workouttype':'water',
+            'reststrokes':False,
+            'metric':'spm',
+            'condition':'<',
+            'value1':20,
+            'value2':22,
+            # management_form data
+            'form-INITIAL_FORMS': '0',
+            'form-TOTAL_FORMS': '1',
+            'form-MAX_NUM_FORMS': '',
+
+            # First condition data
+            'form-0-metric': 'hr',
+            'form-0-condition': '>',
+            'form-0-value1': 120,
+            'form-0-value2': 130
+        }
+
+
+        form = AlertEditForm(data)
+        self.assertTrue(form.is_valid())
+
+        response = self.c.post(url,data,follow=True)
+        expected_url = reverse('alert_edit_view',kwargs={'id':1})
+        self.assertRedirects(response,expected_url=expected_url,status_code=302,target_status_code=200)
+
+        url = expected_url
+        response = self.c.post(url,data)
+        self.assertEqual(response.status_code,200)
+
+        data = {}
+
+        url = reverse('alert_report_view',kwargs={'id':1,'userid':self.u.id})
+        response = self.c.get(url)
+        self.assertEqual(response.status_code,200)
+
+        # delete
+        url = '/rowers/alerts/1/delete/'
+        response = self.c.get(url)
+        self.assertEqual(response.status_code,200)
+
+
+        response = self.c.post(url,data,follow=True)
+        expected_url = reverse('alerts_view')
+        self.assertRedirects(response,expected_url=expected_url,status_code=302,target_status_code=200)
+
+        #

rowers/tests/test_permissions.py

@@ -857,7 +857,7 @@ class PermissionsViewTests(TestCase):
         self.assertTrue(login)
 
 
-        url = reverse('cumstats',
+        url = reverse('analysis_new',
                       kwargs={
                           'userid':self.ubasic.id,
                       }
@@ -877,7 +877,7 @@ class PermissionsViewTests(TestCase):
         self.assertTrue(login)
 
 
-        url = reverse('cumstats',
+        url = reverse('analysis_new',
                       kwargs={
                           'userid':self.ubasic.id,
                       }
@@ -1153,7 +1153,7 @@ class PermissionsViewTests(TestCase):
         self.assertTrue(login)
 
 
-        url = reverse('cumstats',
+        url = reverse('analysis_new',
                       kwargs={
                           'userid':self.ubasic.id,
                       }
@@ -1276,7 +1276,7 @@ class PermissionsViewTests(TestCase):
             self.assertTrue(login)
 
 
-            url = reverse('cumstats',
+            url = reverse('analysis_new',
                         kwargs={
                             'userid':self.ubasic.id,
                             }

rowers/tests/test_urls.py

@@ -68,10 +68,6 @@ class URLTests(TestCase):
         '/rowers/404/',
         '/rowers/500/',
         '/rowers/502/',
-#        '/rowers/1/list-workouts/',
-#        '/rowers/1/list-workouts/2016-01-01/2016-12-31/',
-#        '/rowers/1/ote-bests/',
-#        '/rowers/1/ote-bests2/2016-01-01/2016-12-31/',
         '/rowers/about/',
         '/rowers/workout/addmanual/',
         '/rowers/agegroupcp/30/',
@@ -86,29 +82,10 @@ class URLTests(TestCase):
         '/rowers/courses/upload/',
         '/rowers/createplan/',
         '/rowers/createplan/user/1/',
-        '/rowers/cumstats/',
-#        '/rowers/cumstats/2016-01-01/2016-12-31/',
-        '/rowers/cumstats/user/1/',
-#        '/rowers/cumstats/user/1/2016-01-01/2016-12-31/',
         '/rowers/developers/',
         '/rowers/email/',
         '/rowers/email/thankyou/',
-#        '/rowers/fitness-progress/',
-#        '/rowers/fitness-progress/user/1/',
-#        '/rowers/fitness-progress/user/1/rower/',
-        '/rowers/flexall/',
-        '/rowers/flexall/spm/hr/None/',
-#        '/rowers/flexall/spm/hr/None/2016-01-01/2016-12-31/',
-#        '/rowers/flexall/spm/hr/None/2016-01-01/2016-12-31/user/1/',
-        '/rowers/flexall/user/1/',
-        '/rowers/flexalldata/',
         '/rowers/help/',
-        '/rowers/histo/',
-        '/rowers/histo/user/1/',
-#        '/rowers/histo/user/1/2016-01-01/2016-12-31/',
-        '/rowers/histodata/',
-#        '/rowers/job-kill/1/',
-#        '/rowers/jobs-status/',
         '/rowers/laboratory/',
         '/rowers/laboratory/user/1/',
         '/rowers/legal/',
@@ -116,8 +93,6 @@ class URLTests(TestCase):
         '/rowers/list-graphs/',
         '/rowers/list-jobs/',
         '/rowers/list-workouts/',
-#        '/rowers/list-workouts/2016-01-01/2016-12-31/',
-#        '/rowers/list-workouts/2016-01-01/2016-12-31/user/1/',
         '/rowers/list-workouts/ranking/',
         '/rowers/list-workouts/user/1/',
         '/rowers/me/calcdps/',
@@ -135,65 +110,23 @@ class URLTests(TestCase):
         '/rowers/me/workflowconfig2/',
         '/rowers/me/workflowconfig2/user/1/',
         '/rowers/me/workflowdefault/',
-#        '/rowers/multi-compare/',
-#        '/rowers/ote-bests/',
-#        '/rowers/ote-bests/2016-01-01/2016-12-31/',
-#        '/rowers/ote-bests/user/1/',
-#        '/rowers/ote-bests/user/1/2016-01-01/2016-12-31/',
         '/rowers/ote-bests2/',
-#        '/rowers/ote-bests2/2016-01-01/2016-12-31/',
         '/rowers/ote-bests2/user/1/',
-#        '/rowers/ote-ranking/',
-#        '/rowers/ote-ranking/2016-01-01/2016-12-31/',
-#        '/rowers/ote-ranking/user/1/',
-#        '/rowers/ote-ranking/user/1/2016-01-01/2016-12-31/',
-#        '/rowers/otw-bests/',
-#        '/rowers/otw-bests/2016-01-01/2016-12-31/',
-#        '/rowers/otw-bests/user/1/2016-01-01/2016-12-31/',
         '/rowers/partners/',
         '/rowers/physics/',
         '/rowers/planrequired/',
-#        '/rowers/promembership/',
         '/rowers/register/',
         '/rowers/register/thankyou/',
         '/rowers/sessions/',
-#        '/rowers/sessions/2016-01-01/2016-12-31/',
-#        '/rowers/sessions/2016-01-01/2016-12-31/user/1/',
         '/rowers/sessions/coach/',
-#        '/rowers/sessions/coach/user/1/',
         '/rowers/sessions/create/',
-#        '/rowers/sessions/create/user/1/',
         '/rowers/sessions/manage/',
-#        '/rowers/sessions/manage/user/1/',
         '/rowers/sessions/multiclone/',
-#        '/rowers/sessions/multiclone/user/1/',
         '/rowers/sessions/multicreate/',
-#        '/rowers/sessions/multicreate/user/1/',
         '/rowers/sessions/print/',
-#        '/rowers/sessions/print/user/1/',
         '/rowers/sessions/teamcreate/',
-#        '/rowers/sessions/user/1/',
         '/rowers/team-compare-select/',
         '/rowers/team-compare-select/workout/'+encoded1+'/',
-#        '/rowers/team-compare-select/2016-01-01/2016-12-31/',
-#        '/rowers/test-job/2/',
-#        '/rowers/test-job2/2/',
-#        '/rowers/test_callback/',
-#        '/rowers/updatefitness/',
-#        '/rowers/updatefitness/rower/',
-#        '/rowers/updatefitness/rower/50/',
-#        '/rowers/user-boxplot/',
-#        '/rowers/user-boxplot-data/',
-#        '/rowers/user-boxplot-select/',
-#        '/rowers/user-boxplot-select/user/1/',
-#        '/rowers/user-boxplot/user/1/',
-#        '/rowers/user-multiflex-data/',
-#        '/rowers/user-multiflex-select/',
-#        '/rowers/user-multiflex-select/2016-01-01/2016-12-31/',
-#        '/rowers/user-multiflex-select/user/1/',
-#        '/rowers/user-multiflex-select/user/1/2016-01-01/2016-12-31/',
-#        '/rowers/user-multiflex/',
-#        '/rowers/user-multiflex/user/1/',
         '/rowers/workout/'+encoded1+'/',
         '/rowers/workout/'+encoded1+'/adddistanceplot/',
         '/rowers/workout/'+encoded1+'/adddistanceplot2/',
@@ -224,27 +157,21 @@ class URLTests(TestCase):
         '/rowers/workout/'+encoded1+'/split/',
         '/rowers/workout/'+encoded1+'/stats/',
         '/rowers/workout/'+encoded1+'/stream/',
-#        '/rowers/workout/'+encoded1+'/task/',
-#        '/rowers/workout/'+encoded1+'/teststrokedata/',
         '/rowers/workout/'+encoded1+'/toggle-ranking/',
         '/rowers/workout/'+encoded1+'/undosmoothenpace/',
         '/rowers/workout/'+encoded1+'/unsubscribe/',
-#        '/rowers/workout/'+encoded1+'/updatecp/',
         '/rowers/workout/'+encoded1+'/view/',
         '/rowers/workout/'+encoded1+'/wind/',
         '/rowers/workout/'+encoded1+'/workflow/',
         '/rowers/workout/fusion/'+encoded1+'/',
-#        '/rowers/workout/fusion/'+encoded1+'/2016-01-01/2016-12-31/',
         '/rowers/workout/upload/',
         '/rowers/workout/upload/team/',
         '/rowers/workouts-join/',
         '/rowers/workouts-join-select/',
-#        '/rowers/workouts-join-select/2016-01-01/2016-12-31/',
     ]
 
 
 
-    #    urlstotest = ['/rowers/createplan/user/1/']
 
     lijst = []
     for url in urlstotest:

rowers/tests/viewnames.csv

@@ -26,9 +26,7 @@
 25,27,team_comparison_select,compare with a team member workout,TRUE,302,pro,200,302,pro,200,302,coach,200,302,FALSE,TRUE,TRUE,TRUE,TRUE,
 26,28,workouts_join_view,join workouts,TRUE,302,pro,302,302,pro,403,403,coach,302,403,FALSE,TRUE,FALSE,TRUE,TRUE,
 27,29,workouts_join_select,select workouts to join,TRUE,404,pro,200,302,pro,403,403,coach,200,403,FALSE,TRUE,FALSE,TRUE,TRUE,
-28,30,user_boxplot_select,select boxplots,TRUE,302,pro,200,302,pro,403,403,coach,200,302,FALSE,TRUE,FALSE,TRUE,TRUE,
 29,31,analysis_new,analysis front page,TRUE,302,pro,200,302,FALSE,200,302,coach,200,302,FALSE,TRUE,FALSE,TRUE,TRUE,
-30,32,user_multiflex_select,select multiflex data,TRUE,302,pro,200,302,FALSE,200,302,coach,200,302,FALSE,TRUE,FALSE,TRUE,TRUE,
 31,33,session_jobs_view,view jobs,TRUE,302,basic,200,302,FALSE,200,302,coach,200,302,FALSE,FALSE,FALSE,TRUE,TRUE,
 32,34,session_jobs_status,view jobs,TRUE,302,basic,200,302,FALSE,200,302,coach,200,302,FALSE,FALSE,FALSE,TRUE,TRUE,
 33,35,kill_async_job,kill job,TRUE,302,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE,
@@ -38,9 +36,6 @@
 41,43,cum_flex,flex all chart,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE,
 42,44,analysis_view_data,redirects to analysis direct,TRUE,302,pro,200,302,pro,200,302,coach,200,302,FALSE,FALSE,FALSE,TRUE,TRUE,
 43,47,cum_flex_data,flex all chart data (json),TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE,
-44,48,histo,histogram view,TRUE,302,pro,200,302,pro,403,302,coach,200,302,FALSE,TRUE,FALSE,TRUE,TRUE,
-45,49,histo_data,histogram data,TRUE,302,pro,200,302,pro,200,302,coach,200,302,FALSE,FALSE,FALSE,TRUE,TRUE,
-46,51,cumstats,cumulative statistics,TRUE,302,pro,200,302,pro,403,302,coach,200,302,FALSE,TRUE,FALSE,TRUE,TRUE,
 47,53,graph_show_view,show a chart,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE,
 48,54,GraphDelete,delete a chart,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE,
 49,55,get_thumbnails,get thumbnails,TRUE,403,basic,200,302,basic,403,403,coach,200,302,FALSE,FALSE,TRUE,TRUE,TRUE,
@@ -114,10 +109,6 @@
 119,148,alert_edit_view,edit alert,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE,
 120,150,alert_create_view,create alert,TRUE,302,pro,200,403,pro,403,403,coach,200,403,FALSE,TRUE,FALSE,TRUE,TRUE,
 121,152,alert_report_view,view alerts report,TRUE,302,basic,200,403,basic,403,403,coach,200,403,FALSE,FALSE,FALSE,FALSE,FALSE,
-122,155,boxplot_view,View boxplot,TRUE,302,pro,302,403,pro,403,403,coach,302,403,FALSE,TRUE,FALSE,TRUE,TRUE,
-123,157,boxplot_view_data,data for boxplot,TRUE,302,pro,200,403,pro,200,403,coach,200,403,FALSE,FALSE,FALSE,FALSE,FALSE,
-124,158,multiflex_view,view multiflex,TRUE,302,pro,302,403,pro,403,403,coach,302,403,FALSE,TRUE,FALSE,TRUE,TRUE,
-125,160,multiflex_data,data for multiflex,TRUE,302,pro,200,403,pro,200,403,coach,200,403,FALSE,FALSE,FALSE,FALSE,FALSE,
 126,161,deactivate_user,deactivate a user,TRUE,302,basic,200,302,FALSE,403,403,FALSE,403,403,FALSE,FALSE,FALSE,TRUE,TRUE,
 127,162,remove_user,remove a user,TRUE,302,basic,200,302,FALSE,403,403,FALSE,403,403,FALSE,FALSE,FALSE,TRUE,TRUE,
 128,163,user_gdpr_confirm,GDPR confirmation,TRUE,302,basic,302,302,FALSE,403,403,FALSE,403,403,FALSE,FALSE,FALSE,TRUE,TRUE,

rowers/urls.py

@@ -325,8 +325,6 @@ urlpatterns = [
     re_path(r'^workouts-join/user/(?P<userid>\d+)$',views.workouts_join_view,name='workouts_join_view'),
     re_path(r'^workouts-join-select/$',views.workouts_join_select,name='workouts_join_select'),
     re_path(r'^workouts-join-select/user/(?P<userid>\d+)/$',views.workouts_join_select,name='workouts_join_select'),
-    re_path(r'^user-boxplot-select/user/(?P<userid>\d+)/$',views.user_boxplot_select,name='user_boxplot_select'),
-    re_path(r'^user-boxplot-select/$',views.user_boxplot_select,name='user_boxplot_select'),
     re_path(r'^user-analysis-select/(?P<function>\w.*)/workout/(?P<id>\b[0-9A-Fa-f]+\b)/$',views.analysis_new,name='analysis_new'),
     re_path(r'^user-analysis-select/(?P<function>\w.*)/user/(?P<userid>\d+)/$',views.analysis_new,name='analysis_new'),
     re_path(r'^user-analysis-select/(?P<function>\w.*)/team/(?P<teamid>\d+)/$',views.analysis_new,name='analysis_new'),
@@ -334,8 +332,6 @@ urlpatterns = [
     re_path(r'^user-analysis-select/team/(?P<teamid>\d+)/$',views.analysis_new,name='analysis_new'),
     re_path(r'^user-analysis-select/(?P<function>\w.*)/$',views.analysis_new,name='analysis_new'),
     re_path(r'^user-analysis-select/$',views.analysis_new,name='analysis_new'),
-    re_path(r'^user-multiflex-select/user/(?P<userid>\d+)/$',views.user_multiflex_select,name='user_multiflex_select'),
-    re_path(r'^user-multiflex-select/$',views.user_multiflex_select,name='user_multiflex_select'),
     re_path(r'^list-jobs/$',views.session_jobs_view,name='session_jobs_view'),
     re_path(r'^jobs-status/$',views.session_jobs_status,name='session_jobs_status'),
     re_path(r'^job-kill/(?P<id>.*)/$',views.kill_async_job),
@@ -356,16 +352,7 @@ urlpatterns = [
     re_path(r'^performancemanager/user/(?P<userid>\d+)/(?P<mode>\w+.*)/$',views.performancemanager_view,name='performancemanager_view'),
     re_path(r'^ote-bests2/user/(?P<userid>\d+)/$',views.rankings_view2,name='rankings_view2'),
     re_path(r'^ote-bests2/$',views.rankings_view2,name='rankings_view2'),
-    re_path(r'^flexall/(?P<xparam>\w+.*)/(?P<yparam1>\w+.*)/(?P<yparam2>\w+.*)/$',views.cum_flex,name='cum_flex'),
     re_path(r'^analysisdata/$',views.analysis_view_data,name='analysis_view_data'),
-    re_path(r'^flexall/user/(?P<theuser>\d+)/$',views.cum_flex,name='cum_flex'),
-    re_path(r'^flexall/$',views.cum_flex,name='cum_flex'),
-    re_path(r'^flexalldata/$',views.cum_flex_data,name='cum_flex_data'),
-    re_path(r'^histo/user/(?P<userid>\d+)/$',views.histo,name='histo'),
-    re_path(r'^histodata/$',views.histo_data,name='histo_data'),
-    re_path(r'^histo/$',views.histo,name='histo'),
-    re_path(r'^cumstats/user/(?P<userid>\d+)/$',views.cumstats,name='cumstats'),
-    re_path(r'^cumstats/$',views.cumstats,name='cumstats'),
     re_path(r'^graph/(?P<id>\d+)/$',views.graph_show_view,name='graph_show_view'),
     re_path(r'^graph/(?P<pk>\d+)/delete/$',views.GraphDelete.as_view(),name='graph_delete'),
     re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/get-thumbnails/$',views.get_thumbnails,
@@ -541,12 +528,6 @@ urlpatterns = [
     re_path(r'^alerts/(?P<id>\d+)/report/user/(?P<userid>\d+)/$',views.alert_report_view,name='alert_report_view'),
     re_path(r'^alerts/(?P<id>\d+)/report/(?P<nperiod>\d+)/user/(?P<userid>\d+)/$',views.alert_report_view,name='alert_report_view'),
     re_path(r'^alerts/(?P<id>\d+)/report/$',views.alert_report_view,name='alert_report_view'),
-    re_path(r'^user-boxplot/user/(?P<userid>\d+)/$',views.boxplot_view,name='boxplot_view'),
-    re_path(r'^user-boxplot/$',views.boxplot_view,name='boxplot_view'),
-    re_path(r'^user-boxplot-data/$',views.boxplot_view_data,name='boxplot_view_data'),
-    re_path(r'^user-multiflex/user/(?P<userid>\d+)/$',views.multiflex_view,name='multiflex_view'),
-    re_path(r'^user-multiflex/$',views.multiflex_view,name='multiflex_view'),
-    re_path(r'^user-multiflex-data/$',views.multiflex_data,name='multiflex_data'),
     re_path(r'^me/deactivate/$',views.deactivate_user,name='deactivate_user'),
     re_path(r'^me/delete/$',views.remove_user,name='remove_user'),
     re_path(r'^survey/$',views.survey,name='survey'),