[chronojump-server] Implemented control over sprints button on index page
- From: Max Ros i Morejon <maxros src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump-server] Implemented control over sprints button on index page
- Date: Mon, 8 Jul 2019 10:27:03 +0000 (UTC)
commit b65e5c6cd444ed5d04114e49098d81b03ef6ae92
Author: Max Ros i Morejon <mros33 gmail com>
Date: Mon Jul 8 12:26:54 2019 +0200
Implemented control over sprints button on index page
.../chronojump_networks/organizations/models.py | 38 ++++++++++++++--------
.../chronojump_networks/templates/pages/index.html | 7 ++++
2 files changed, 31 insertions(+), 14 deletions(-)
---
diff --git a/chronojumpserver-django/chronojump_networks/organizations/models.py
b/chronojumpserver-django/chronojump_networks/organizations/models.py
index d33a53b..fe3ef4d 100644
--- a/chronojumpserver-django/chronojump_networks/organizations/models.py
+++ b/chronojumpserver-django/chronojump_networks/organizations/models.py
@@ -113,20 +113,6 @@ 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 groups_resp(self):
- res_list = [r.id for r in self.groups_responsible.all()]
- if res_list:
- return True
- else:
- return False
-
#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)
@@ -141,7 +127,31 @@ class User(AbstractUser):
#station_list = self.sprint_stations_by_coach()
#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 groups_resp(self):
+ res_list = [r.id for r in self.groups_responsible.all()]
+ if res_list:
+ return True
+ else:
+ return False
+ def sprint_exist(self):
+ gyms = [g.id for g in self.organization().gyms.all()]
+ gyms = Gym.objects.filter(id__in = gyms)
+ for g in gyms:
+ stations = [s.id for s in g.stations.all()]
+ stations = Station.objects.filter(id__in = stations)
+ sprints = stations.filter(type__exact = 'S')
+ if sprints:
+ return True
+ return False
class Organization(ChronojumpBaseModel):
diff --git a/chronojumpserver-django/chronojump_networks/templates/pages/index.html
b/chronojumpserver-django/chronojump_networks/templates/pages/index.html
index 997236c..a13328d 100644
--- a/chronojumpserver-django/chronojump_networks/templates/pages/index.html
+++ b/chronojumpserver-django/chronojump_networks/templates/pages/index.html
@@ -59,12 +59,19 @@
<!-- Results -->
<h2 class="text-center">{% trans 'Player results' %}</h2>
<div class="row buttons">
+ {% if user.sprint_exist %}
<div class="col-sm-6">
<a class="btn btn-outline-dark btn-block font-weight-bold text-uppercase" href="{% url
'results:list' %}">{% trans 'Encoder results' %}</a>
</div>
+
<div class="col-sm-6">
<a class="btn btn-outline-dark btn-block font-weight-bold text-uppercase" href="{% url
'results:sprint' %}">{% trans 'Sprint results' %}</a>
</div>
+ {% else %}
+ <div class="col-sm-12">
+ <a class="btn btn-outline-dark btn-block font-weight-bold text-uppercase" href="{% url
'results:list' %}">{% trans 'Encoder results' %}</a>
+ </div>
+ {% endif %}
</div>
{% if user.groups_involved %}
<h2 class="text-center">{% trans 'My Groups' %}</h2>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]