diff --git a/jarvis/core/templates/base.html b/jarvis/core/templates/base.html index c9424c0..fab68de 100644 --- a/jarvis/core/templates/base.html +++ b/jarvis/core/templates/base.html @@ -93,7 +93,7 @@ {% menuitem 'next_event_list' 'fal fa-calendar-alt' 'Events' %} {% if request.user|has_group:"trainer" %} - {% menuitem 'injuries_list' 'fal fa-comment-alt-medical' 'Injuries' %} + {% menuitem 'injury_list' 'fal fa-comment-alt-medical' 'Injuries' %} {% endif %} {% menuitem 'place_list' 'fal fa-map-marked-alt' 'Places' %} {% if request.user|has_group:"trainer" %} diff --git a/jarvis/followup/templates/injuries/details.html b/jarvis/followup/templates/injuries/details.html index 25bed5d..169c6f5 100644 --- a/jarvis/followup/templates/injuries/details.html +++ b/jarvis/followup/templates/injuries/details.html @@ -21,7 +21,7 @@
- + diff --git a/jarvis/followup/templates/injuries/list.html b/jarvis/followup/templates/injuries/list.html index ab82019..7efd19f 100644 --- a/jarvis/followup/templates/injuries/list.html +++ b/jarvis/followup/templates/injuries/list.html @@ -5,7 +5,7 @@
-

Injuries Listing

+

{% if gymnast %}{{ gymnast }}'s{% endif %} injuries Listing

