removing plans

rowers/templates/menu_plan.html

@@ -13,11 +13,6 @@
           <i class="fas fa-bullseye-pointer"></i>&nbsp;Manage Plans
         </a>
       </li>
-      <li id="instant-plans">
-        <a href="/rowers/plans/">
-          <i class="fas fa-calendar-star"></i>&nbsp;Our Plans
-        </a>
-      </li>
       {% for plan in rower|trainingplans %}
       <li id="plan-{{ plan.id }}">
         <a href="/rowers/plan/{{ plan.id }}/">

rowers/templates/trainingplan_create.html

@@ -99,11 +99,6 @@
   </li>
   <li class="grid_2">
     <h2>Plans</h2>
-    <p>
-			<a href="/rowers/plans/">
-				<i class="fas fa-calendar-star"></i>&nbsp;Our Plans
-			</a>
-		</p>
     {% if plans %}
     <table width="100%" class="listtable shortpadded">
       <thead>

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)
-

rowers/urls.py

@@ -873,8 +873,8 @@ urlpatterns = [
             name='rower_create_trainingplan'),
     re_path(r'^createplan/user/(?P<id>\d+)/$',
             views.rower_create_trainingplan, name='rower_create_trainingplan'),
-    re_path(r'^plans/$', views.rower_select_instantplan,
+#    re_path(r'^plans/$', views.rower_select_instantplan,
-            name='rower_select_instantplan'),
+#            name='rower_select_instantplan'),
     re_path(r'^plans/step/(?P<id>\d+)/edit/$',
             views.stepedit, name='stepedit'),
     re_path(r'^plans/step/(?P<id>\d+)/edit/(?P<psid>\d+)/$',
@@ -887,12 +887,12 @@ urlpatterns = [
             views.stepeditor, name='stepeditor'),
     re_path(r'^plans/stepadder/(?P<id>\d+)/$',
         views.stepadder, name='stepadder'),
-    re_path(r'^plans/(?P<id>[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})/$',
+#    re_path(r'^plans/(?P<id>[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'),
+#            views.rower_view_instantplan, name='rower_view_instantplan'),
-    re_path(r'^buyplan/(?P<id>\d+)/$', views.buy_trainingplan_view,
+#    re_path(r'^buyplan/(?P<id>\d+)/$', views.buy_trainingplan_view,
-            name='buy_trainingplan_view'),
+#            name='buy_trainingplan_view'),
-    re_path(r'^confirmpurchaseplan/(?P<id>\d+)/$',
+#    re_path(r'^confirmpurchaseplan/(?P<id>\d+)/$',
-            views.confirm_trainingplan_purchase_view, name='confirm_trainingplan_purchase_view'),
+#            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<pk>\d+)/$', login_required(

templates/newbase.html

@@ -330,11 +330,6 @@
 	    <a href="https://wp.me/P8g86e-Bs">Please take 2 minutes to fill out the survey!</a>
 	  </div>
 	</div>
-	<div class="site-announcement-box">
-	  <div class="site-announcement-white">
-	    <a href="/rowers/plans/">Need a training plan? Take a look at our training plan section!</a>
-	  </div>
-	</div>
         <div id="id_blogs">
         </div>
 	{% if user.is_authenticated and user.rower.rowerplan == 'pro' %}