diff --git a/jarvis/people/templates/gymnasts/reports/report_periodical.html b/jarvis/people/templates/gymnasts/reports/report_periodical.html index e45ca39..87c4aa5 100644 --- a/jarvis/people/templates/gymnasts/reports/report_periodical.html +++ b/jarvis/people/templates/gymnasts/reports/report_periodical.html @@ -60,7 +60,7 @@

Physiological

- {% if mindstate_score.mean_mindstate_value or height_weight_value.mean_height_value %} + {% if wellbeing_score.mean_mindstate_value or height_weight_value.mean_height_value %} @@ -68,12 +68,36 @@ - {% if mindstate_score %} + {% if wellbeing_score %} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + {% endif %} {% if height_weight_value.mean_height_value %} diff --git a/jarvis/people/views.py b/jarvis/people/views.py index 3225e88..bcfd47f 100644 --- a/jarvis/people/views.py +++ b/jarvis/people/views.py @@ -954,13 +954,25 @@ def generate_report_for_period( season_informations = gymnast.season_informations.filter(season=season).first() # PHYSIOLOGICAL INFORMATIONS - # Mindstate Score - mindstate_score = gymnast.wellbeings.filter( + # WellBeing Score + wellbeing_score = gymnast.wellbeings.filter( date__gte=date_begin, date__lte=date_end ).aggregate( min_mindstate_value=Min("mindstate"), mean_mindstate_value=Avg("mindstate"), max_mindstate_value=Max("mindstate"), + min_sleep_value=Min("sleep"), + mean_sleep_value=Avg("sleep"), + max_sleep_value=Max("sleep"), + min_stress_value=Min("stress"), + mean_stress_value=Avg("stress"), + max_stress_value=Max("stress"), + min_fatigue_value=Min("fatigue"), + mean_fatigue_value=Avg("fatigue"), + max_fatigue_value=Max("fatigue"), + min_muscle_soreness_value=Min("muscle_soreness"), + mean_muscle_soreness_value=Avg("muscle_soreness"), + max_muscle_soreness_value=Max("muscle_soreness"), ) height_weight_value = gymnast.height_weight.filter( @@ -1222,7 +1234,7 @@ def generate_report_for_period( "gymnast": gymnast, "season_informations": season_informations, # MEDICAL INFORMATIONS - "mindstate_score": mindstate_score, + "wellbeing_score": wellbeing_score, "height_weight_value": height_weight_value, # INTENSITY "intensity_value": intensity_value,
Average Max
Mind state{{ mindstate_score.min_mindstate_value }}{{ mindstate_score.mean_mindstate_value|stringformat:".1f" }}{{ mindstate_score.max_mindstate_value }}{{ wellbeing_score.min_mindstate_value }}{{ wellbeing_score.mean_mindstate_value|stringformat:".1f" }}{{ wellbeing_score.max_mindstate_value }}
Sleep{{ wellbeing_score.min_sleep_value }}{{ wellbeing_score.mean_sleep_value|stringformat:".1f" }}{{ wellbeing_score.max_sleep_value }}
Stress{{ wellbeing_score.min_stress_value }}{{ wellbeing_score.mean_stress_value|stringformat:".1f" }}{{ wellbeing_score.max_stress_value }}
Fatigue{{ wellbeing_score.min_fatigue_value }}{{ wellbeing_score.mean_fatigue_value|stringformat:".1f" }}{{ wellbeing_score.max_fatigue_value }}
Muscle soreness{{ wellbeing_score.min_muscle_soreness_value }}{{ wellbeing_score.mean_muscle_soreness_value|stringformat:".1f" }}{{ wellbeing_score.max_muscle_soreness_value }}