addmanual added to menu

rowers/plannedsessions.py

@@ -400,12 +400,22 @@ def remove_rower_session(r,ps):
 
     return 1
 
-def get_dates_timeperiod(timeperiod,startdatestring='',enddatestring=''):
+def get_dates_timeperiod(request,startdatestring='',enddatestring=''):
     # set start end date according timeperiod
 
+    timeperiod = request.GET.get('when')
+
     if not timeperiod:
         timeperiod = 'thisweek'
-    
+
+    startdatestring = request.GET.get('startdate')
+    enddatestring = request.GET.get('enddate')
+
+    if startdate and enddate:
+        startdate = dt.datetime.strptime(startdatestring,'%Y-%m-%d').date()
+        enddate = dt.datetime.strptime(enddatestring,'%Y-%m-%d').date()
+        return startdate,enddate
+        
     daterangetester = re.compile('^(\d+-\d+-\d+)\/(\d+-\d+-\d+)')
 
     if timeperiod=='today':

rowers/templates/menu_workouts.html

@@ -14,6 +14,9 @@
   <li>
     <a href="/rowers/workout/upload/"><i class="fas fa-file-upload fa-fw"></i>&nbsp;Upload</a>
   </li>
+  <li>
+    <a href="/rowers/workout/addmanual/"><i class="fas fa-file-plus fa-fw"></i>&nbsp;Add manual entry</a>
+  </li>
   <li>
     {% if user|is_promember %}
     <a href="/rowers/workouts-join-select">

rowers/templates/rankings.html

@@ -96,7 +96,7 @@
     </p>
     
     <p>Want to add race results but you don't have stroke data?
-      <a href="/rowers/addmanual">Click here.</a></p>
+      <a href="/rowers/workout/addmanual">Click here.</a></p>
     
     <p>Scroll down for the chart and pace predictions for ranking pieces.</p>
     

rowers/urls.py

