From 3612a33989bc2521fb64cd31ef6560aab4641e63 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Sun, 28 Oct 2018 18:09:08 +0100
Subject: [PATCH] bug fix compare

---
 rowers/urls.py  |  8 ++++++++
 rowers/views.py | 17 +++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/rowers/urls.py b/rowers/urls.py
index b9812719..e329cc21 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -155,12 +155,20 @@ urlpatterns = [
     url(r'^list-courses/$',views.courses_view),
     url(r'^courses/upload$',views.course_upload_view),
     url(r'^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),
     url(r'^team-compare-select/workout/(?P<id>\d+)/team/(?P<teamid>\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),
+    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/workout/(?P<id>\d+)/team/(?P<teamid>\d+)/$',views.team_comparison_select),
+    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/workout/(?P<id>\d+)/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)$',views.team_comparison_select),
+    url(r'^team-compare-select/workout/(?P<id>\d+)/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)/user/(?P<userid>\d+)/$',views.team_comparison_select),
+    url(r'^team-compare-select/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)/user/(?P<userid>\d+)/$',views.team_comparison_select),
     url(r'^team-compare-select/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)$',views.team_comparison_select),
+    url(r'^team-compare-select/workout/(?P<id>\d+)/user/(?P<userid>\d+)/$',views.team_comparison_select),
+    url(r'^team-compare-select/team/(?P<teamid>\d+)/user/(?P<userid>\d+)/$',views.team_comparison_select),
     url(r'^team-compare-select/workout/(?P<id>\d+)/$',views.team_comparison_select),
     url(r'^team-compare-select/team/(?P<teamid>\d+)$',views.team_comparison_select),
     url(r'^team-compare-select/$',views.team_comparison_select),
diff --git a/rowers/views.py b/rowers/views.py
index 2407ebe1..79705ee1 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -5248,16 +5248,14 @@ def team_comparison_select(request,
                            enddatestring="",
                            message='',
                            successmessage='',
+                           userid=0,
                            startdate=timezone.now()-datetime.timedelta(days=30),
                            enddate=timezone.now(),
                            id=0,
                            teamid=0):
 
-    try:
-	r = getrower(request.user)
-    except Rower.DoesNotExist:
-        raise Http404("Rower doesn't exist")
-
+    r = getrequestrower(request,userid=userid)
+    requestrower = getrower(request.user)
 
     if 'waterboattype' in request.session:
         waterboattype = request.session['waterboattype']
@@ -5347,8 +5345,9 @@ def team_comparison_select(request,
     except Team.DoesNotExist:
         theteam = 0
         
-    if r.rowerplan == 'basic' and theteam==0:
-        if r.protrialexpires is None or r.protrialexpires<datetime.date.today():
+    if requestrower.rowerplan == 'basic' and theteam==0:
+        if requestrower.protrialexpires is None or requestrower.protrialexpires<datetime.date.today():
+
             raise PermissionDenied("Access denied")
 
     if theteam and (theteam.viewing == 'allmembers' or theteam.manager == request.user):
@@ -5410,8 +5409,6 @@ def team_comparison_select(request,
     messages.info(request,successmessage)
     messages.error(request,message)
     
-    r = getrower(request.user)
-
     if id:
         breadcrumbs = [
             {
@@ -5420,7 +5417,7 @@ def team_comparison_select(request,
             },
             {
                 'url':get_workout_default_page(request,id),
-                'name': str(id)
+                'name': firstworkout.name
                 },
             {
                 'url':reverse(team_comparison_select,kwargs={'id':id,'teamid':teamid}),