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

Update skill tabs

This commit is contained in:
Gregory Trullemans 2024-03-21 17:43:43 +01:00
parent d86df8007f
commit f5c4ccc68e
2 changed files with 22 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jarvis/followup/views_physiological.py
View File

@ -406,14 +406,14 @@ def heightweight_create_or_update(request, heightweight_id=None, gymnast_id=None
<ul>
<li>Height: {heightweight.height} cm</li>
<li>Weight: {heightweight.weight} kg</li>
<li>BMI: {heightweight.bmi}</li>
<li>BMI: {heightweight.bmi:.2f}</li>
</ul>"""
Email.objects.create(receivers=receivers, title=title, body=body)
send_mail(
title,
f"Un nouveau poids/taille enregistré pour {heightweight.gymnast} ({date}) : {heightweight.height} cm / {heightweight.weight} kg (BMI: {heightweight.bmi}).", # pylint: disable=line-too-long
f"Un nouveau poids/taille enregistré pour {heightweight.gymnast} ({date}) : {heightweight.height} cm / {heightweight.weight} kg (BMI: {heightweight.bmi:.2f}).", # pylint: disable=line-too-long
settings.EMAIL_HOST_USER,
receivers,
fail_silently=False,

70
jarvis/people/templates/gymnasts/tabs/tab_skills.html
View File

@ -93,9 +93,7 @@
<table class="table table-condensed table-striped tablesorter" id="table_planned_skill">
<thead>
<tr>
{% if user_is_trainer %}
<th style="width: 15%"></th>
{% endif %}
<th style="width: 15%"></th>
<th style="width: 10%">Notation</th>
<th class="header text-left" style="width: 35%">Label</th>
<th class="header text-left" style="width: 10%">Phase</th>
@ -108,7 +106,6 @@
<tbody>
{% for plan in planned_skill %}
<tr>
{% if user_is_trainer %}
<td>
<a href="{% url 'plan_update' plan.id %}">
<span class="tim-icons icon-pencil text-warning"></span>
@ -126,7 +123,7 @@
<i class="far fa-thumbs-up"></i>
</button>
</td>
{% endif %}
<td>{{ plan.educative.skill.notation }}</td>
<td class="text-left">
<a href="{% url 'skill_details' plan.educative.id %}">
@ -156,9 +153,7 @@
<table class="table table-striped table-condensed tablesorter" id="table_confused_skill">
<thead>
<tr>
{% if user_is_trainer %}
<th style="width: 10%"></th>
{% endif %}
<th style="width: 10%"></th>
<th style="width: 10%">Notation</th>
<th class="header text-left" style="width: 35%">Label</th>
<th class="header" style="width: 7%">Diff.</th>
@ -169,7 +164,6 @@
<tbody>
{% for skill in confused_skill %}
<tr>
{% if user_is_trainer %}
<td>
<!-- WITH HELP -->
<button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-without-help" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ skill.id }}" data-learning_step="2">
@ -185,7 +179,7 @@
<i class="far fa-thumbs-down"></i>
</button>
</td>
{% endif %}
<td>{{ skill.notation }}</td>
<td class="text-left">
<a href="{% url 'skill_details' skill.id %}">{{ skill.long_label }}</a>
@ -205,9 +199,7 @@
<table class="table table-striped table-condensed tablesorter" id="table_skill_with_help">
<thead>
<tr>
{% if user_is_trainer %}
<th style="width: 10%"></th>
{% endif %}
<th style="width: 10%"></th>
<th style="width: 10%">Notation</th>
<th class="header text-left" style="width: 35%">Label</th>
<th class="header" style="width: 7%">Diff.</th>
@ -218,7 +210,6 @@
<tbody>
{% for skill in skill_whith_help %}
<tr>
{% if user_is_trainer %}
<td>
<!-- WITH HELP -->
<button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-without-help" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ skill.id }}" data-learning_step="2">
@ -234,7 +225,7 @@
<i class="far fa-thumbs-down"></i>
</button>
</td>
{% endif %}
<td>{{ skill.notation }}</td>
<td class="text-left"><a href="{% url 'skill_details' skill.id %}">{{ skill.long_label }}</a></td>
<td>{{ skill.difficulty }}</td>
@ -252,9 +243,7 @@
<table class="table table-striped table-condensed tablesorter" id="table_skill_without_help">
<thead>
<tr>
{% if user_is_trainer %}
<th style="width: 12%"></th>
{% endif %}
<th style="width: 12%"></th>
<th style="width: 10%">Notation</th>
<th class="header text-left" style="width: 55%">Label</th>
<th class="header" style="width: 7%">Diff.</th>
@ -265,7 +254,6 @@
<tbody>
{% for skill in skill_without_help %}
<tr>
{% if user_is_trainer %}
<td>
<button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-with-help" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ plan.educative.id }}" data-learning_step="1">
<i class="far fa-check"></i>
@ -281,7 +269,7 @@
<i class="far fa-thumbs-down"></i>
</button>
</td>
{% endif %}
<td>{{ skill.notation }}</td>
<td class="text-left"><a href="{% url 'skill_details' skill.id %}">{{ skill.long_label }}</a></td>
<td>{{ skill.difficulty }}</td>
@ -299,9 +287,7 @@
<table class="table table-striped table-condensed tablesorter" id="table_skill_chained">
<thead>
<tr>
{% if user_is_trainer %}
<th style="width: 12%"></th>
{% endif %}
<th style="width: 12%"></th>
<th style="width: 10%">Notation</th>
<th class="header text-left" style="width: 35%">Label</th>
<th class="header" style="width: 7%">Diff.</th>
@ -312,7 +298,6 @@
<tbody>
{% for skill in skill_chained %}
<tr>
{% if user_is_trainer %}
<td>
<button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-with-help" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ plan.educative.id }}" data-learning_step="1">
<i class="far fa-check"></i>
@ -328,7 +313,7 @@
<i class="far fa-thumbs-down"></i>
</button>
</td>
{% endif %}
<td>{{ skill.notation }}</td>
<td class="text-left"><a href="{% url 'skill_details' skill.id %}">{{ skill.long_label }}</a></td>
<td>{{ skill.difficulty }}</td>
@ -346,9 +331,7 @@
<table class="table table-striped table-condensed tablesorter" id="table_skill_masterised">
<thead>
<tr>
{% if user_is_trainer %}
<th style="width: 12%"></th>
{% endif %}
<th style="width: 12%"></th>
<th style="width: 10%">Notation</th>
<th class="header text-left" style="width: 35%">Label</th>
<th class="header" style="width: 7%">Diff.</th>
@ -359,7 +342,6 @@
<tbody>
{% for skill in skill_masterised %}
<tr>
{% if user_is_trainer %}
<td>
<button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-with-help" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ plan.educative.id }}" data-learning_step="1">
<i class="far fa-check"></i>
@ -375,7 +357,7 @@
<i class="far fa-thumbs-down"></i>
</button>
</td>
{% endif %}
<td>{{ skill.notation }}</td>
<td class="text-left"><a href="{% url 'skill_details' skill.id %}">{{ skill.long_label }}</a></td>
<td>{{ skill.difficulty }}</td>
@ -393,9 +375,7 @@
<table class="table table-striped table-condensed tablesorter" id="table_by_rank">
<thead>
<tr>
{% if user_is_trainer %}
<th style="width: 13%">Actions</th>
{% endif %}
<th style="width: 13%">Actions</th>
<th style="width: 10%">Notation</th>
<th class="header text-left" style="width: 50%">Label</th>
<th class="header" style="width: 7%">Diff.</th>
@ -406,7 +386,6 @@
<tbody>
{% for skill in skill_by_rank %}
<tr>
{% if user_is_trainer %}
<td>
<a href="{% url 'add_skill_for_gymnast' gymnast.id skill.id %}">
<button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon planify_skill">
@ -426,7 +405,7 @@
<i class="far fa-thumbs-up"></i>
</button>
</td>
{% endif %}
<td>{{ skill.notation }}</td>
<td class="text-left"><a href="{% url 'skill_details' skill.id %}">{{ skill.long_label }}</a></td>
<td>{{ skill.difficulty }}</td>
@ -444,9 +423,7 @@
<table class="table table-striped table-condensed tablesorter" id="table_by_level">
<thead>
<tr>
{% if user_is_trainer %}
<th style="width: 15%">Actions</th>
{% endif %}
<th style="width: 15%">Actions</th>
<th style="width: 10%">Notation</th>
<th class="header text-left" style="width: 50%">Label</th>
<th class="header" style="width: 7%">Diff.</th>
@ -457,7 +434,6 @@
<tbody>
{% for skill in skill_by_level %}
<tr>
{% if user_is_trainer %}
<td>
<a href="{% url 'add_skill_for_gymnast' gymnast.id skill.id %}">
<button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon planify_skill">
@ -477,7 +453,7 @@
<i class="far fa-thumbs-up"></i>
</button>
</td>
{% endif %}
<td>{{ skill.notation }}</td>
<td class="text-left"><a href="{% url 'skill_details' skill.id %}">{{ skill.long_label }}</a></td>
<td>{{ skill.difficulty }}</td>
@ -495,9 +471,7 @@
<table class="table table-striped table-condensed tablesorter" id="table_by_age">
<thead>
<tr>
{% if user_is_trainer %}
<th style="width: 15%">Actions</th>
{% endif %}
<th style="width: 15%">Actions</th>
<th style="width: 10%">Notation</th>
<th class="header text-left" style="width: 50%">Label</th>
<th class="header" style="width: 7%">Diff.</th>
@ -509,7 +483,6 @@
<tbody>
{% for skill in skill_by_age %}
<tr>
{% if user_is_trainer %}
<td>
<a href="{% url 'add_skill_for_gymnast' gymnast.id skill.id %}">
<button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon planify_skill">
@ -529,7 +502,7 @@
<i class="far fa-thumbs-up"></i>
</button>
</td>
{% endif %}
<td>{{ skill.notation }}</td>
<td class="text-left"><a href="{% url 'skill_details' skill.id %}">{{ skill.long_label }}</a></td>
<td>{{ skill.difficulty }}</td>
@ -547,9 +520,7 @@
<table class="table table-striped table-condensed tablesorter" id="table_unknown_skill">
<thead>
<tr>
{% if user_is_trainer %}
<th style="width: 15%">Actions</th>
{% endif %}
<th style="width: 15%">Actions</th>
<th style="width: 10%">Notation</th>
<th class="header text-left" style="width: 50%">Label</th>
<th class="header" style="width: 7%">Diff.</th>
@ -560,7 +531,6 @@
<tbody>
{% for skill in unknown_skill %}
<tr>
{% if user_is_trainer %}
<td>
<a href="{% url 'add_skill_for_gymnast' gymnast.id skill.id %}">
<button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon planify_skill">
@ -580,7 +550,7 @@
<i class="far fa-thumbs-up"></i>
</button>
</td>
{% endif %}
<td>{{ skill.notation }}</td>
<td class="text-left"><a href="{% url 'skill_details' skill.id %}">{{ skill.long_label }}</a></td>
<td>{{ skill.difficulty }}</td>