From ec6f582bd519b3bfd2a56fe6485469a60b5e98b5 Mon Sep 17 00:00:00 2001 From: Gregory Trullemans Date: Thu, 25 Jan 2024 17:54:21 +0100 Subject: [PATCH] Update intensity model --- jarvis/followup/forms.py | 58 ++++++++++++++++++- ...062_intensity_difficulty_asked_and_more.py | 47 +++++++++++++++ jarvis/followup/models.py | 9 +++ 3 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 jarvis/followup/migrations/0062_intensity_difficulty_asked_and_more.py diff --git a/jarvis/followup/forms.py b/jarvis/followup/forms.py index 79cfdd3..8c947f8 100644 --- a/jarvis/followup/forms.py +++ b/jarvis/followup/forms.py @@ -607,6 +607,11 @@ class IntensityForm(forms.ModelForm): "number_of_passes", "informations", "date", + "theorical_time", + "difficulty_asked", + "quantity_of_skill_asked", + "number_of_passes_asked", + "number_of_gymnast", ) widgets = { "gymnast": forms.HiddenInput(), @@ -614,24 +619,75 @@ class IntensityForm(forms.ModelForm): attrs={ "class": "form-control", "placeholder": "xxx", + "min": "1", + "step": "1", + } + ), + "theorical_time": forms.NumberInput( + attrs={ + "class": "form-control", + "placeholder": "xxx", + "min": "1", + "step": "1", } ), "difficulty": forms.NumberInput( attrs={ "class": "form-control", "placeholder": "xxx", + "min": "1", + "step": "1", + } + ), + "difficulty_asked": forms.NumberInput( + attrs={ + "class": "form-control", + "placeholder": "xxx", + "min": "1", + "step": "1", } ), "quantity_of_skill": forms.NumberInput( attrs={ "class": "form-control", "placeholder": "xxx", + "min": "1", + "step": "1", + } + ), + "quantity_of_skill_asked": forms.NumberInput( + attrs={ + "class": "form-control", + "placeholder": "xxx", + "min": "1", + "step": "1", } ), "number_of_passes": forms.NumberInput( attrs={ "class": "form-control", - "placeholder": "xxx", + "placeholder": "xx", + "min": "1", + "step": "1", + "max": "99", + } + ), + "number_of_passes_asked": forms.NumberInput( + attrs={ + "class": "form-control", + "placeholder": "xx", + "min": "1", + "step": "1", + "max": "99", + } + ), + "number_of_gymnast": forms.NumberInput( + attrs={ + "class": "form-control", + "placeholder": "x", + "min": "1", + "step": "1", + "max": "25", } ), "date": forms.TextInput( diff --git a/jarvis/followup/migrations/0062_intensity_difficulty_asked_and_more.py b/jarvis/followup/migrations/0062_intensity_difficulty_asked_and_more.py new file mode 100644 index 0000000..7605300 --- /dev/null +++ b/jarvis/followup/migrations/0062_intensity_difficulty_asked_and_more.py @@ -0,0 +1,47 @@ +# Generated by Django 4.2 on 2024-01-25 16:52 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("followup", "0061_alter_competitivepointsstats_gender"), + ] + + operations = [ + migrations.AddField( + model_name="intensity", + name="difficulty_asked", + field=models.PositiveSmallIntegerField( + default=160, verbose_name="Difficulty asked (in tenths)" + ), + preserve_default=False, + ), + migrations.AddField( + model_name="intensity", + name="number_of_gymnast", + field=models.PositiveSmallIntegerField(default=2), + preserve_default=False, + ), + migrations.AddField( + model_name="intensity", + name="number_of_passes_asked", + field=models.PositiveSmallIntegerField(default=21), + preserve_default=False, + ), + migrations.AddField( + model_name="intensity", + name="quantity_of_skill_asked", + field=models.PositiveSmallIntegerField(default=60), + preserve_default=False, + ), + migrations.AddField( + model_name="intensity", + name="theorical_time", + field=models.PositiveSmallIntegerField( + default=90, verbose_name="Theorical time (in minutes)" + ), + preserve_default=False, + ), + ] diff --git a/jarvis/followup/models.py b/jarvis/followup/models.py index 4e70814..dfc8643 100644 --- a/jarvis/followup/models.py +++ b/jarvis/followup/models.py @@ -567,9 +567,18 @@ class Intensity(Markdownizable, Seasonisable): Gymnast, on_delete=models.CASCADE, related_name="intensities" ) time = models.PositiveSmallIntegerField(verbose_name="Time (in minutes)") + theorical_time = models.PositiveSmallIntegerField( + verbose_name="Theorical time (in minutes)" + ) difficulty = models.PositiveSmallIntegerField(verbose_name="Difficulty (in tenths)") + difficulty_asked = models.PositiveSmallIntegerField( + verbose_name="Difficulty asked (in tenths)" + ) quantity_of_skill = models.PositiveSmallIntegerField() + quantity_of_skill_asked = models.PositiveSmallIntegerField() number_of_passes = models.PositiveSmallIntegerField() + number_of_passes_asked = models.PositiveSmallIntegerField() + number_of_gymnast = models.PositiveSmallIntegerField() def __str__(self): return f"{self.gymnast} - {self.date} : {self.time} - {self.difficulty} - {self.quantity_of_skill} - {self.number_of_passes}" # pylint: disable=line-too-long