@@ -20,13 +20,15 @@
- {% if injuries_list %} + {% if injury_list %} - + {% if not gymnast %} + + {% endif %} @@ -35,7 +37,7 @@ - {% for injury in injuries_list %} + {% for injury in injury_list %} - + {% if not gymnast %} + + {% endif %} diff --git a/jarvis/followup/tests_urls.py b/jarvis/followup/tests_urls.py index 1796ae6..e74269f 100644 --- a/jarvis/followup/tests_urls.py +++ b/jarvis/followup/tests_urls.py @@ -65,7 +65,7 @@ class URLTestCase(TestCase): self.assertEqual( resolve("/follow-up/injury/search/").view_name, "injury_search" ) - self.assertEqual(resolve("/follow-up/injury/").view_name, "injuries_list") + self.assertEqual(resolve("/follow-up/injury/").view_name, "injury_list") self.assertEqual(resolve("/follow-up/injury/add/").view_name, "injury_create") self.assertEqual( resolve("/follow-up/injury/add/1/").view_name, diff --git a/jarvis/followup/urls.py b/jarvis/followup/urls.py index 42acdae..9147a05 100644 --- a/jarvis/followup/urls.py +++ b/jarvis/followup/urls.py @@ -165,8 +165,12 @@ urlpatterns = [ # # # ACCIDENT - path(r"injury/search/", views_physiological.injuries_listing, name="injury_search"), - path(r"injury/", views_physiological.injuries_listing, name="injuries_list"), + path(r"injury/search/", views_physiological.injury_listing, name="injury_search"), + path(r"injury/", views_physiological.injury_listing, name="injury_list"), + path( + r"injury/gymnast//", + views_physiological.injury_listing, + name="injury_list_for_gymnast"), path( r"injury/add/", views_physiological.injury_create_or_update, diff --git a/jarvis/followup/views_physiological.py b/jarvis/followup/views_physiological.py index af63ee4..aa5d473 100644 --- a/jarvis/followup/views_physiological.py +++ b/jarvis/followup/views_physiological.py @@ -34,7 +34,7 @@ from .email_vars import MAIL_HEADER, MAIL_FOOTER @login_required @require_http_methods(["GET"]) -def injuries_listing(request, gymnast_id=None): +def injury_listing(request, gymnast_id=None): """ Récupère la liste des bessures. Si c'est un gymnaste qui est connecté, il ne peut récupérer que la liste de ses blessures. @@ -51,16 +51,16 @@ def injuries_listing(request, gymnast_id=None): ) ): gymnast = get_object_or_404(Gymnast, pk=gymnast_id) - injuries_list = Injury.objects.filter(gymnast=gymnast_id) + injury_list = Injury.objects.filter(gymnast=gymnast_id) else: if request.user.is_superuser: - injuries_list = Injury.objects.all() + injury_list = Injury.objects.all() else: - injuries_list = Injury.objects.filter( + injury_list = Injury.objects.filter( gymnast__in=request.session["available_gymnast"] ) - context = {"injuries_list": injuries_list, "gymnast": gymnast} + context = {"injury_list": injury_list, "gymnast": gymnast} return render(request, "injuries/list.html", context) @@ -152,7 +152,7 @@ def injury_details(request, injury_id): request.session.has_key("available_gymnast") and injury.gymnast.id not in request.session["available_gymnast"] ): - return injuries_listing(request) + return injury_listing(request) return render(request, "injuries/details.html", {"injury": injury}) diff --git a/jarvis/objective/tools.py b/jarvis/objective/tools.py index 1891ea2..fd28ec9 100644 --- a/jarvis/objective/tools.py +++ b/jarvis/objective/tools.py @@ -69,8 +69,9 @@ def compute_completude(total_skill, gymnast_nb_known_skills, max_level_skill): max_skill (int): nombre maximum de skill. Returns: - string: pourcentage de skill connus. + string: pourcentage de skill connus sous forme de string. int: niveau estimé du gymnaste. + float: pourcentage de skill connus sous forme de nombre Example: >>> from jarvis.objective.tools import compute_completude @@ -80,11 +81,12 @@ def compute_completude(total_skill, gymnast_nb_known_skills, max_level_skill): if total_skill: percentage = gymnast_nb_known_skills / total_skill completude = f"{int(percentage * 100)}%" - evaluated_level = int(max_level_skill * percentage) + estimated_level = int(max_level_skill * percentage) else: + percentage = 0 completude = None - evaluated_level = None - return completude, evaluated_level + estimated_level = None + return completude, estimated_level, int(percentage * 100) def compute_statistics_by_type( diff --git a/jarvis/people/models.py b/jarvis/people/models.py index 68af7c1..5a38823 100644 --- a/jarvis/people/models.py +++ b/jarvis/people/models.py @@ -221,7 +221,7 @@ class Gymnast(Markdownizable): """ Calcule toutes les statistiques par rapport au niveau/rang suivant le paramètre transmis. - 1. On va chercher le niveau/rang maximum de skill que le gymnast sait faire + 1. On va chercher le type (niveau ou rang) maximum de skill que le gymnast sait faire 2. 0n va chercher le nombre de skill par niveau/rang que le gymnast sait faire nb_known_skill_by_type = [ { @@ -259,6 +259,7 @@ class Gymnast(Markdownizable): context = {} skill_max = self.skill_max_for_type(desired_type) gymnast_nb_known_skills = self.known_skills.distinct("skill").count() + context["gymnast_nb_known_skills"] = gymnast_nb_known_skills if skill_max > 0: cpt_known_skill_by_type = self.nb_known_skill_by_type( @@ -275,10 +276,16 @@ class Gymnast(Markdownizable): tmp = Skill.objects.all() context["total_skill"] = tmp.count() context["unknown_skill"] = tmp + context["percentages"] = 0 - context["completude"], context["evaluated_level"] = compute_completude( + context["completude"], context["estimated_level"], context["percentage_known_skill"] = compute_completude( context["total_skill"], gymnast_nb_known_skills, skill_max ) + # print(context["percentage_known_skill"]) + # print(context["gymnast_nb_known_skills"]) + # print(context["completude"]) + # print(context["estimated_level"]) + context["max_" + desired_type + "_skill"] = skill_max return context diff --git a/jarvis/people/templates/gymnasts/details.html b/jarvis/people/templates/gymnasts/details.html index b58e2b5..d9afa9d 100644 --- a/jarvis/people/templates/gymnasts/details.html +++ b/jarvis/people/templates/gymnasts/details.html @@ -61,11 +61,11 @@
- {% if gymnast_nb_known_skills %} - {% generate_level_chart_bar gymnast.id %} - {% else %} -

No level/rank information.

- {% endif %} + {% if gymnast_nb_known_skills %} + {% generate_level_chart_bar gymnast.id %} + {% else %} +

No level/rank information.

+ {% endif %}
@@ -76,19 +76,7 @@
  • - - -
    • - -
  • - - - -
    • - -
  • - - +
    • @@ -100,7 +88,7 @@
  • - +
    • @@ -111,10 +99,22 @@
  • - +
    • + +
  • + + + +
    • + +
  • + + + +
    • diff --git a/jarvis/people/templates/gymnasts/gymnast_level_chart_bar.html b/jarvis/people/templates/gymnasts/gymnast_level_chart_bar.html index 8fd33f2..9753afd 100644 --- a/jarvis/people/templates/gymnasts/gymnast_level_chart_bar.html +++ b/jarvis/people/templates/gymnasts/gymnast_level_chart_bar.html @@ -1,5 +1,5 @@

    - Estimated level : {% if gymnast_nb_known_skills %}{{ evaluated_level }}{% else %}0{% endif %} + Estimated level : {% if gymnast_nb_known_skills %}{{ estimated_level }}{% else %}0{% endif %}

    diff --git a/jarvis/people/templates/gymnasts/list_accident.html b/jarvis/people/templates/gymnasts/list_accident.html index 20ff189..6390902 100644 --- a/jarvis/people/templates/gymnasts/list_accident.html +++ b/jarvis/people/templates/gymnasts/list_accident.html @@ -5,7 +5,7 @@

    Injuries

    - {% if injuries_list %} + {% if injury_list %}
    DateGymnastGymnastMechanism Location Side
    @@ -43,7 +45,17 @@ {{ injury.date | date:"j-n-Y" }}{% if injury.gymnast.id in request.session.available_gymnast or request.user.is_superuser %}{% endif %}{{ injury.gymnast }} + {% if injury.gymnast.id in request.session.available_gymnast or request.user.is_superuser %} + + {% endif %} + {{ injury.gymnast }} + {% if injury.gymnast.id in request.session.available_gymnast or request.user.is_superuser %} + + {% endif %} + {{ injury.get_mechanism_display }} {{ injury.get_location_display }} {{ injury.get_body_side_display }}
    @@ -16,7 +16,7 @@ - {% for injury in injuries_list %} + {% for injury in injury_list %}
    diff --git a/jarvis/people/templates/gymnasts/reports/report_periodical.html b/jarvis/people/templates/gymnasts/reports/report_periodical.html index 165c77c..7daaf15 100644 --- a/jarvis/people/templates/gymnasts/reports/report_periodical.html +++ b/jarvis/people/templates/gymnasts/reports/report_periodical.html @@ -214,7 +214,7 @@

    Injury

    - {% if injuries_list %} + {% if injury_list %} @@ -228,7 +228,7 @@ - {% for injury in injuries_list %} + {% for injury in injury_list %} diff --git a/jarvis/people/templates/gymnasts/tabs/tab_events_and_notes.html b/jarvis/people/templates/gymnasts/tabs/tab_events_and_notes.html index ae4f69d..11a8534 100644 --- a/jarvis/people/templates/gymnasts/tabs/tab_events_and_notes.html +++ b/jarvis/people/templates/gymnasts/tabs/tab_events_and_notes.html @@ -5,21 +5,25 @@
    -

    {{ latest_published_note.title }}

    -

    {{ latest_published_note.date | date:'j N Y' }}

    +
    +
    +

    {{ latest_published_note.title }}

    +

    {{ latest_published_note.date | date:'j N Y' }}

    +
    + {% if request.user.id == latest_published_note.coach.id %} +
    + + + +
    + {% endif %} +
    -
    +

    {{ latest_published_note.to_markdown | safe }}

    -
    - {% if request.user.id == latest_published_note.coach.id %} - - - - {% endif %} -
    diff --git a/jarvis/people/templates/gymnasts/tabs/tab_physiological_and_wellbeing.html b/jarvis/people/templates/gymnasts/tabs/tab_physiological_and_wellbeing.html index 983313b..c67a0a8 100644 --- a/jarvis/people/templates/gymnasts/tabs/tab_physiological_and_wellbeing.html +++ b/jarvis/people/templates/gymnasts/tabs/tab_physiological_and_wellbeing.html @@ -16,7 +16,7 @@ {% if height_weight_list %} {% endif %} @@ -64,10 +64,10 @@
    -

    Injuries ({{ number_of_injuries }})

    +

    Injuries on two last month

    - {% if injuries_list %} + {% if injury_list %}
    {{ injury.date | date:"d-m-Y" }} {{ injury.gymnast }}
    @@ -82,7 +82,7 @@ - {% for injury in injuries_list %} + {% for injury in injury_list %}
    @@ -105,6 +105,13 @@ {% endif %}
    + {% if injury_list %} + + + + {% endif %}
    {% if season_information_list %} - +
    @@ -62,126 +62,22 @@ diff --git a/jarvis/people/views.py b/jarvis/people/views.py index 5e64467..b9192d9 100644 --- a/jarvis/people/views.py +++ b/jarvis/people/views.py @@ -228,8 +228,8 @@ def gymnast_display_physiological(request, gymnast_id): gymnast_id (int) identifiant du gymnast """ number_of_injuries = Injury.objects.filter(gymnast=gymnast_id).count() - start_date = pendulum.now().date().subtract(months=6) - injuries_list = Injury.objects.filter( + start_date = pendulum.now().date().subtract(months=2) + injury_list = Injury.objects.filter( gymnast=gymnast_id, date__gte=start_date ).order_by("date") wellbeing_list = WellBeing.objects.filter( @@ -240,7 +240,7 @@ def gymnast_display_physiological(request, gymnast_id): ).order_by("date") context = { - "injuries_list": injuries_list, + "injury_list": injury_list, "number_of_injuries": number_of_injuries, "wellbeing_list": wellbeing_list, "height_weight_list": height_weight_list,