From 7ff74c743b9edce58f86be999250cc85b52a44da Mon Sep 17 00:00:00 2001 From: Gregory Trullemans Date: Wed, 22 Dec 2021 14:47:00 +0100 Subject: [PATCH] Adding Hips Height in followup --- templates/followup/heightweight/create.html | 11 +++++++-- templates/followup/heightweight/list.html | 2 ++ templates/peoples/gymnasts/list_routine.html | 2 +- .../peoples/gymnasts/list_scores_chronos.html | 6 ++--- .../gymnasts/physiological_followup.html | 4 ++-- ultron/followup/admin.py | 2 +- ultron/followup/forms.py | 5 +++- .../migrations/0009_auto_20211222_1318.py | 24 +++++++++++++++++++ ultron/followup/models.py | 4 +++- ultron/followup/views.py | 3 ++- 10 files changed, 50 insertions(+), 13 deletions(-) create mode 100644 ultron/followup/migrations/0009_auto_20211222_1318.py diff --git a/templates/followup/heightweight/create.html b/templates/followup/heightweight/create.html index f2daa512df..14bc9d842f 100644 --- a/templates/followup/heightweight/create.html +++ b/templates/followup/heightweight/create.html @@ -30,11 +30,18 @@
{{ form.height }} - {% if form.height.errors %} {% for error in form.skill.errors %}{{error}}{% endfor %}{% endif %} + {% if form.height.errors %} {% for error in form.height.errors %}{{error}}{% endfor %}{% endif %}
- + +
+ {{ form.hips_height }} + {% if form.hips_height.errors %} {% for error in form.hips_height.errors %}{{error}}{% endfor %}{% endif %} +
+
+
+
{{ form.weight }} {% if form.weight.errors %} {% for error in form.weight.errors %}{{error}}{% endfor %}{% endif %} diff --git a/templates/followup/heightweight/list.html b/templates/followup/heightweight/list.html index 0ae7f155db..6d5c9df260 100644 --- a/templates/followup/heightweight/list.html +++ b/templates/followup/heightweight/list.html @@ -16,6 +16,7 @@ Date Gymnast Height + Hips height Weight @@ -30,6 +31,7 @@ {{ heightweight.date | date:"d-m-Y" }} {{ heightweight.gymnast }} {{ heightweight.height }} + {{ heightweight.hips_height }} {{ heightweight.weight }} {% endfor %} diff --git a/templates/peoples/gymnasts/list_routine.html b/templates/peoples/gymnasts/list_routine.html index 79c7768a9b..a790271daf 100644 --- a/templates/peoples/gymnasts/list_routine.html +++ b/templates/peoples/gymnasts/list_routine.html @@ -41,7 +41,7 @@ {% else %} -

There are no routines corresponding to your criterias

+

There are no routines associated to this gymnast.

{% endif %}
diff --git a/templates/peoples/gymnasts/list_scores_chronos.html b/templates/peoples/gymnasts/list_scores_chronos.html index 25a14affb7..6b3716c867 100644 --- a/templates/peoples/gymnasts/list_scores_chronos.html +++ b/templates/peoples/gymnasts/list_scores_chronos.html @@ -95,9 +95,7 @@
{% else %} -
-

No score recorded for this gymnast.

-
+

No score recorded for this gymnast.

{% endif %}
@@ -169,7 +167,7 @@ }); --> {% else %} -

No chrono recorded for this gymnast.

+

No chrono recorded for this gymnast.

{% endif %}
diff --git a/templates/peoples/gymnasts/physiological_followup.html b/templates/peoples/gymnasts/physiological_followup.html index d5f2039fdd..54a64363a7 100644 --- a/templates/peoples/gymnasts/physiological_followup.html +++ b/templates/peoples/gymnasts/physiological_followup.html @@ -10,7 +10,7 @@
{% else %} -

No height/weight recorded for this gymnast.

+

No height/weight recorded for this gymnast.

{% endif %}
@@ -39,7 +39,7 @@
{% else %} -

No mindstate recorded for this gymnast.

+

No mindstate recorded for this gymnast.

