From d2b7b715dbd329461c2364dce6ca79cb700102a1 Mon Sep 17 00:00:00 2001 From: Gregory Trullemans Date: Mon, 5 Feb 2024 16:51:55 +0100 Subject: [PATCH] Bug fix and improvement --- jarvis/followup/models.py | 15 ++++++ .../templates/intensities/details.html | 52 ++++++------------- .../followup/templates/intensities/list.html | 29 ++++------- jarvis/followup/views.py | 2 +- 4 files changed, 41 insertions(+), 57 deletions(-) diff --git a/jarvis/followup/models.py b/jarvis/followup/models.py index f63fe04..53a6732 100644 --- a/jarvis/followup/models.py +++ b/jarvis/followup/models.py @@ -731,6 +731,21 @@ class Intensity(Markdownizable, Seasonisable): def mean_difficulty_by_skill_in_unit(self): return self.mean_difficulty_by_skill / 10 + @property + def passes_quality_for_gymnast(self): + average_gymnast_time = 150 + ( + self.number_of_gymnast * pow(100, 1 / self.number_of_gymnast) + ) + + if self.mean_time_by_passe <= average_gymnast_time: + return 1 + + if self.mean_time_by_passe <= (average_gymnast_time * 1.05): + return 2 + + if self.mean_time_by_passe <= (average_gymnast_time * 1.15): + return 3 + # Human readeable scores @property def difficulty_in_unit(self): diff --git a/jarvis/followup/templates/intensities/details.html b/jarvis/followup/templates/intensities/details.html index abcba64..593229d 100644 --- a/jarvis/followup/templates/intensities/details.html +++ b/jarvis/followup/templates/intensities/details.html @@ -18,9 +18,9 @@
Time
- {% if intensity.time_quality < 85.0 %} + {% if intensity.time_quality <= 85.0 %} {{ intensity.time_quality | floatformat:1 }}% - {% elif intensity.time_quality < 95.0 %} + {% elif intensity.time_quality <= 95.0 %} {{ intensity.time_quality | floatformat:1 }}% {% else %} {{ intensity.time_quality | floatformat:1 }}% @@ -33,9 +33,9 @@
Diff.
- {% if intensity.difficulty_quality < 85.0 %} + {% if intensity.difficulty_quality <= 85.0 %} {{ intensity.difficulty_quality | floatformat:1 }}% - {% elif intensity.difficulty_quality < 95.0 %} + {% elif intensity.difficulty_quality <= 95.0 %} {{ intensity.difficulty_quality | floatformat:1 }}% {% else %} {{ intensity.difficulty_quality | floatformat:1 }}% @@ -48,9 +48,9 @@
Skill
- {% if intensity.quantity_of_skill_quality < 85.0 %} + {% if intensity.quantity_of_skill_quality <= 85.0 %} {{ intensity.quantity_of_skill_quality | floatformat:1 }}% - {% elif intensity.quantity_of_skill_quality < 95.0 %} + {% elif intensity.quantity_of_skill_quality <= 95.0 %} {{ intensity.quantity_of_skill_quality | floatformat:1 }}% {% else %} {{ intensity.quantity_of_skill_quality | floatformat:1 }}% @@ -63,9 +63,9 @@
Passes
- {% if intensity.number_of_passes_quality < 85.0 %} + {% if intensity.number_of_passes_quality <= 85.0 %} {{ intensity.number_of_passes_quality | floatformat:1 }}% - {% elif intensity.number_of_passes_quality < 95.0 %} + {% elif intensity.number_of_passes_quality <= 95.0 %} {{ intensity.number_of_passes_quality | floatformat:1 }}% {% else %} {{ intensity.number_of_passes_quality | floatformat:1 }}% @@ -78,9 +78,9 @@
Average
- {% 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(