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

Lots of minor improvements

This commit is contained in:
Gregory Trullemans 2024-04-30 08:31:32 +02:00
parent cfef189b1c
commit ab8bcb8d0d
6 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jarvis/core/templates/help/help.html
View File

@ -657,7 +657,8 @@
<li>Le nombre de passages demandé (calculée sur base du programme, en général calculée sur base du programme : 21)</li> <li>Le nombre de passages demandé (calculée sur base du programme, en général calculée sur base du programme : 21)</li>
</ol> </ol>
</p> </p>
<p>Vous pouvez (non obligatoire) ajouter des informations relatives à votre entraînement. Typiquement, indiquer si vous avez arrêté avant la fin de l’entraînement, pourquoi vous avez arrêté avant la fin, …</p> <p>Vous pouvez ajouter des informations relatives à votre entraînement. Typiquement, indiquer si vous avez arrêté avant la fin de l’entraînement, pourquoi vous avez arrêté avant la fin, … Ces informations deviennent <b class="text-danger">obligatoires</b> lorsque certains paramètres (qualités individuelles ou qualité globale) sont au dessus ou en dessous de certaines valeurs. Actuellement les limites inférieures sont de 70% individuellement et de 85% pour la qualité globale ; les limites supérieures sont de 105% pour les limites individuelles et de 110% pour la qualité globale.</p>
<br /> <br />
<p><u>Liste des intensités</u></p> <p><u>Liste des intensités</u></p>
@ -668,7 +669,7 @@
<p>Dans les détails d'une intensité, vous trouverez les 4 données enregistrées précédemment : la durée, le nombre de passages, le nombre d'éléments et la difficulté cumulée. En outre, sur la droite, vous trouverez les 4 statistiques calculées : la difficulté moyenne par passage, la difficulté moyenne par élément, la quantité moyenne d'éléments, et la quantité moyenne d'éléments par passage.</p> <p>Dans les détails d'une intensité, vous trouverez les 4 données enregistrées précédemment : la durée, le nombre de passages, le nombre d'éléments et la difficulté cumulée. En outre, sur la droite, vous trouverez les 4 statistiques calculées : la difficulté moyenne par passage, la difficulté moyenne par élément, la quantité moyenne d'éléments, et la quantité moyenne d'éléments par passage.</p>
<br /> <br />
<p class="gym_chronos"><b>Chronos</b></p> <p id="gym_chronos"><b>Chronos</b></p>
<p class="text-center"> <p class="text-center">
<img src="{% static "img/help/gymnast_chronos_chart.png" %}" alt="" style="width: 25vw;"> <img src="{% static "img/help/gymnast_chronos_chart.png" %}" alt="" style="width: 25vw;">
</p> </p>

2
jarvis/followup/forms.py
View File

@ -711,7 +711,7 @@ class IntensityForm(forms.ModelForm):
"informations": forms.Textarea( "informations": forms.Textarea(
attrs={ attrs={
"class": "form-control", "class": "form-control",
"placeholder": "Informations about intensity: did you do your full program, did you stop before the end, why did you stop before the end, …", # pylint: disable=line-too-long "placeholder": "Informations about intensity: why did you do more/less than your program, did you stop before the end, why did you stop before the end, …", # pylint: disable=line-too-long
} }
), ),
} }

13
jarvis/followup/templates/chronos/list.html
View File

@ -10,10 +10,7 @@
{% if gymnast.id in request.session.available_gymnast or request.user.is_superuser %} {% if gymnast.id in request.session.available_gymnast or request.user.is_superuser %}
<a href="{% url 'gymnast_details_tab' gymnast.id 'scores' %}"> <a href="{% url 'gymnast_details_tab' gymnast.id 'scores' %}">
{% endif %} {% endif %}
{{ gymnast }} {{ gymnast }}{% if gymnast.id in request.session.available_gymnast or request.user.is_superuser %}</a>{% endif %}'s
{% if gymnast.id in request.session.available_gymnast or request.user.is_superuser %}
</a>
{% endif %}'s
{% endif %} chronos {% endif %} chronos
</h4> </h4>
</div> </div>
@ -86,7 +83,13 @@
</canvas> </canvas>
</div> </div>
<div class="col-12 text-center"> <div class="col-12 text-center">
<p>{{ personnal_best.date | date:"l j F Y" }} : <b class="text-danger">{{ personnal_best.tof }}</b> (ToF) | <b>{{ personnal_best.score }}</b> sec</p> <p>{{ personnal_best_10.date | date:"l j F Y" }} : <b class="text-danger">{{ personnal_best_10.tof }}</b> (ToF) | <b>{{ personnal_best_10.score }}</b> sec</p>
{% if personnal_best_q1r1 %}
<p>{{ personnal_best_q1r1.date | date:"l j F Y" }} : <b class="text-danger">{{ personnal_best_q1r1.tof }}</b> (ToF) | <b>{{ personnal_best_q1r1.score }}</b> sec ({% widthratio personnal_best_q1r1.tof personnal_best_10.score 100 %}%)</p>
{% endif %}
{% if personnal_best_q1r2 %}
<p>{{ personnal_best_q1r2.date | date:"l j F Y" }} : <b class="text-danger">{{ personnal_best_q1r2.tof }}</b> (ToF) | <b>{{ personnal_best_q1r2.score }}</b> sec ({% widthratio personnal_best_q1r2.tof personnal_best_10.score 100 %}%)</p>
{% endif %}
</div> </div>
</div> </div>
</div> </div>