{% endif %}
diff --git a/ultron/followup/admin.py b/ultron/followup/admin.py index 5d8b8953d0..f3233f776c 100644 --- a/ultron/followup/admin.py +++ b/ultron/followup/admin.py @@ -92,7 +92,7 @@ class NumberOfRoutineDoneAdmin(ForeignKeyAutocompleteAdmin): class HeightWeightAdmin(ForeignKeyAutocompleteAdmin): model = HeightWeight - list_display = ("gymnast", "height", "weight", "date") + list_display = ("gymnast", "height", "hips_height", "weight", "date") list_filter = ("gymnast",) diff --git a/ultron/followup/forms.py b/ultron/followup/forms.py index 5075eabf46..2db883eee9 100644 --- a/ultron/followup/forms.py +++ b/ultron/followup/forms.py @@ -308,7 +308,7 @@ class HeightWeightForm(forms.ModelForm): class Meta: model = HeightWeight - fields = ("gymnast", "date", "height", "weight") + fields = ("gymnast", "date", "height", "hips_height", "weight") widgets = { "gymnast": forms.HiddenInput(), "date": forms.TextInput( @@ -321,6 +321,9 @@ class HeightWeightForm(forms.ModelForm): "height": forms.NumberInput( attrs={"class": "form-control", "placeholder": "xxx,x"} ), + "hips_height": forms.NumberInput( + attrs={"class": "form-control", "placeholder": "xxx,x"} + ), "weight": forms.NumberInput( attrs={"class": "form-control", "placeholder": "xxx,x"} ), diff --git a/ultron/followup/migrations/0009_auto_20211222_1318.py b/ultron/followup/migrations/0009_auto_20211222_1318.py new file mode 100644 index 0000000000..b8247d6451 --- /dev/null +++ b/ultron/followup/migrations/0009_auto_20211222_1318.py @@ -0,0 +1,24 @@ +# Generated by Django 3.2.8 on 2021-12-22 13:18 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('people', '0001_initial'), + ('followup', '0008_alter_learnedskill_unique_together'), + ] + + operations = [ + migrations.AddField( + model_name='heightweight', + name='hips_height', + field=models.DecimalField(decimal_places=1, default=100, max_digits=4, verbose_name='Hips height'), + preserve_default=False, + ), + migrations.AlterUniqueTogether( + name='heightweight', + unique_together={('gymnast', 'date')}, + ), + ] diff --git a/ultron/followup/models.py b/ultron/followup/models.py index 18102cc0b0..c80632d432 100644 --- a/ultron/followup/models.py +++ b/ultron/followup/models.py @@ -276,6 +276,7 @@ class HeightWeight(models.Model): class Meta: verbose_name = "Height & weight" verbose_name_plural = "Heights & weights" + unique_together = ("gymnast", "date") gymnast = models.ForeignKey( Gymnast, @@ -284,8 +285,9 @@ class HeightWeight(models.Model): on_delete=models.CASCADE, ) height = models.DecimalField(max_digits=4, decimal_places=1, verbose_name="Height") + hips_height = models.DecimalField(max_digits=4, decimal_places=1, verbose_name="Hips height") weight = models.DecimalField(max_digits=4, decimal_places=1, verbose_name="Weight") date = models.DateField(default=date.today, verbose_name="Date") def __str__(self): - return "%s : %s - %s" % (self.gymnast, self.height, self.weight) + return "%s : %s/%s - %s" % (self.gymnast, self.height, self.hips_height, self.weight) diff --git a/ultron/followup/views.py b/ultron/followup/views.py index 381d2a049f..e1c746274b 100644 --- a/ultron/followup/views.py +++ b/ultron/followup/views.py @@ -364,9 +364,10 @@ def heightweight_create_or_update(request, heightweight_id=None, gymnast_id=None heightweight = get_object_or_404(HeightWeight, pk=heightweight_id) data = {"gymnast_related": heightweight.gymnast} else: + heightweight = None data = {} if gymnast_id: - heightweight = HeightWeight.objects.filter(gymnast=gymnast_id).last() + heightweight = HeightWeight.objects.filter(gymnast=gymnast_id).order_by('-date').first() gymnast = get_object_or_404(Gymnast, pk=gymnast_id) data["gymnast"] = gymnast_id data["gymnast_related"] = str(gymnast)