From c3cde290e9c2f5929578e04af3c92af8048db72f Mon Sep 17 00:00:00 2001 From: Gregory Trullemans Date: Wed, 10 Apr 2024 12:15:20 +0200 Subject: [PATCH] New height/weight list for gymnast --- jarvis/followup/models.py | 1 + .../followup/templates/heightweight/list.html | 232 +++++++++++++++--- jarvis/followup/views_physiological.py | 2 +- jarvis/people/views.py | 5 +- 4 files changed, 208 insertions(+), 32 deletions(-) diff --git a/jarvis/followup/models.py b/jarvis/followup/models.py index c9416da..ac8aba1 100644 --- a/jarvis/followup/models.py +++ b/jarvis/followup/models.py @@ -374,6 +374,7 @@ class HeightWeight(Seasonisable): verbose_name = "Height & weight" verbose_name_plural = "Heights & weights" unique_together = ("gymnast", "date") + ordering = ["date",] gymnast = models.ForeignKey( Gymnast, diff --git a/jarvis/followup/templates/heightweight/list.html b/jarvis/followup/templates/heightweight/list.html index fb32492..9fac766 100644 --- a/jarvis/followup/templates/heightweight/list.html +++ b/jarvis/followup/templates/heightweight/list.html @@ -1,5 +1,6 @@ {% extends "listing.html" %} {% load has_group %} +{% load static %} {% block datacontent %}
@@ -12,7 +13,7 @@
{% if request.user|has_group:"trainer" %} - + @@ -22,8 +23,75 @@
- {% if heightweight_list %} - + {% if gymnast %} +
+
+
+ + + + + + + + + + + + {% for height_weight in height_weight_list %} + + + + + + + + + {% endfor %} + +
DateHeightHips heightWeightBMI
+ + + + {{ height_weight.date | date:"j-n-Y" }}{{ height_weight.height }}{% if height_weight.hips_height == None %}-{% else %}{{ height_weight.hips_height }}{% endif %}{{ height_weight.weight }} + {% if gymnast %} + {% if gymnast.gender == 0 %} + {% if height_weight.bmi < 19 %} + {{ height_weight.bmi | floatformat:2 }} + {% elif height_weight.bmi < 21 %} + {{ height_weight.bmi | floatformat:2 }} + {% elif height_weight.bmi < 23 %} + {{ height_weight.bmi | floatformat:2 }} + {% elif height_weight.bmi < 25 %} + {{ height_weight.bmi | floatformat:2 }} + {% else %} + {{ height_weight.bmi | floatformat:2 }} + {% endif %} + {% else %} + {% if height_weight.bmi < 21 %} + {{ height_weight.bmi | floatformat:2 }} + {% elif height_weight.bmi < 23 %} + {{ height_weight.bmi | floatformat:2 }} + {% elif height_weight.bmi < 25 %} + {{ height_weight.bmi | floatformat:2 }} + {% elif height_weight.bmi < 27 %} + {{ height_weight.bmi | floatformat:2 }} + {% else %} + {{ height_weight.bmi | floatformat:2 }} + {% endif %} + {% endif %} + {% else %} + {{ height_weight.bmi | floatformat:2 }} + {% endif %} +
+
+
+ +
+
+ {% else %} + {% if height_weight_list %} + @@ -38,49 +106,49 @@ - {% for heightweight in heightweight_list %} + {% for height_weight in height_weight_list %} - + {% if not gymnast %} - + {% endif %} - - - + + + @@ -90,6 +158,7 @@ {% else %}

There are no scores corresponding to your criterias

{% endif %} + {% endif %} @@ -97,6 +166,7 @@ {% endblock %} {% block footerscript %} + {% endblock %} \ No newline at end of file diff --git a/jarvis/followup/views_physiological.py b/jarvis/followup/views_physiological.py index aa5d473..3daa418 100644 --- a/jarvis/followup/views_physiological.py +++ b/jarvis/followup/views_physiological.py @@ -350,7 +350,7 @@ def heightweight_listing(request, gymnast_id=None): gymnast__in=request.session["available_gymnast"] ) - context = {"heightweight_list": heightweight_list, "gymnast": gymnast} + context = {"height_weight_list": heightweight_list, "gymnast": gymnast} return render(request, "heightweight/list.html", context) diff --git a/jarvis/people/views.py b/jarvis/people/views.py index b9192d9..2dee2ff 100644 --- a/jarvis/people/views.py +++ b/jarvis/people/views.py @@ -237,7 +237,10 @@ def gymnast_display_physiological(request, gymnast_id): ).order_by("date") height_weight_list = HeightWeight.objects.filter( gymnast=gymnast_id, date__gte=start_date - ).order_by("date") + ) + + if height_weight_list.count() <= 3: + height_weight_list = HeightWeight.objects.filter(gymnast=gymnast_id).order_by("-date")[:5][::-1] context = { "injury_list": injury_list,
- + {{ heightweight.date | date:"j-n-Y" }}{{ height_weight.date | date:"j-n-Y" }}{% if gymnast.id in request.session.available_gymnast or request.user.is_superuser %}{% endif %}{{ heightweight.gymnast }}{% if gymnast.id in request.session.available_gymnast or request.user.is_superuser %}{% endif %}{{ height_weight.gymnast }}{{ heightweight.height }}{% if heightweight.hips_height == None %}-{% else %}{{ heightweight.hips_height }}{% endif %}{{ heightweight.weight }}{{ height_weight.height }}{% if height_weight.hips_height == None %}-{% else %}{{ height_weight.hips_height }}{% endif %}{{ height_weight.weight }} {% if gymnast %} {% if gymnast.gender == 0 %} - {% if heightweight.bmi < 19 %} - {{ heightweight.bmi | floatformat:2 }} - {% elif heightweight.bmi < 21 %} - {{ heightweight.bmi | floatformat:2 }} - {% elif heightweight.bmi < 23 %} - {{ heightweight.bmi | floatformat:2 }} - {% elif heightweight.bmi < 25 %} - {{ heightweight.bmi | floatformat:2 }} + {% if height_weight.bmi < 19 %} + {{ height_weight.bmi | floatformat:2 }} + {% elif height_weight.bmi < 21 %} + {{ height_weight.bmi | floatformat:2 }} + {% elif height_weight.bmi < 23 %} + {{ height_weight.bmi | floatformat:2 }} + {% elif height_weight.bmi < 25 %} + {{ height_weight.bmi | floatformat:2 }} {% else %} - {{ heightweight.bmi | floatformat:2 }} + {{ height_weight.bmi | floatformat:2 }} {% endif %} {% else %} - {% if heightweight.bmi < 21 %} - {{ heightweight.bmi | floatformat:2 }} - {% elif heightweight.bmi < 23 %} - {{ heightweight.bmi | floatformat:2 }} - {% elif heightweight.bmi < 25 %} - {{ heightweight.bmi | floatformat:2 }} - {% elif heightweight.bmi < 27 %} - {{ heightweight.bmi | floatformat:2 }} + {% if height_weight.bmi < 21 %} + {{ height_weight.bmi | floatformat:2 }} + {% elif height_weight.bmi < 23 %} + {{ height_weight.bmi | floatformat:2 }} + {% elif height_weight.bmi < 25 %} + {{ height_weight.bmi | floatformat:2 }} + {% elif height_weight.bmi < 27 %} + {{ height_weight.bmi | floatformat:2 }} {% else %} - {{ heightweight.bmi | floatformat:2 }} + {{ height_weight.bmi | floatformat:2 }} {% endif %} {% endif %} {% else %} - {{ heightweight.bmi | floatformat:2 }} + {{ height_weight.bmi | floatformat:2 }} {% endif %}