diff --git a/rowers/templates/menu_plan.html b/rowers/templates/menu_plan.html index a81537e7..e9031867 100644 --- a/rowers/templates/menu_plan.html +++ b/rowers/templates/menu_plan.html @@ -13,11 +13,6 @@  Manage Plans -
  • - -  Our Plans - -
    • {% for plan in rower|trainingplans %}
  • diff --git a/rowers/templates/trainingplan_create.html b/rowers/templates/trainingplan_create.html index 2205f102..075879af 100644 --- a/rowers/templates/trainingplan_create.html +++ b/rowers/templates/trainingplan_create.html @@ -99,11 +99,6 @@

  • Plans

    -

    - -  Our Plans - -

    {% if plans %} diff --git a/rowers/tests/test_plans.py b/rowers/tests/test_plans.py index 1ff79d69..4fa2677c 100644 --- a/rowers/tests/test_plans.py +++ b/rowers/tests/test_plans.py @@ -2335,88 +2335,3 @@ description: "" # next test should mock training plan server - def test_instantplan_view(self): - self.u.is_staff = True - self.u.save() - login = self.c.login(username=self.u.username, password=self.password) - self.assertTrue(login) - - url = reverse('rower_select_instantplan') - response = self.c.get(url) - self.assertEqual(response.status_code,200) - - # add a plan - url = reverse('add_instantplan_view') - response = self.c.get(url) - self.assertEqual(response.status_code,200) - - - - form_data = { - 'name': 'Test Plan', - 'price': 0, - 'url':'https://nos.nl', - 'goal':'hard roeien', - 'description':'win everything with this plan', - 'duration':28, - 'target':'race faster', - 'hoursperweek':4, - 'sessionsperweek':4, - #'yaml': {'yaml': SimpleUploadedFile('britishrowing.yml', f.read())} - } - - - form = InstantPlanForm(form_data,self.file_data) - if not form.is_valid(): - print(form.errors) - self.assertTrue(form.is_valid()) - - # look at a instant plan - url = reverse('rower_view_instantplan',kwargs={'id':self.instantplan.uuid}) - response = self.c.get(url) - self.assertEqual(response.status_code,200) - - form_data = { - 'name':faker.word(), - 'target': '', - 'startdate':datetime.datetime.now().strftime('%Y-%m-%d'), - 'enddate':(datetime.datetime.now()+datetime.timedelta(days=self.instantplan.duration)).strftime('%Y-%m-%d'), - 'notes': faker.word(), - 'datechoice':'startdate', - } - - form = InstantPlanSelectForm(form_data) - self.assertTrue(form.is_valid()) - - response = self.c.post(url,form_data,follow=True) - - self.assertEqual(response.status_code,200) - - # add a plan - url = reverse('rower_view_instantplan', kwargs={'id':self.instantplan.uuid}) - response = self.c.get(url) - self.assertEqual(response.status_code,200) - - form_data = { - 'name': 'Test Plan', - 'startdate':datetime.datetime.now().strftime('%Y-%m-%d'), - 'enddate':(datetime.datetime.now()+datetime.timedelta(days=self.instantplan.duration)).strftime('%Y-%m-%d'), - 'plan_past_days': False, - 'datechoice':'startdate', - 'notes': faker.word(), - 'byrscore': False, - 'target': '', - } - form = InstantPlanSelectForm(form_data) - self.assertTrue(form.is_valid()) - form = PlanByRscoreForm(form_data) - self.assertTrue(form.is_valid()) - - # post the form to url - response = self.c.post(url,form_data,follow=True) - self.assertEqual(response.status_code,200) - - # check the number of PlannedSession objects - ps = PlannedSession.objects.filter(rower__in=[self.r]) - self.assertEqual(ps.count(),5) - diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 111fee58..5cf0703c 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ diff --git a/rowers/urls.py b/rowers/urls.py index fdba1a24..3289b01d 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -873,8 +873,8 @@ urlpatterns = [ name='rower_create_trainingplan'), re_path(r'^createplan/user/(?P\d+)/$', views.rower_create_trainingplan, name='rower_create_trainingplan'), - re_path(r'^plans/$', views.rower_select_instantplan, - name='rower_select_instantplan'), +# re_path(r'^plans/$', views.rower_select_instantplan, +# name='rower_select_instantplan'), re_path(r'^plans/step/(?P\d+)/edit/$', views.stepedit, name='stepedit'), re_path(r'^plans/step/(?P\d+)/edit/(?P\d+)/$', @@ -887,12 +887,12 @@ urlpatterns = [ views.stepeditor, name='stepeditor'), re_path(r'^plans/stepadder/(?P\d+)/$', views.stepadder, name='stepadder'), - re_path(r'^plans/(?P[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12})/$', - views.rower_view_instantplan, name='rower_view_instantplan'), - re_path(r'^buyplan/(?P\d+)/$', views.buy_trainingplan_view, - name='buy_trainingplan_view'), - re_path(r'^confirmpurchaseplan/(?P\d+)/$', - views.confirm_trainingplan_purchase_view, name='confirm_trainingplan_purchase_view'), +# re_path(r'^plans/(?P[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12})/$', +# views.rower_view_instantplan, name='rower_view_instantplan'), +# re_path(r'^buyplan/(?P\d+)/$', views.buy_trainingplan_view, +# name='buy_trainingplan_view'), +# re_path(r'^confirmpurchaseplan/(?P\d+)/$', +# views.confirm_trainingplan_purchase_view, name='confirm_trainingplan_purchase_view'), re_path(r'^addinstantplan/$', views.add_instantplan_view, name='add_instantplan_view'), re_path(r'^deleteplan/(?P\d+)/$', login_required( diff --git a/templates/newbase.html b/templates/newbase.html index f8818b2b..aecd96cc 100644 --- a/templates/newbase.html +++ b/templates/newbase.html @@ -330,11 +330,6 @@ Please take 2 minutes to fill out the survey! -
    -
    - Need a training plan? Take a look at our training plan section! -
    -
    {% if user.is_authenticated and user.rower.rowerplan == 'pro' %}