From ef0e8fa890374e2e8602d458ef0cb6e2e4721164 Mon Sep 17 00:00:00 2001 From: Gregory Trullemans Date: Wed, 22 Nov 2023 10:34:37 +0100 Subject: [PATCH] Update intensity table head --- jarvis/followup/models.py | 2 +- jarvis/followup/templates/intensities/details.html | 2 +- jarvis/followup/templates/intensities/list.html | 2 +- .../gymnasts/tabs/tab_routines_and_routine_stats.html | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jarvis/followup/models.py b/jarvis/followup/models.py index e5440c7..c1132e8 100644 --- a/jarvis/followup/models.py +++ b/jarvis/followup/models.py @@ -592,7 +592,7 @@ class Intensity(Markdownizable, Seasonisable): return (self.difficulty / 10) / self.number_of_passes @property - def mean_quantity_of_skill(self): + def mean_quantity_of_skill_by_time(self): return self.quantity_of_skill / self.time @property diff --git a/jarvis/followup/templates/intensities/details.html b/jarvis/followup/templates/intensities/details.html index b65e3db..cf6b40c 100644 --- a/jarvis/followup/templates/intensities/details.html +++ b/jarvis/followup/templates/intensities/details.html @@ -27,7 +27,7 @@
# Passes
{{ intensity.number_of_passes }}
Average Skill/time
-
{{ intensity.mean_quantity_of_skill | floatformat:3 }}
+
{{ intensity.mean_quantity_of_skill_by_time | floatformat:3 }}
{% if intensity.to_markdown %} diff --git a/jarvis/followup/templates/intensities/list.html b/jarvis/followup/templates/intensities/list.html index a672669..88ce91a 100644 --- a/jarvis/followup/templates/intensities/list.html +++ b/jarvis/followup/templates/intensities/list.html @@ -58,7 +58,7 @@ {{ intensity.number_of_passes }} {{ intensity.mean_time_by_passe | floatformat:2 }} {{ intensity.mean_difficulty_by_passe_in_unit | floatformat:2 }} - {{ intensity.mean_quantity_of_skill | floatformat:2 }} + {{ intensity.mean_quantity_of_skill_by_time | floatformat:2 }} {{ intensity.quantity_of_skill_by_passe | floatformat:2 }} {{ intensity.mean_difficulty_by_skill | floatformat:2 }} diff --git a/jarvis/people/templates/gymnasts/tabs/tab_routines_and_routine_stats.html b/jarvis/people/templates/gymnasts/tabs/tab_routines_and_routine_stats.html index 473016b..d097271 100644 --- a/jarvis/people/templates/gymnasts/tabs/tab_routines_and_routine_stats.html +++ b/jarvis/people/templates/gymnasts/tabs/tab_routines_and_routine_stats.html @@ -227,11 +227,11 @@ {% endfor %} ]; - var mean_quantity_of_skill = [ + var mean_quantity_of_skill_by_time = [ {% for score in intensity_list %} { x: '{{ score.date | date:"d-m-Y" }}', - y: '{{ score.mean_quantity_of_skill }}' + y: '{{ score.mean_quantity_of_skill_by_time }}' }, {% endfor %} ]; @@ -268,7 +268,7 @@ cubicInterpolationMode: 'monotone', borderColor: 'rgb(255, 99, 132)', pointBackgroundColor: 'rgb(255, 99, 132)', - data: mean_quantity_of_skill + data: mean_quantity_of_skill_by_time }, { label: '# skill/pass',