@@ -154,7 +154,7 @@ urlpatterns = [
     url(r'^list-workouts/$',views.workouts_view),
     url(r'^list-courses/$',views.courses_view),
     url(r'^courses/upload$',views.course_upload_view),
-    url(r'^addmanual/$',views.addmanual_view),
+    url(r'^workout/addmanual/$',views.addmanual_view),
     url(r'^team-compare-select/workout/(?P<id>\d+)/team/(?P<teamid>\d+)/user/(?P<userid>\d+)/$',views.team_comparison_select),
     url(r'^team-compare-select/team/(?P<teamid>\d+)/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)/user/(?P<userid>\d+)/$',views.team_comparison_select),
     url(r'^team-compare-select/team/(?P<teamid>\d+)/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)$',views.team_comparison_select),

rowers/views.py

@@ -13961,8 +13961,8 @@ def plannedsession_multiclone_view(
 
     r = getrequestrower(request,userid=userid)
 
-    when = request.GET.get('when')
-    startdate,enddate = get_dates_timeperiod(when)
+    
+    startdate,enddate = get_dates_timeperiod(request)
         
         
     if request.method == 'POST' and 'daterange' in request.POST:
@@ -14088,8 +14088,8 @@ def plannedsession_create_view(request,
 
     
     
-    when = request.GET.get('when')
-    startdate,enddate = get_dates_timeperiod(when,startdatestring=startdatestring,
+    
+    startdate,enddate = get_dates_timeperiod(request,startdatestring=startdatestring,
                                              enddatestring=enddatestring)
 
 
@@ -14217,8 +14217,8 @@ def plannedsession_multicreate_view(request,
 
     r = getrequestrower(request,userid=userid)
 
-    when = request.GET.get('when')
-    startdate,enddate = get_dates_timeperiod(when)
+    
+    startdate,enddate = get_dates_timeperiod(request)
     try:
         trainingplan = TrainingPlan.objects.filter(
             startdate__lte =  startdate,
@@ -14319,7 +14319,7 @@ def plannedsession_teamcreate_view(request,
 
     therower = getrequestrower(request,userid=userid)
 
-    when = request.GET.get('when')
+    
         
     teams = Team.objects.filter(manager=request.user)
     if len(teams)>0:
@@ -14330,7 +14330,7 @@ def plannedsession_teamcreate_view(request,
         url = reverse(rower_teams_view)
         return HttpResponseRedirect(url)
 
-    startdate,enddate = get_dates_timeperiod(when)
+    startdate,enddate = get_dates_timeperiod(request)
 
     trainingplan = None
 
@@ -14466,7 +14466,7 @@ def plannedsession_teamedit_view(request,
 
     r = getrequestrower(request,userid=userid)
 
-    when = request.GET.get('when')
+    
     
     try:
         ps = PlannedSession.objects.get(id=sessionid)
@@ -14480,7 +14480,7 @@ def plannedsession_teamedit_view(request,
 
     teaminitial = ps.team.all()
 
-    startdate,enddate = get_dates_timeperiod(when)
+    startdate,enddate = get_dates_timeperiod(request)
 
     try:
         trainingplan = TrainingPlan.objects.filter(
@@ -14614,9 +14614,9 @@ def plannedsessions_coach_view(request,
 
     therower = getrower(request.user)
     
-    when = request.GET.get('when')
+    
         
-    startdate,enddate = get_dates_timeperiod(when)
+    startdate,enddate = get_dates_timeperiod(request)
 
 
     trainingplan = None
@@ -14714,9 +14714,11 @@ def plannedsessions_view(request,
             pass
 
 
-    when = request.GET.get('when')
-    startdate,enddate = get_dates_timeperiod(when,startdatestring=startdatestring,
-                                             enddatestring=enddatestring)
+    
+    startdate,enddate = get_dates_timeperiod(
+        request,
+        startdatestring=startdatestring,
+        enddatestring=enddatestring)
 
     try:
         trainingplan = TrainingPlan.objects.filter(
@@ -14777,9 +14779,9 @@ def plannedsessions_print_view(request,userid=0):
 
     r = getrequestrower(request,userid=userid)
 
-    when = request.GET.get('when')
+    
         
-    startdate,enddate = get_dates_timeperiod(when)
+    startdate,enddate = get_dates_timeperiod(request)
         
     try:
         trainingplan = TrainingPlan.objects.filter(
@@ -14817,11 +14819,11 @@ def plannedsessions_manage_view(request,userid=0,
     if request.is_ajax():
         is_ajax = True
 
-    when = request.GET.get('when')
+    
 
     r = getrequestrower(request,userid=userid)
 
-    startdate,enddate = get_dates_timeperiod(when)
+    startdate,enddate = get_dates_timeperiod(request)
                 
     try:
         trainingplan = TrainingPlan.objects.filter(
@@ -14969,13 +14971,13 @@ def plannedsession_clone_view(request,id=0,userid=0):
 
     r = getrequestrower(request,userid=userid)
 
-    when = request.GET.get('when')
+    
     if when:
         timeperiod = when
     else:
         timeperiod = 'thisweek'
 
-    startdate,enddate = get_dates_timeperiod(when)
+    startdate,enddate = get_dates_timeperiod(request)
 
     try:
         trainingplan = TrainingPlan.objects.filter(
@@ -15033,13 +15035,13 @@ def plannedsession_edit_view(request,id=0,userid=0):
 
     r = getrequestrower(request,userid=userid)
 
-    when = request.GET.get('when')
+    
     if when:
         timeperiod = when
     else:
         timeperiod = 'thisweek'
 
-    startdate,enddate = get_dates_timeperiod(when)
+    startdate,enddate = get_dates_timeperiod(request)
 
 
     try:
@@ -15150,7 +15152,7 @@ def plannedsession_view(request,id=0,userid=0):
 
     r = getrequestrower(request,userid=userid)
 
-    when = request.GET.get('when')
+    
 
     try:
         ps = PlannedSession.objects.get(id=id)
@@ -15258,7 +15260,7 @@ def plannedsession_view(request,id=0,userid=0):
 
             # if coursetest, need to reorder the ranking
 
-    startdate,enddate = get_dates_timeperiod(when)
+    startdate,enddate = get_dates_timeperiod(request)
     try:
         trainingplan = TrainingPlan.objects.filter(
             startdate__lte =  startdate,
@@ -16593,9 +16595,10 @@ def rower_trainingplan_view(request,
                             thismacroid=0,
                             thismesoid=0):
 
+
     when = request.GET.get('when')
     if when:
-        startdate,enddate = get_dates_timeperiod(when)
+        startdate,enddate = get_dates_timeperiod(request)
     else:
         startdate = datetime.date.today()