27
jarvis/followup/templates/intensities/create.html
View File

@ -15,7 +15,7 @@
method="post" class="form-horizontal" id="formulaire" name="formulaire"> method="post" class="form-horizontal" id="formulaire" name="formulaire">
{% csrf_token %} {% csrf_token %}
<div class="form-group row "> <div class="form-group row ">
<label for="id_date" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-2 col-form-label pr-0">Gymnast <span class="text-danger"><b>*</b></span></label> <label for="id_date" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-3 col-form-label pr-0">Gymnast <span class="text-danger"><b>*</b></span></label>
<div class="col-8 col-sm-9 col-md-9 col-lg-9 col-lg-8 col-xl-8 {% if form.gymnast.errors %}has-danger{% endif %}"> <div class="col-8 col-sm-9 col-md-9 col-lg-9 col-lg-8 col-xl-8 {% if form.gymnast.errors %}has-danger{% endif %}">
{{ form.gymnast }} {{ form.gymnast }}
{{ form.gymnast_related }} {{ form.gymnast_related }}
@ -23,7 +23,7 @@
</div> </div>
</div> </div>
<div class="form-group row "> <div class="form-group row ">
<label for="id_date" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-2 col-form-label pr-0">Date <span class="text-danger"><b>*</b></span></label> <label for="id_date" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-3 col-form-label pr-0">Date <span class="text-danger"><b>*</b></span></label>
<div class="col-5 col-sm-3 col-md-4 col-lg-4 col-xl-3 {% if form.date.errors %}has-danger{% endif %}"> <div class="col-5 col-sm-3 col-md-4 col-lg-4 col-xl-3 {% if form.date.errors %}has-danger{% endif %}">
{{ form.date }} {{ form.date }}
{% if form.date.errors %}<span class="btn btn-sm">{% for error in form.date.errors %}{{ error }}{% endfor %}</span>{% endif %} {% if form.date.errors %}<span class="btn btn-sm">{% for error in form.date.errors %}{{ error }}{% endfor %}</span>{% endif %}
@ -31,7 +31,7 @@
</div> </div>
<div class="form-group row "> <div class="form-group row ">
<label for="id_time" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-2 col-form-label pr-0">Time <span class="text-danger"><b>*</b></span></label> <label for="id_time" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-3 col-form-label pr-0">Time <span class="text-danger"><b>*</b></span></label>
<div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.time.errors %}has-danger{% endif %}"> <div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.time.errors %}has-danger{% endif %}">
{{ form.time }} {{ form.time }}
{% if form.time.errors %}&nbsp;<span class="btn btn-sm">{% for error in form.time.errors %}{{ error }}{% endfor %}</span>{% endif %} {% if form.time.errors %}&nbsp;<span class="btn btn-sm">{% for error in form.time.errors %}{{ error }}{% endfor %}</span>{% endif %}
@ -44,7 +44,7 @@
</div> </div>
<div class="form-group row "> <div class="form-group row ">
<label for="id_difficulty" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-2 col-form-label pr-0">Difficulty <span class="text-danger"><b>*</b></span></label> <label for="id_difficulty" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-3 col-form-label pr-0">Difficulty <span class="text-danger"><b>*</b></span></label>
<div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.difficulty.errors %}has-danger{% endif %}"> <div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.difficulty.errors %}has-danger{% endif %}">
{{ form.difficulty }} {{ form.difficulty }}
{% if form.difficulty.errors %}&nbsp;<span class="btn btn-sm">{% for error in form.difficulty.errors %}{{ error }}{% endfor %}</span>{% endif %} {% if form.difficulty.errors %}&nbsp;<span class="btn btn-sm">{% for error in form.difficulty.errors %}{{ error }}{% endfor %}</span>{% endif %}
@ -57,7 +57,7 @@
</div> </div>
<div class="form-group row "> <div class="form-group row ">
<label for="id_quantity_of_skill" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-2 col-form-label pr-0"># skill <span class="text-danger"><b>*</b></span></label> <label for="id_quantity_of_skill" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-3 col-form-label pr-0"># skill <span class="text-danger"><b>*</b></span></label>
<div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.quantity_of_skill.errors %}has-danger{% endif %}"> <div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.quantity_of_skill.errors %}has-danger{% endif %}">
{{ form.quantity_of_skill }} {{ form.quantity_of_skill }}
{% if form.quantity_of_skill.errors %}&nbsp;<span class="btn btn-sm">{% for error in form.quantity_of_skill.errors %}{{ error }}{% endfor %}</span>{% endif %} {% if form.quantity_of_skill.errors %}&nbsp;<span class="btn btn-sm">{% for error in form.quantity_of_skill.errors %}{{ error }}{% endfor %}</span>{% endif %}
@ -71,7 +71,7 @@
</div> </div>
<div class="form-group row "> <div class="form-group row ">
<label for="id_number_of_passes" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-2 col-form-label pr-0"># passes <span class="text-danger"><b>*</b></span></label> <label for="id_number_of_passes" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-3 col-form-label pr-0"># passes <span class="text-danger"><b>*</b></span></label>
<div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.number_of_passes.errors %}has-danger{% endif %}"> <div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.number_of_passes.errors %}has-danger{% endif %}">
{{ form.number_of_passes }} {{ form.number_of_passes }}
{% if form.number_of_passes.errors %}&nbsp;<span class="btn btn-sm">{% for error in form.number_of_passes.errors %}{{ error }}{% endfor %}</span>{% endif %} {% if form.number_of_passes.errors %}&nbsp;<span class="btn btn-sm">{% for error in form.number_of_passes.errors %}{{ error }}{% endfor %}</span>{% endif %}
@ -85,7 +85,7 @@
</div> </div>
<div class="form-group row "> <div class="form-group row ">
<label for="id_number_of_gymnast" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-2 col-form-label pr-0"># gymnast <span class="text-danger"><b>*</b></span></label> <label for="id_number_of_gymnast" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-3 col-form-label pr-0"># gymnast <span class="text-danger"><b>*</b></span></label>
<div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.number_of_gymnast.errors %}has-danger{% endif %}"> <div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.number_of_gymnast.errors %}has-danger{% endif %}">
{{ form.number_of_gymnast }} {{ form.number_of_gymnast }}
{% if form.number_of_gymnast.errors %}&nbsp;<span class="btn btn-sm">{% for error in form.number_of_gymnast.errors %}{{ error }}{% endfor %}</span>{% endif %} {% if form.number_of_gymnast.errors %}&nbsp;<span class="btn btn-sm">{% for error in form.number_of_gymnast.errors %}{{ error }}{% endfor %}</span>{% endif %}
@ -93,11 +93,11 @@
</div> </div>
<div class="form-group text-center" id="informations_needed"> <div class="form-group text-center" id="informations_needed">
<p class="text-danger"><b>Details required !</b></p> <p class="text-danger">Details required because at least one quality is above/under the limits.</p>
</div> </div>
<div class="form-group row "> <div class="form-group row ">
<label for="id_information" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Informations</label> <label for="id_information" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-3 col-form-label">Informations <span id="informations_star" class="text-danger"><b>*</b></span></label>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<div class="col-12 {% if form.id_informations.errors %}has-danger{% endif %}"> <div class="col-12 {% if form.id_informations.errors %}has-danger{% endif %}">
@ -119,6 +119,7 @@
{% block footerscript %} {% block footerscript %}
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
$('#informations_star').hide();
$("#informations_needed").hide(); $("#informations_needed").hide();
blackDashboard.initDateTimePicker(); blackDashboard.initDateTimePicker();
@ -138,7 +139,6 @@
function is_informations_needed() { function is_informations_needed() {
var time_quality = $('#id_theorical_time').val() / $('#id_time').val(); var time_quality = $('#id_theorical_time').val() / $('#id_time').val();
alert(time_quality);
var diff_quality = $('#id_difficulty_asked').val() / $('#id_difficulty').val(); var diff_quality = $('#id_difficulty_asked').val() / $('#id_difficulty').val();
var skill_quality = $('#id_quantity_of_skill_asked').val() / $('#id_quantity_of_skils').val(); var skill_quality = $('#id_quantity_of_skill_asked').val() / $('#id_quantity_of_skils').val();
var passe_quality = $('#id_number_of_passes_asked').val() / $('#id_number_of_passes').val(); var passe_quality = $('#id_number_of_passes_asked').val() / $('#id_number_of_passes').val();
@ -164,19 +164,20 @@
function is_information_field_too_short() { function is_information_field_too_short() {
information_length = $('#id_informations').val().length information_length = $('#id_informations').val().length
if(isNaN(information_length) || information_length < 15) { if(isNaN(information_length) || information_length < 15)
alert("Informations too shorts !");
return true; return true;
} else else
return false; return false;
}; };
$('#id_time, #id_theorical_time, #id_difficulty, #id_difficulty_asked, #id_quantity_of_skill, #id_quantity_of_skill_asked, #id_number_of_passes, #id_number_of_passes_asked').keyup(function(){ $('#id_time, #id_theorical_time, #id_difficulty, #id_difficulty_asked, #id_quantity_of_skill, #id_quantity_of_skill_asked, #id_number_of_passes, #id_number_of_passes_asked').keyup(function(){
if(is_informations_needed() && is_information_field_too_short()) { if(is_informations_needed() && is_information_field_too_short()) {
$("#informations_needed").show(); $("#informations_needed").show();
$('#informations_star').show();
$("#div_submit").hide(); $("#div_submit").hide();
} else { } else {
$("#informations_needed").hide(); $("#informations_needed").hide();
$('#informations_star').hide();
$("#div_submit").show(); $("#div_submit").show();
} }
}); });

16
jarvis/followup/views.py
View File

@ -147,16 +147,20 @@ def note_create_or_update(request, note_id=None, gymnast_id=None):
url = request.build_absolute_uri( url = request.build_absolute_uri(
reverse("gymnast_details_tab", args=(new_note.gymnast.id, "event")) reverse("gymnast_details_tab", args=(new_note.gymnast.id, "event"))
) )
receivers = [ receivers = []
new_note.gymnast.user.email,
new_note.gymnast.email_trainer, if new_note.gymnast.user.email:
] receivers.append(new_note.gymnast.user.email)
if new_note.gymnast.email_trainer:
receivers.append(new_note.gymnast.email_trainer)
title = f"{new_note.gymnast} : Nouvelle note" title = f"{new_note.gymnast} : Nouvelle note"
body = f"""<p>Bonjour,</p><p>Une nouvelle note vous a été envoyée. Vous pouvez la consulter en cliquant <a href='{url}'>ici</a>.</p>""" body = f"""<p>Bonjour {new_note.gymnast.first_name},</p><p>Une nouvelle note vous a été laissée par un de vos coaches. Vous pouvez la consulter en cliquant <a href='{url}'>ici</a>.</p>"""
send_mail( send_mail(
title, title,
"Une nouvelle note vous a été envoyée", "Une nouvelle note vous a été laissée.",
settings.EMAIL_HOST_USER, settings.EMAIL_HOST_USER,
receivers, receivers,
fail_silently=False, fail_silently=False,

8
jarvis/followup/views_chrono.py
View File

@ -394,8 +394,12 @@ def chrono_listing(request, gymnast_id=None):
"chrono_rf": base_queryset.filter(chrono_type=3), "chrono_rf": base_queryset.filter(chrono_type=3),
} }
personnal_best = Chrono.objects.filter(gymnast=gymnast_id).order_by("-tof").first() personnal_best_10 = Chrono.objects.filter(gymnast=gymnast_id, chrono_type=0).order_by("-tof").first()
context["personnal_best"] = personnal_best personnal_best_q1r1 = Chrono.objects.filter(gymnast=gymnast_id, chrono_type=1).order_by("-tof").first()
personnal_best_q1r2 = Chrono.objects.filter(gymnast=gymnast_id, chrono_type=2).order_by("-tof").first()
context["personnal_best_10"] = personnal_best_10
context["personnal_best_q1r1"] = personnal_best_q1r1
context["personnal_best_q1r2"] = personnal_best_q1r2
else: else:
context = {} context = {}