From bac492881188de0e930626921c39b60c06a6dbf3 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 26 Nov 2018 10:24:16 +0100
Subject: [PATCH] bug fix team compare

---
 rowers/templates/menu_workouts.html | 49 +++++++++++++++++++++++------
 rowers/templatetags/rowerfilters.py | 24 ++++++++++++++
 rowers/urls.py                      |  1 +
 3 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/rowers/templates/menu_workouts.html b/rowers/templates/menu_workouts.html
index 9e21e374..3ee1c37c 100644
--- a/rowers/templates/menu_workouts.html
+++ b/rowers/templates/menu_workouts.html
@@ -9,7 +9,11 @@
     <a href="/rowers/list-graphs"><i class="fas fa-chart-pie fa-fw"></i>&nbsp;Charts</a>
   </li>
   <li id="compare">
+    {% if team %}
+    <a href="/rowers/team-compare-select/team/{{ team.id }}/"><i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare</a>
+    {% else %}
     <a href="/rowers/team-compare-select/team/0/"><i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare</a>
+    {% endif %}
   </li>  
   <li>
     <a href="/rowers/workout/upload/"><i class="fas fa-file-upload fa-fw"></i>&nbsp;Upload</a>
@@ -50,15 +54,17 @@
     <label for="athlete-selector"><i class="fas fa-users fa-fw"></i>&nbsp;Athletes</label>
     <ul>
       {% for member in user|team_members %}
-      <a href={{ request.path|userurl:member }}>
-        <i class="fas fa-user fa-fw"></i>
-        {% if member == rower.user %}
-        &bull;
-        {% else %}
-        &nbsp; 
-        {% endif %}
-        {{ member.first_name }} {{ member.last_name }}
-      </a>
+      <li>
+        <a href={{ request.path|userurl:member }}>
+          <i class="fas fa-user fa-fw"></i>
+          {% if member == rower.user and team.id == 0 %}
+          &bull;
+          {% else %}
+          &nbsp; 
+          {% endif %}
+          {{ member.first_name }} {{ member.last_name }}
+        </a>
+      </li>
       {% endfor %}
     </ul>
   </li>
@@ -66,4 +72,29 @@
 {% endif %}
 {% endif %}
 
+{% if teams %}
+<p>&nbsp;</p>
+<ul class="cd-accordion-menu animated">
+  <li class="has-children" id="teams">
+    <input type="checkbox" name="team-selector" id="team-selector">
+    <label for="team-selector"><i class="fas fa-bullhorn fa-fw"></i>&nbsp;Teams</label>
+    <ul>
+      {% for tteam in teams %}
+      <li>
+        <a href={{ request.path|teamurl:tteam }}>
+          <i class="fas fa-users fa-fw"></i>        
+          {% if tteam == team %}
+          &bull;
+          {% else %}
+          &nbsp;
+          {% endif %}
+          {{ tteam.name }}
+        </a>
+      </li>
+      {% endfor %}
+    </ul>
+  </li>
+</ul>
+{% endif %}
+
 {% include 'menuscript.html' %}
diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py
index 7f4334eb..80902764 100644
--- a/rowers/templatetags/rowerfilters.py
+++ b/rowers/templatetags/rowerfilters.py
@@ -374,6 +374,12 @@ def is_not_past_due(self):
 def userurl(path,member):
     pattern = re.compile('user\/\d+')
     userstring = 'user/%s' % member.id
+
+    # remove team
+    tpattern = re.compile('\/team\/\d+')
+    if tpattern.search(path) is not None:
+        path = tpattern.sub('',path)
+    
     if pattern.search(path) is not None:
         replaced = pattern.sub(userstring,path)
     else:
@@ -381,6 +387,24 @@ def userurl(path,member):
         
     return replaced
 
+@register.filter
+def teamurl(path,team):
+    pattern = re.compile('team\/\d+')
+    teamstring = 'team/%s' % team.id
+
+    # remove user
+    upattern = re.compile('\/user\/\d+')
+    if upattern.search(path) is not None:
+        path = upattern.sub('',path)
+    
+
+    if pattern.search(path) is not None:
+        replaced = pattern.sub(teamstring,path)
+    else:
+        replaced = path+teamstring
+
+    return replaced
+
 @register.filter
 def timeurl(path,timestring):
     pattern = re.compile('\?when=w.*')
diff --git a/rowers/urls.py b/rowers/urls.py
index f5f9f183..bb22cbde 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -171,6 +171,7 @@ urlpatterns = [
     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/user/(?P<userid>\d+)/$',views.team_comparison_select),
     url(r'^team-compare-select/$',views.team_comparison_select),
     url(r'^workouts-join-select/team/(?P<teamid>\d+)/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)$',views.workouts_join_select),
     url(r'^workouts-join$',views.workouts_join_view),