[chronojump-server] Updated groups display now for responsibles and coaches at the same time

[Max Ros i Morejon <maxros src gnome org>]

commit cbfebc97813bbef14acbf898bc4d98977831f8d6
Author: Max Ros i Morejon <mros33 gmail com>
Date:   Fri Jun 28 13:34:37 2019 +0200

    Updated groups display now for responsibles and coaches at the same time

 .../chronojump_networks/organizations/models.py               | 11 +++++++++--
 .../chronojump_networks/templates/pages/index.html            |  8 +++-----
 2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/chronojumpserver-django/chronojump_networks/organizations/models.py 
b/chronojumpserver-django/chronojump_networks/organizations/models.py
index 734e2ca..b78fec6 100644
--- a/chronojumpserver-django/chronojump_networks/organizations/models.py
+++ b/chronojumpserver-django/chronojump_networks/organizations/models.py
@@ -113,6 +113,13 @@ class User(AbstractUser):
         exercices = Exercise.objects.filter(station_id__in = station_list)
         return exercices
     
+    def groups_involved(self):
+        res_list = [g.group.id for g in self.groups_by_coach.all()]
+        sec_list = [r.id for r in self.groups_responsible.all()]
+        res_list.extend(group for group in sec_list if group not in res_list)
+        groups = Group.objects.filter(id__in = res_list)
+        return groups
+    
     #def sprint_stations_by_coach(self):
         #group_list = [g.group.id for g in self.groups_by_coach.all()]
         #group_organizations = Organization.objects.filter(groups__in = group_list)
@@ -127,8 +134,8 @@ class User(AbstractUser):
         #station_list = self.sprint_stations_by_coach()
         #exercices = Exercise.objects.filter(station_id__in = station_list)
         #return exercices
-
-
+        
+    
 
 class Organization(ChronojumpBaseModel):
     class Meta:
diff --git a/chronojumpserver-django/chronojump_networks/templates/pages/index.html 
b/chronojumpserver-django/chronojump_networks/templates/pages/index.html
index 0e63f30..997236c 100644
--- a/chronojumpserver-django/chronojump_networks/templates/pages/index.html
+++ b/chronojumpserver-django/chronojump_networks/templates/pages/index.html
@@ -66,12 +66,12 @@
         <a class="btn btn-outline-dark btn-block font-weight-bold text-uppercase" href="{% url 
'results:sprint' %}">{% trans 'Sprint results' %}</a>
       </div>
     </div>
-    {% if user.groups_by_coach %}
+    {% if user.groups_involved %}
     <h2 class="text-center">{% trans 'My Groups' %}</h2>
     <div class="row buttons" >
-      {% for group in user.groups_by_coach.all %}
+      {% for group in user.groups_involved.all %}
         <div class="col-sm-6 col-md-4">
-          <a class="btn btn-outline-info btn-block font-weight-bold text-uppercase" href="{% url 
'organizations:group_players_list' organization_id=user.organization.id group_id=group.group.id %}" 
style="white-space:normal;">{{group.group.name}}</a>
+          <a class="btn btn-outline-info btn-block font-weight-bold text-uppercase" href="{% url 
'organizations:group_players_list' organization_id=user.organization.id group_id=group.id %}" 
style="white-space:normal;">{{group.name}}</a>
         </div>
       {% endfor %}
     </div>
@@ -88,7 +88,6 @@
     </div>
     {% endif %}
 
-    {% if user.id == user.organization.responsible.id %}
     <h2 class="text-center">{% trans 'Organization options' %}</h2>
     <div class="row buttons" >
         <!--<div class="col-sm-6 col-md-3">
@@ -104,7 +103,6 @@
           <a class="btn btn-outline-primary btn-block font-weight-bold text-uppercase" href="{% url 
'organizations:gyms_list' organization_id=user.organization.id %}">{% trans 'Gyms' %}</a>
         </div>
     </div>
-    {% endif %}
 
 {% else %}
     <div class="row">