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

Fix bug

This commit is contained in:
Gregory Trullemans 2024-02-06 16:29:30 +01:00
parent 9ec341ab7c
commit 882220a358
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jarvis/followup/models.py
View File

@ -701,6 +701,8 @@ class Intensity(Markdownizable, Seasonisable):
# Real statistics
@property
def mean_time_by_passe(self):
average_time_in_min = self.time / self.number_of_passes
average_time_in_sec = (average_time_in_min % 1) * 60
return self.time / self.number_of_passes
@property
@ -741,15 +743,28 @@ class Intensity(Markdownizable, Seasonisable):
print(average_passe_time)
if self.mean_time_by_passe <= average_passe_time:
print("1")
return 1
if self.mean_time_by_passe <= (average_passe_time * 1.05):
print("2")
return 2
if self.mean_time_by_passe >= (average_passe_time * 1.15):
if self.mean_time_by_passe >= (average_passe_time * 1.05):
print("3")
return 3
# Human readeable scores
@property
def mean_time_by_passe_readable(self):
average_time_in_min = self.mean_time_by_passe
average_time_in_sec = round((average_time_in_min % 1) * 60)
if average_time_in_sec < 10:
average_time_in_sec = "0" + str(average_time_in_sec)
else:
average_time_in_sec = str(average_time_in_sec)
return str(int(average_time_in_min)) + "min" + average_time_in_sec
@property
def difficulty_in_unit(self):
return self.difficulty / 10

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

@ -109,11 +109,11 @@
<div class="col-2 text-right pl-0">
<b>
{% if intensity.passes_quality_for_gymnast >= 3 %}
<span class="text-danger">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
<span class="text-danger">{{ intensity.mean_time_by_passe_readable }}</span>
{% elif intensity.passes_quality_for_gymnast == 2 %}
<span class="text-warning">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
<span class="text-warning">{{ intensity.mean_time_by_passe_readable }}</span>
{% else %}
<span class="text-success">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
<span class="text-success">{{ intensity.mean_time_by_passe_readable }}</span>
{% endif %}
</b>
</div>

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

@ -82,11 +82,11 @@
<td class="text-center">
<b>
{% if intensity.passes_quality_for_gymnast >= 3 %}
<span class="text-danger">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
<span class="text-danger">{{ intensity.mean_time_by_passe_readable }}</span>
{% elif intensity.passes_quality_for_gymnast == 2 %}
<span class="text-warning">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
<span class="text-warning">{{ intensity.mean_time_by_passe_readable }}</span>
{% else %}
<span class="text-success">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
<span class="text-success">{{ intensity.mean_time_by_passe_readable }}</span>
{% endif %}
</b>
</td>