removing onlyranking

rowers/views/workoutviews.py

@@ -867,7 +867,6 @@ defaultoptions = {
     'includereststrokes': False,
     'workouttypes':['rower','dynamic','slides'],
     'waterboattype': mytypes.waterboattype,
-    'rankingonly': False,
     'function':'boxplot'
 }
 
@@ -901,12 +900,6 @@ def video_selectworkout(request,userid=0):
         modality = 'all'
 
 
-
-    try:
-        rankingonly = options['rankingonly']
-    except KeyError: # pragma: no cover
-        rankingonly = False
-
     query = request.GET.get('q')
     if query: # pragma: no cover
         query_list = query.split()
@@ -1002,9 +995,6 @@ def video_selectworkout(request,userid=0):
         ).exclude(boattype__in=negtypes)
 
 
-    if rankingonly: # pragma: no cover
-        workouts = workouts.exclude(rankingpiece=False)
-
     startdatestring = startdate.strftime('%Y-%m-%d')
     enddatestring = enddate.strftime('%Y-%m-%d')
     request.session['startdate'] = startdatestring
@@ -1276,11 +1266,6 @@ def team_comparison_select(request,
     else:
         waterboattype = mytypes.waterboattype
 
-    if 'rankingonly' in request.session: # pragma: no cover
-        rankingonly = request.session['rankingonly']
-    else:
-        rankingonly = False
-
     if 'modalities' in request.session:
         modalities = request.session['modalities']
         if len(modalities) > 1: # pragma: no cover
@@ -1314,11 +1299,6 @@ def team_comparison_select(request,
                 waterboattype = [b[0] for b in mytypes.boattypes]
 
 
-            if 'rankingonly' in modalityform.cleaned_data:
-                rankingonly = modalityform.cleaned_data['rankingonly']
-            else: # pragma: no cover
-                rankingonly = False
-
             request.session['modalities'] = modalities
             request.session['waterboattype'] = waterboattype
     else:
@@ -1329,7 +1309,6 @@ def team_comparison_select(request,
         modalityform = TrendFlexModalForm(initial={
             'modality':modality,
             'waterboattype':waterboattype,
-            'rankingonly':rankingonly,
         })
 
 
@@ -1388,8 +1367,6 @@ def team_comparison_select(request,
                                           startdatetime__lte=enddate,
                                           workouttype__in=modalities).order_by("-date", "-starttime").exclude(boattype__in=negtypes)
 
-    if rankingonly: # pragma: no cover
-        workouts = workouts.exclude(rankingpiece=False)
 
     query = request.GET.get('q')
     if query: # pragma: no cover
@@ -2208,7 +2185,7 @@ def multi_compare_view(request,id=0,userid=0):
 # List Workouts
 @login_required()
 def workouts_view(request,message='',successmessage='',
-                  teamid=0,rankingonly=False,rowerid=0,userid=0):
+                  teamid=0,rowerid=0,userid=0):
 
     startdate,enddate = get_dates_timeperiod(request,defaulttimeperiod='lastyear')
     request.session['referer'] = absolute(request)['PATH']
@@ -2333,8 +2310,6 @@ def workouts_view(request,message='',successmessage='',
         g_startdate = (timezone.now()-timedelta(days=15))
 
 
-    if rankingonly:
-        workouts = workouts.exclude(rankingpiece=False)
 
     workoutsnohr = workouts.exclude(averagehr__isnull=False)
     for w in workoutsnohr: # pragma: no cover
@@ -2413,7 +2388,6 @@ def workouts_view(request,message='',successmessage='',
                    'enddate':enddate,
                    'announcements':announcements[0:4],
                    'team':theteam,
-                   'rankingonly':rankingonly,
                    'teams':get_my_teams(request.user),
                    'interactiveplot':script,
                    'the_div':div,