diff --git a/jarvis/people/templates/gymnasts/report_choices.html b/jarvis/people/templates/gymnasts/report_choices.html
index a97adf5..db2a0e4 100644
--- a/jarvis/people/templates/gymnasts/report_choices.html
+++ b/jarvis/people/templates/gymnasts/report_choices.html
@@ -6,61 +6,85 @@
-
-
-
{% endblock %}
+
{% block footerscript %}
{% endblock %}
diff --git a/jarvis/people/templates/gymnasts/tabs/tab_documents.html b/jarvis/people/templates/gymnasts/tabs/tab_documents.html
index 072731e..31956e9 100644
--- a/jarvis/people/templates/gymnasts/tabs/tab_documents.html
+++ b/jarvis/people/templates/gymnasts/tabs/tab_documents.html
@@ -4,19 +4,17 @@
-
Reports
-
- - Weekly
- - monthly (under construction)
- - seasonly (under construction)
-
-
Career
+
Periodical
+
Report
+
+
Career
(Under construction)
-
Evaluation
-
Report
+
+
Evaluation
+
Report
diff --git a/jarvis/people/views.py b/jarvis/people/views.py
index 30881ca..0f6909b 100644
--- a/jarvis/people/views.py
+++ b/jarvis/people/views.py
@@ -180,9 +180,21 @@ def gymnast_report_list(request, gymnast_id):
Args:
gymnast_id (int) identifiant du gymnast
"""
+ gymnast = get_object_or_404(Gymnast, pk=gymnast_id)
+ today = pendulum.now().date()
+ season, week_number = from_date_to_week_number(today)
+
+ season_list = __get_distinct_followup_season_for_gymnast(gymnast_id)
+ week_number_list = sorted(
+ __get_distinct_week_number_for_season_and_gymnast(gymnast_id, season)
+ )
context = {
- "gymnast_id": gymnast_id,
+ "gymnast": gymnast,
+ "season": season,
+ "season_list": season_list,
+ "week_number": week_number,
+ "week_number_list": week_number_list,
}
return render(request, "gymnasts/tabs/tab_documents.html", context)
@@ -1101,7 +1113,7 @@ def generate_report_for_period(
.first()
)
# ROUTINES
- routine_1 = (
+ q1r1 = (
gymnast.has_routine.filter(routine_type=1)
.filter(date_begin__lte=date_begin)
.filter(Q(date_end__gte=date_begin) | Q(date_end__isnull=True))
@@ -1113,7 +1125,7 @@ def generate_report_for_period(
total_try=Sum("number_of_try"), total_succeeded=Sum("number_of_successes")
)
- routine_2 = (
+ q1r2 = (
gymnast.has_routine.filter(routine_type=2)
.filter(date_begin__lte=date_begin)
.filter(Q(date_end__gte=date_begin) | Q(date_end__isnull=True))
@@ -1125,7 +1137,7 @@ def generate_report_for_period(
total_try=Sum("number_of_try"), total_succeeded=Sum("number_of_successes")
)
- routine_3 = (
+ q2r1 = (
gymnast.has_routine.filter(routine_type=3)
.filter(date_begin__lte=date_begin)
.filter(Q(date_end__gte=date_begin) | Q(date_end__isnull=True))
@@ -1137,7 +1149,7 @@ def generate_report_for_period(
total_try=Sum("number_of_try"), total_succeeded=Sum("number_of_successes")
)
- routine_4 = (
+ sfinal = (
gymnast.has_routine.filter(routine_type=4)
.filter(date_begin__lte=date_begin)
.filter(Q(date_end__gte=date_begin) | Q(date_end__isnull=True))
@@ -1149,7 +1161,7 @@ def generate_report_for_period(
total_try=Sum("number_of_try"), total_succeeded=Sum("number_of_successes")
)
- routine_5 = (
+ final = (
gymnast.has_routine.filter(routine_type=5)
.filter(date_begin__lte=date_begin)
.filter(Q(date_end__gte=date_begin) | Q(date_end__isnull=True))
@@ -1233,11 +1245,11 @@ def generate_report_for_period(
"best_point_q2r1": best_point_routine_3,
"best_point_sf": best_point_routine_4,
"best_point_f": best_point_routine_5,
- "q1r1": routine_1,
- "q1r2": routine_2,
- "q2r1": routine_3,
- "sfinal": routine_4,
- "final": routine_5,
+ "q1r1": q1r1,
+ "q1r2": q1r2,
+ "q2r1": q2r1,
+ "sfinal": sfinal,
+ "final": final,
"q1r1_done_stat": routine_1_done_stat,
"q1r2_done_stat": routine_2_done_stat,
"q2r1_done_stat": routine_3_done_stat,