Sulley
/
Jarvis
1
0
Fork 0
Code Issues 21 Pull Requests 1 Projects Releases Wiki Activity

Update intensity table head

This commit is contained in:
Gregory Trullemans 2023-11-22 10:34:37 +01:00
parent b4f6a94177
commit ef0e8fa890
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jarvis/followup/models.py
View File

@ -592,7 +592,7 @@ class Intensity(Markdownizable, Seasonisable):
return (self.difficulty / 10) / self.number_of_passes return (self.difficulty / 10) / self.number_of_passes
@property @property
def mean_quantity_of_skill(self): def mean_quantity_of_skill_by_time(self):
return self.quantity_of_skill / self.time return self.quantity_of_skill / self.time
@property @property

2
jarvis/followup/templates/intensities/details.html
View File

@ -27,7 +27,7 @@
<div class="col-3"># Passes</div> <div class="col-3"># Passes</div>
<div class="col-3 text-right">{{ intensity.number_of_passes }}</div> <div class="col-3 text-right">{{ intensity.number_of_passes }}</div>
<div class="col-4"><b>Average Skill/time</b></div> <div class="col-4"><b>Average Skill/time</b></div>
<div class="col-2 text-right"><b>{{ intensity.mean_quantity_of_skill | floatformat:3 }}</b></div> <div class="col-2 text-right"><b>{{ intensity.mean_quantity_of_skill_by_time | floatformat:3 }}</b></div>
<div class="col-12 mt-3"> <div class="col-12 mt-3">
{% if intensity.to_markdown %} {% if intensity.to_markdown %}

2
jarvis/followup/templates/intensities/list.html
View File

@ -58,7 +58,7 @@
<td class="text-right">{{ intensity.number_of_passes }}</td> <td class="text-right">{{ intensity.number_of_passes }}</td>
<td class="text-right">{{ intensity.mean_time_by_passe | floatformat:2 }}</td> <td class="text-right">{{ intensity.mean_time_by_passe | floatformat:2 }}</td>
<td class="text-right">{{ intensity.mean_difficulty_by_passe_in_unit | floatformat:2 }}</td> <td class="text-right">{{ intensity.mean_difficulty_by_passe_in_unit | floatformat:2 }}</td>
<td class="text-right">{{ intensity.mean_quantity_of_skill | floatformat:2 }}</td> <td class="text-right">{{ intensity.mean_quantity_of_skill_by_time | floatformat:2 }}</td>
<td class="text-right">{{ intensity.quantity_of_skill_by_passe | floatformat:2 }}</td> <td class="text-right">{{ intensity.quantity_of_skill_by_passe | floatformat:2 }}</td>
<td class="text-right">{{ intensity.mean_difficulty_by_skill | floatformat:2 }}</td> <td class="text-right">{{ intensity.mean_difficulty_by_skill | floatformat:2 }}</td>
</tr> </tr>

6
jarvis/people/templates/gymnasts/tabs/tab_routines_and_routine_stats.html
View File

@ -227,11 +227,11 @@
{% endfor %} {% endfor %}
]; ];
var mean_quantity_of_skill = [ var mean_quantity_of_skill_by_time = [
{% for score in intensity_list %} {% for score in intensity_list %}
{ {
x: '{{ score.date | date:"d-m-Y" }}', x: '{{ score.date | date:"d-m-Y" }}',
y: '{{ score.mean_quantity_of_skill }}' y: '{{ score.mean_quantity_of_skill_by_time }}'
}, },
{% endfor %} {% endfor %}
]; ];
@ -268,7 +268,7 @@
cubicInterpolationMode: 'monotone', cubicInterpolationMode: 'monotone',
borderColor: 'rgb(255, 99, 132)', borderColor: 'rgb(255, 99, 132)',
pointBackgroundColor: 'rgb(255, 99, 132)', pointBackgroundColor: 'rgb(255, 99, 132)',
data: mean_quantity_of_skill data: mean_quantity_of_skill_by_time
}, },
{ {
label: '# skill/pass', label: '# skill/pass',