- {% if heightweight_list %}
-
+ {% if gymnast %}
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+ {% for height_weight in height_weight_list %}
+
+
+
+
+
+ |
+ {{ 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 %}
+ |
+
+ {% endfor %}
+
+
+
+
+
+
+
+ {% else %}
+ {% if height_weight_list %}
+
|
@@ -38,49 +106,49 @@
- {% for heightweight in heightweight_list %}
+ {% for height_weight in height_weight_list %}
-
+
|
- {{ heightweight.date | date:"j-n-Y" }} |
+ {{ height_weight.date | date:"j-n-Y" }} |
{% if not gymnast %}
- {% 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 }} |
{% endif %}
- {{ 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 %}
|
@@ -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,