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

Optimisation for smartphone screen and minor updates

This commit is contained in:
Gregory Trullemans 2024-01-30 08:41:50 +01:00
parent 97660e6797
commit 16359c0241
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jarvis/followup/models.py
View File

@ -545,11 +545,16 @@ class Note(Markdownizable, Seasonisable):
class Intensity(Markdownizable, Seasonisable):
"""Classe représentant l'intensité d'un entraînement
L'intensité va prendre 4 valeurs :
- la temps (en minute),
L'intensité va prendre 9 valeurs :
- le temps (en minute),
- le temps théorique
- la difficulté (en 10 ème),
- la quantité de figure et
- le nombre de passafe.
- la difficulté demandé
- la quantité de figure
- la quantité de figure demandée
- le nombre de passage
- le nombre de passage demandé
- le nombre de gymnaste par trampoline
Avec ces 4 informations, la classe va en calculer 4 autres :
- la difficulté moyenne par passage

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

@ -153,7 +153,7 @@
{% if intensity.to_markdown %}
<div class="col-12 mt-3 pt-0">
<h4>More details</h4>
<h4 class="mb-0">More details</h4>
{{ intensity.to_markdown | safe }}
</div>
{% endif %}

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

@ -64,13 +64,25 @@
<td class="text-right"><!-- Time by passe -->
<b>
{% if intensity.mean_time_by_passe > 4.13 %}
<span class="text-danger">{{ intensity.mean_time_by_passe | floatformat:2 }}</span>
{% elif intensity.mean_time_by_passe > 3.80 %}
<span class="text-warning">{{ intensity.mean_time_by_passe | floatformat:2 }}</span>
{% else %}
<span class="text-success">{{ intensity.mean_time_by_passe | floatformat:2 }}</span>
{% endif %}
{% if intensity.number_of_gymnast == 2 %}
{% if intensity.mean_time_by_passe > 3.50 %}
<span class="text-danger">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
{% elif intensity.mean_time_by_passe > 3.20 %}
<span class="text-warning">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
{% else %}
<span class="text-success">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
{% endif %}
{% elif intensity.number_of_gymnast == 3 %}
{% if intensity.mean_time_by_passe > 5.05 %}
<span class="text-danger">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
{% elif intensity.mean_time_by_passe > 4.40 %}
<span class="text-warning">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
{% else %}
<span class="text-success">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
{% endif %}
{% else %}
{{ intensity.mean_time_by_passe | floatformat:3 }}
{% endif %}
</b>
</td>
<td class="text-right">{{ intensity.mean_difficulty_by_passe_in_unit | floatformat:2 }}</td><!-- Difficulty by passe -->