Add warmup
This commit is contained in:
parent
50e7d037d2
commit
9845f8565c
|
@ -601,15 +601,35 @@ class IntensityForm(forms.ModelForm):
|
|||
model = Intensity
|
||||
fields = (
|
||||
"gymnast",
|
||||
"number_of_warmup_passes",
|
||||
"time_of_warmup",
|
||||
"time",
|
||||
"number_of_passes",
|
||||
"difficulty",
|
||||
"quantity_of_skill",
|
||||
"number_of_passes",
|
||||
"informations",
|
||||
"date",
|
||||
)
|
||||
widgets = {
|
||||
"gymnast": forms.HiddenInput(),
|
||||
"number_of_warmup_passes": forms.NumberInput(
|
||||
attrs={
|
||||
"class": "form-control",
|
||||
"placeholder": "xxx",
|
||||
}
|
||||
),
|
||||
"time_of_warmup": forms.NumberInput(
|
||||
attrs={
|
||||
"class": "form-control",
|
||||
"placeholder": "xxx",
|
||||
}
|
||||
),
|
||||
"quantity_of_skill": forms.NumberInput(
|
||||
attrs={
|
||||
"class": "form-control",
|
||||
"placeholder": "xxx",
|
||||
}
|
||||
),
|
||||
"time": forms.NumberInput(
|
||||
attrs={
|
||||
"class": "form-control",
|
||||
|
@ -622,12 +642,6 @@ class IntensityForm(forms.ModelForm):
|
|||
"placeholder": "xxx",
|
||||
}
|
||||
),
|
||||
"quantity_of_skill": forms.NumberInput(
|
||||
attrs={
|
||||
"class": "form-control",
|
||||
"placeholder": "xxx",
|
||||
}
|
||||
),
|
||||
"number_of_passes": forms.NumberInput(
|
||||
attrs={
|
||||
"class": "form-control",
|
||||
|
|
|
@ -0,0 +1,27 @@
|
|||
# Generated by Django 4.2 on 2023-11-24 06:36
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("followup", "0061_alter_competitivepointsstats_gender"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="intensity",
|
||||
name="number_of_warmup_passes",
|
||||
field=models.PositiveIntegerField(default=0),
|
||||
preserve_default=False,
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="intensity",
|
||||
name="time_of_warmup",
|
||||
field=models.PositiveSmallIntegerField(
|
||||
default=0, verbose_name="Warmup time (in minutes)"
|
||||
),
|
||||
preserve_default=False,
|
||||
),
|
||||
]
|
|
@ -555,8 +555,9 @@ class Intensity(Markdownizable, Seasonisable):
|
|||
Avec ces 4 informations, la classe va en calculer 4 autres :
|
||||
- la difficulté moyenne par passage
|
||||
- la difficulté moyenne par figure
|
||||
- la quantité moyene de figures par passage
|
||||
- la quantité moyenne de figures par passage
|
||||
- la quantité moyenne de figure par minute
|
||||
- le temps moyen par passage
|
||||
"""
|
||||
|
||||
class Meta:
|
||||
|
@ -571,6 +572,10 @@ class Intensity(Markdownizable, Seasonisable):
|
|||
difficulty = models.PositiveSmallIntegerField(verbose_name="Difficulty (in tenths)")
|
||||
quantity_of_skill = models.PositiveSmallIntegerField()
|
||||
number_of_passes = models.PositiveSmallIntegerField()
|
||||
number_of_warmup_passes = models.PositiveIntegerField()
|
||||
time_of_warmup = models.PositiveSmallIntegerField(
|
||||
verbose_name="Warmup time (in minutes)"
|
||||
)
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.gymnast} - {self.date} : {self.time} - {self.difficulty} - {self.quantity_of_skill} - {self.number_of_passes}"
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
method="post" class="form-horizontal" id="formulaire" name="formulaire">
|
||||
{% csrf_token %}
|
||||
<div class="form-group row ">
|
||||
<label for="id_date" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Gymnast <span class="text-danger"><b>*</b></span></label>
|
||||
<label for="id_date" class="col-4 col-sm-3 col-md-3 col-lg-3 col-xl-3 col-form-label">Gymnast <span class="text-danger"><b>*</b></span></label>
|
||||
<div class="col-8 col-sm-9 col-md-9 col-lg-6 col-lg-4 col-xl-4 {% if form.jumper.errors %}has-danger{% endif %}">
|
||||
{{ form.gymnast }}
|
||||
{{ form.gymnast_related }}
|
||||
|
@ -23,43 +23,57 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="form-group row ">
|
||||
<label for="id_date" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Date <span class="text-danger"><b>*</b></span></label>
|
||||
<label for="id_date" class="col-4 col-sm-3 col-md-3 col-lg-3 col-xl-3 col-form-label">Date <span class="text-danger"><b>*</b></span></label>
|
||||
<div class="col-5 col-sm-3 col-md-4 col-lg-4 col-xl-4 {% if form.date.errors %}has-danger{% endif %}">
|
||||
{{ form.date }}
|
||||
{% if form.date.errors %}<span class="btn btn-sm btn-danger-outline">{% for error in form.date.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row ">
|
||||
<label for="id_time" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Time <span class="text-danger"><b>*</b></span></label>
|
||||
<label for="id_time_of_warmup" class="col-4 col-sm-3 col-md-3 col-lg-3 col-xl-3 col-form-label">Warmup time<span class="text-danger"><b>*</b></span></label>
|
||||
<div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.time_of_warmup.errors %}has-danger{% endif %}">
|
||||
{{ form.time_of_warmup }}
|
||||
{% if form.time_of_warmup.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.time_of_warmup.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row ">
|
||||
<label for="id_number_of_warmup_passes" class="col-4 col-sm-3 col-md-3 col-lg-3 col-xl-3 col-form-label"># Warmup passes <span class="text-danger"><b>*</b></span></label>
|
||||
<div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.number_of_warmup_passes.errors %}has-danger{% endif %}">
|
||||
{{ form.number_of_warmup_passes }}
|
||||
{% if form.number_of_warmup_passes.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.number_of_warmup_passes.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row ">
|
||||
<label for="id_time" class="col-4 col-sm-3 col-md-3 col-lg-3 col-xl-3 col-form-label">Time <span class="text-danger"><b>*</b></span></label>
|
||||
<div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.time.errors %}has-danger{% endif %}">
|
||||
{{ form.time }}
|
||||
{% if form.time.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.time.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row ">
|
||||
<label for="id_difficulty" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Difficulty <span class="text-danger"><b>*</b></span></label>
|
||||
<div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.difficulty.errors %}has-danger{% endif %}">
|
||||
{{ form.difficulty }}
|
||||
{% if form.difficulty.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.difficulty.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row ">
|
||||
<label for="id_quantity_of_skill" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label"># of skill <span class="text-danger"><b>*</b></span></label>
|
||||
<div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.quantity_of_skill.errors %}has-danger{% endif %}">
|
||||
{{ form.quantity_of_skill }}
|
||||
{% if form.quantity_of_skill.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.quantity_of_skill.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row ">
|
||||
<label for="id_number_of_passes" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label"># of passes <span class="text-danger"><b>*</b></span></label>
|
||||
<label for="id_number_of_passes" class="col-4 col-sm-3 col-md-3 col-lg-3 col-xl-3 col-form-label"># of passes <span class="text-danger"><b>*</b></span></label>
|
||||
<div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.number_of_passes.errors %}has-danger{% endif %}">
|
||||
{{ form.number_of_passes }}
|
||||
{% if form.number_of_passes.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.number_of_passes.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row ">
|
||||
<label for="id_information" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Informations</label>
|
||||
<div class="col-5 col-sm-10 col-md-10 col-lg-10 col-xl-10 {% if form.id_informations.errors %}has-danger{% endif %}">
|
||||
<label for="id_difficulty" class="col-4 col-sm-3 col-md-3 col-lg-3 col-xl-3 col-form-label">Difficulty <span class="text-danger"><b>*</b></span></label>
|
||||
<div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.difficulty.errors %}has-danger{% endif %}">
|
||||
{{ form.difficulty }}
|
||||
{% if form.difficulty.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.difficulty.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row ">
|
||||
<label for="id_quantity_of_skill" class="col-4 col-sm-3 col-md-3 col-lg-3 col-xl-3 col-form-label"># of skill <span class="text-danger"><b>*</b></span></label>
|
||||
<div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.quantity_of_skill.errors %}has-danger{% endif %}">
|
||||
{{ form.quantity_of_skill }}
|
||||
{% if form.quantity_of_skill.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.quantity_of_skill.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row ">
|
||||
<label for="id_information" class="col-4 col-sm-3 col-md-3 col-lg-3 col-xl-3 col-form-label">Informations</label>
|
||||
<div class="col-5 col-sm-9 col-md-9 col-lg-9 col-xl-9 {% if form.id_informations.errors %}has-danger{% endif %}">
|
||||
{{ form.informations }}
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue