- {% if intensity.number_of_passes_quality < 85.0 %}
+ {% if intensity.number_of_passes_quality <= 85.0 %}
- {% elif intensity.number_of_passes_quality < 95.0 %}
+ {% elif intensity.number_of_passes_quality <= 95.0 %}
- {% if intensity.average_quality < 85.0 %}
+ {% if intensity.average_quality <= 85.0 %}
{{ intensity.average_quality | floatformat:1 }}%
- {% elif intensity.average_quality < 95.0 %}
+ {% elif intensity.average_quality <= 95.0 %}
{{ intensity.average_quality | floatformat:1 }}%
{% else %}
{{ intensity.average_quality | floatformat:1 }}%
@@ -93,59 +93,39 @@
Skill/passe
-
{{ intensity.mean_quantity_of_skill_by_passe | floatformat:3 }}
-
Skill/time
-
{{ intensity.mean_quantity_of_skill_by_time | floatformat:3 }}
-
Diff/Skill
- {{ intensity.mean_difficulty_by_skill_in_unit | floatformat:3 }}
+ {{ intensity.mean_difficulty_by_skill_in_unit | floatformat:3 }}
Time/passe
- {% if intensity.number_of_gymnast == 2 %}
- {% if intensity.mean_time_by_passe > 3.50 %}
- {{ intensity.mean_time_by_passe | floatformat:3 }}
- {% elif intensity.mean_time_by_passe > 3.20 %}
- {{ intensity.mean_time_by_passe | floatformat:3 }}
- {% else %}
- {{ intensity.mean_time_by_passe | floatformat:3 }}
- {% endif %}
- {% elif intensity.number_of_gymnast == 3 %}
- {% if intensity.mean_time_by_passe > 5.05 %}
- {{ intensity.mean_time_by_passe | floatformat:3 }}
- {% elif intensity.mean_time_by_passe > 4.40 %}
- {{ intensity.mean_time_by_passe | floatformat:3 }}
- {% else %}
- {{ intensity.mean_time_by_passe | floatformat:3 }}
- {% endif %}
+ {% if intensity.passes_quality_for_gymnast >= 3 %}
+ {{ intensity.mean_time_by_passe | floatformat:3 }}
+ {% elif intensity.passes_quality_for_gymnast == 2 %}
+ {{ intensity.mean_time_by_passe | floatformat:3 }}
{% else %}
- {{ intensity.mean_time_by_passe | floatformat:3 }}
+ {{ intensity.mean_time_by_passe | floatformat:3 }}
{% endif %}
Diff/passe
-
{{ intensity.mean_difficulty_by_passe_in_unit | floatformat:3 }}
-
Time/Skill
-
{{ intensity.mean_time_by_skill | floatformat:3 }}
-
diff --git a/jarvis/followup/templates/intensities/list.html b/jarvis/followup/templates/intensities/list.html
index 7e23191..cefc161 100644
--- a/jarvis/followup/templates/intensities/list.html
+++ b/jarvis/followup/templates/intensities/list.html
@@ -68,9 +68,9 @@
{{ intensity.number_of_passes_quality | floatformat:0 }} |
- {% if intensity.average_quality < 85.0 %}
+ {% if intensity.average_quality <= 85.0 %}
{{ intensity.average_quality | floatformat:1 }}%
- {% elif intensity.average_quality < 95.0 %}
+ {% elif intensity.average_quality <= 95.0 %}
{{ intensity.average_quality | floatformat:1 }}%
{% else %}
{{ intensity.average_quality | floatformat:1 }}%
@@ -78,26 +78,15 @@
|
-
+
+ |
- {% if intensity.number_of_gymnast == 2 %}
- {% if intensity.mean_time_by_passe > 3.50 %}
- {{ intensity.mean_time_by_passe | floatformat:3 }}
- {% elif intensity.mean_time_by_passe > 3.20 %}
- {{ intensity.mean_time_by_passe | floatformat:3 }}
- {% else %}
- {{ intensity.mean_time_by_passe | floatformat:3 }}
- {% endif %}
- {% elif intensity.number_of_gymnast == 3 %}
- {% if intensity.mean_time_by_passe > 5.05 %}
- {{ intensity.mean_time_by_passe | floatformat:3 }}
- {% elif intensity.mean_time_by_passe > 4.40 %}
- {{ intensity.mean_time_by_passe | floatformat:3 }}
- {% else %}
- {{ intensity.mean_time_by_passe | floatformat:3 }}
- {% endif %}
+ {% if intensity.passes_quality_for_gymnast >= 3 %}
+ {{ intensity.mean_time_by_passe | floatformat:3 }}
+ {% elif intensity.passes_quality_for_gymnast == 2 %}
+ {{ intensity.mean_time_by_passe | floatformat:3 }}
{% else %}
- {{ intensity.mean_time_by_passe | floatformat:3 }}
+ {{ intensity.mean_time_by_passe | floatformat:3 }}
{% endif %}
|
diff --git a/jarvis/followup/views.py b/jarvis/followup/views.py
index b8c7034..2715201 100644
--- a/jarvis/followup/views.py
+++ b/jarvis/followup/views.py
@@ -1045,7 +1045,7 @@ def wellbeing_create_or_update(
Fatigue: {wellbeing.fatigue}
Muscle soreness: {wellbeing.muscle_soreness}
- {wellbeing.details}"""
+ {wellbeing.informations}"""
Email.objects.create(receivers=receivers, title=title, body=html_message)
send_mail(