diff --git a/jarvis/people/templates/gymnasts/reports/report_periodical.html b/jarvis/people/templates/gymnasts/reports/report_periodical.html index 0264812..a619526 100644 --- a/jarvis/people/templates/gymnasts/reports/report_periodical.html +++ b/jarvis/people/templates/gymnasts/reports/report_periodical.html @@ -57,6 +57,7 @@ {% endif %} +

Physiological

@@ -162,6 +163,51 @@ No intensty for selected period. {% endif %}
+
+

Intensity

+ {% if injuries_list %} + + + + + + + + + + + + + + {% for injury in injuries_list %} + + + + + + + + + + {% endfor %} + +
DateGymnastMechanismLocationSideSkill# Week off
{{ injury.date | date:"d-m-Y" }}{{ injury.gymnast }}{{ injury.get_mechanism_display }}{{ injury.location }}{{ injury.get_body_side_display }} + {% if injury.skill %} + {{ injury.skill }} + {% else %} + - + {% endif %} + + {% if injury.nb_week_off %} + {{ injury.nb_week_off }} + {% else %} + - + {% endif %} +
+ {% else %} +

There are no injury corresponding to your criterias.

+ {% endif %} +

diff --git a/jarvis/people/views.py b/jarvis/people/views.py index 438e809..618ca7a 100644 --- a/jarvis/people/views.py +++ b/jarvis/people/views.py @@ -1003,6 +1003,8 @@ def generate_report_for_period( max_number_of_passes_value=Max("number_of_passes"), ) + injury_list = gymnast.injuries.filter(date__gte=date_begin, date__lte=date_end) + # BEST TOF number_of_tof_straightjump = Chrono.objects.filter( gymnast=gymnast, date__gte=date_begin, date__lte=date_end, chrono_type=0 @@ -1236,6 +1238,7 @@ def generate_report_for_period( # MEDICAL INFORMATIONS "wellbeing_score": wellbeing_score, "height_weight_value": height_weight_value, + "injury_list": injury_list, # INTENSITY "intensity_value": intensity_value, # TOF