Refactor URL

This commit is contained in:
Gregory Trullemans 2022-10-07 14:29:50 +02:00
parent 2b5a47d4ae
commit 4077b1b374
2 changed files with 17 additions and 11 deletions

View File

@ -29,8 +29,8 @@ urlpatterns = [
views.remove_jump_chrono_value,
name="remove_jump_chrono_value"
),
path(r"chrono/detailed_score_for_date_range/<int:gymnast_id>/<int:routine_type>/<str:date_begin>/<str:date_end>/", views.average_jump_chrono_details_between_two_date, name="average_jump_chrono_details_between_two_date"),
path(r"chrono/detailed_score_for_date_range/<int:gymnast_id>/<int:routine_type>/season/<str:season>/week/<str:week_number>", views.average_jump_chrono_details_for_week_of_season, name="average_jump_chrono_details_for_week_of_season"),
path(r"chrono/range/<str:date_begin>/<str:date_end>/gymnast/<int:gymnast_id>/routine_type<int:routine_type>/", views.average_jump_chrono_details_between_two_date, name="average_jump_chrono_details_between_two_date"),
path(r"chrono/season/<str:season>/week/<str:week_number>/gymnast/<int:gymnast_id>/routine_type/<int: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"),

View File

@ -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: