From 032d438c1683eab7b2d62d612b49f1847a5badaf Mon Sep 17 00:00:00 2001 From: Gregory Trullemans Date: Fri, 7 Oct 2022 14:29:50 +0200 Subject: [PATCH] Refactor URL --- ultron/followup/urls.py | 4 ++-- ultron/followup/views.py | 24 +++++++++++++++--------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ultron/followup/urls.py b/ultron/followup/urls.py index ce13f8f1f4..5bda75c16d 100644 --- a/ultron/followup/urls.py +++ b/ultron/followup/urls.py @@ -29,8 +29,8 @@ urlpatterns = [ views.remove_jump_chrono_value, name="remove_jump_chrono_value" ), - path(r"chrono/detailed_score_for_date_range/////", views.average_jump_chrono_details_between_two_date, name="average_jump_chrono_details_between_two_date"), - path(r"chrono/detailed_score_for_date_range///season//week/", views.average_jump_chrono_details_for_week_of_season, name="average_jump_chrono_details_for_week_of_season"), + path(r"chrono/range///gymnast//routine_type/", views.average_jump_chrono_details_between_two_date, name="average_jump_chrono_details_between_two_date"), + path(r"chrono/season//week//gymnast//routine_type//", views.average_jump_chrono_details_for_week_of_season, name="average_jump_chrono_details_for_week_of_season"), path(r"note/", views.note_listing, name="note_list"), diff --git a/ultron/followup/views.py b/ultron/followup/views.py index 3d924a69ae..13aa9aaa31 100644 --- a/ultron/followup/views.py +++ b/ultron/followup/views.py @@ -78,11 +78,12 @@ def jump_chrono_details(request, chrono_id): @require_http_methods(["GET"]) def average_jump_chrono_details_for_week_of_season(request, gymnast_id, routine_type=1, season=None, week_number=1): """ Récupère tout les chronos entre deux date pour un gymnaste et un type de série + Args: gymnast_id int Identifiant d'un gymnaste - routine_type int type de série (cf. ultron/followup/models.py > ROUTINE_CHOICE) - season string date de début - week_number int date de fin + routine_type int Type de série (cf. ultron/followup/models.py > ROUTINE_CHOICE) + season string Saison sous forme "xxxx-xxxy" + week_number int numéro de semaine (1, …, 52) """ today = pendulum.now().date() week_number = int(week_number) @@ -97,19 +98,24 @@ def average_jump_chrono_details_for_week_of_season(request, gymnast_id, routine_ season = str(today.year) + "-" + str(today.year + 1) date_begin, date_end = from_week_number_to_date(season, week_number) - return average_jump_chrono_details_between_two_date(request, gymnast_id, routine_type, date_begin.strftime('%Y-%m-%d'), date_end.strftime('%Y-%m-%d')) + return average_jump_chrono_details_between_two_date( + request, + gymnast_id, + routine_type, date_begin.strftime('%Y-%m-%d'), + date_end.strftime('%Y-%m-%d') + ) @login_required @require_http_methods(["GET"]) def average_jump_chrono_details_between_two_date(request, gymnast_id, routine_type=1, date_begin=None, date_end=None): """Récupère tout les chronos entre deux date pour un gymnaste et un type de série + Args: - gymnast_id (int) Identifiant d'un gymnaste - routine_type (int) type de série (cf. ultron/followup/models.py > ROUTINE_CHOICE) - date_begin (date) date de début - date_end (date) date de fin - TODO: le cast en date devrait être dans un try ! + gymnast_id int Identifiant d'un gymnaste + routine_type int Type de série (cf. ultron/followup/models.py > ROUTINE_CHOICE) + date_begin date Date de début + date_end date Date de fin """ if date_end: