From 2360e76accc017df1067c3b1971e33c3b0026611 Mon Sep 17 00:00:00 2001 From: Gregory Trullemans Date: Sat, 10 Sep 2022 17:44:53 +0200 Subject: [PATCH] [WIP] Modification of Follow-Up url configuration --- config/urls.py | 9 +-- ultron/followup/tests_urls.py | 59 +++++++++++++++++ ultron/followup/urls.py | 120 +++++++++++++++------------------- 3 files changed, 113 insertions(+), 75 deletions(-) create mode 100644 ultron/followup/tests_urls.py diff --git a/config/urls.py b/config/urls.py index fbbb4d89e5..d7d09f77e7 100644 --- a/config/urls.py +++ b/config/urls.py @@ -34,14 +34,7 @@ urlpatterns = [ path(r"location/", include(ultron.location.urls.urlpatterns)), # Follow-up management - path(r"chrono/", include(ultron.followup.urls.chrono_urlpatterns)), - path(r"learnedskill/", include(ultron.followup.urls.learnedskill_urlpatterns)), - path(r"score/", include(ultron.followup.urls.score_urlpatterns)), - path(r"accident/", include(ultron.followup.urls.accident_urlpatterns)), - path(r"mindstate/", include(ultron.followup.urls.mindstate_urlpatterns)), - path(r"heightweight/", include(ultron.followup.urls.heightweight_urlpatterns)), - path(r"routinedone/", include(ultron.followup.urls.routinedone_urlpatterns)), - path(r"plan/", include(ultron.followup.urls.plan_urlpatterns)), + path(r"follow-up/", include(ultron.followup.urls.urlpatterns)), # Objective management path(r"objective/", include(ultron.objective.urls.urlpatterns)), diff --git a/ultron/followup/tests_urls.py b/ultron/followup/tests_urls.py new file mode 100644 index 0000000000..a08cb767cf --- /dev/null +++ b/ultron/followup/tests_urls.py @@ -0,0 +1,59 @@ +from django.test import TestCase +from django.urls import reverse, resolve + + +class URLTestCase(TestCase): + + def test_skill_url(self): + # Chrono URL + self.assertEqual(resolve("/follow-up/chrono/").view_name, 'chrono_list') + self.assertEqual(resolve("/follow-up/chrono/gymnast/1/").view_name, 'chrono_list_for_gymnast') + self.assertEqual(resolve("/follow-up/chrono/add/").view_name, 'chrono_create') + self.assertEqual(resolve("/follow-up/chrono/add/1/").view_name, 'chrono_create_for_gymnast') + self.assertEqual(resolve("/follow-up/chrono/edit/1/").view_name, 'chrono_update') + self.assertEqual(resolve("/follow-up/chrono/details/1/").view_name, 'jump_chrono_details') + self.assertEqual(resolve("/follow-up/chrono/details/1/add/").view_name, 'jump_chrono_values_create_or_update') + self.assertEqual(resolve("/follow-up/chrono/add_jump_chrono_value/").view_name, 'add_jump_chrono_value') + self.assertEqual(resolve("/follow-up/chrono/remove_jump_chrono_value/").view_name, 'remove_jump_chrono_value') + self.assertEqual(resolve("/follow-up/chrono/detailed_score_for_date_range/1/").view_name, 'average_jump_chrono_details') + + # Learned Skill URL + self.assertEqual(resolve("/follow-up/learnedskill/add/").view_name, 'learnedskill_create') + self.assertEqual(resolve("/follow-up/learnedskill/add/1/").view_name, 'learnedskill_create') + self.assertEqual(resolve("/follow-up/learnedskill/new/").view_name, 'gymnast_learn_skill') + + # Score URL + self.assertEqual(resolve("/follow-up/score/").view_name, 'score_listing') + self.assertEqual(resolve("/follow-up/score/gymnast/1/").view_name, 'score_list_for_gymnast') + self.assertEqual(resolve("/follow-up/score/add/gymnast/1/").view_name, 'score_create_for_gymnast') + self.assertEqual(resolve("/follow-up/score/add/").view_name, 'score_create') + self.assertEqual(resolve("/follow-up/score/edit/1/").view_name, 'score_update') + + # Accident URL + self.assertEqual(resolve("/follow-up/accident/search/").view_name, 'accident_search') + self.assertEqual(resolve("/follow-up/accident/").view_name, 'accident_list') + self.assertEqual(resolve("/follow-up/accident/add/").view_name, 'accident_create') + self.assertEqual(resolve("/follow-up/accident/add/1/").view_name, 'accident_create_for_gymnast') + self.assertEqual(resolve("/follow-up/accident/edit/1/").view_name, 'accident_update') + self.assertEqual(resolve("/follow-up/accident/1/").view_name, 'accident_details') + + # Mindstate URL + self.assertEqual(resolve("/follow-up/mindstate/").view_name, 'mindstate_list') + self.assertEqual(resolve("/follow-up/mindstate/gymnast/1/").view_name, 'mindstate_list_for_gymnast') + self.assertEqual(resolve("/follow-up/mindstate/add/").view_name, 'mindstate_create') + self.assertEqual(resolve("/follow-up/mindstate/add/1/").view_name, 'mindstate_create_for_gymnast') + self.assertEqual(resolve("/follow-up/mindstate/edit/1/").view_name, 'mindstate_update') + self.assertEqual(resolve("/follow-up/mindstate/1/").view_name, 'mindstate_details') + + # HeightWeigh URL + self.assertEqual(resolve("/follow-up/heightweight/gymnast/1/").view_name, 'heightweight_list_for_gymnast') + self.assertEqual(resolve("/follow-up/heightweight/add/").view_name, 'heightweight_create') + self.assertEqual(resolve("/follow-up/heightweight/add/1/").view_name, 'heightweight_create_for_gymnast') + self.assertEqual(resolve("/follow-up/heightweight/edit/1/").view_name, 'heightweight_update') + + # RoutineDone URL + self.assertEqual(resolve("/follow-up/routinedone/add/").view_name, 'routinedone_create') + self.assertEqual(resolve("/follow-up/routinedone/increment/").view_name, 'increment_routinedone') + self.assertEqual(resolve("/follow-up/routinedone/add/1/").view_name, 'routinedone_create_for_gymnast') + self.assertEqual(resolve("/follow-up/routinedone/edit/1/").view_name, 'routinedone_update') + self.assertEqual(resolve("/follow-up/routinedone/edit/1/").view_name, 'routinedone_update') diff --git a/ultron/followup/urls.py b/ultron/followup/urls.py index 333c464564..96cc5341f8 100644 --- a/ultron/followup/urls.py +++ b/ultron/followup/urls.py @@ -2,169 +2,155 @@ from django.urls import path from . import views -# Chronos -chrono_urlpatterns = [ - path(r"", views.chrono_listing, name="chrono_list"), + +urlpatterns = [ + path(r"chrono/", views.chrono_listing, name="chrono_list"), path( - r"gymnast//", + r"chrono/gymnast//", views.chrono_listing, name="chrono_list_for_gymnast", ), - path(r"add/", views.chrono_create_or_update, name="chrono_create"), + path(r"chrono/add/", views.chrono_create_or_update, name="chrono_create"), path( - r"add//", + r"chrono/add//", views.chrono_create_or_update, name="chrono_create_for_gymnast", ), - path(r"edit//", views.chrono_create_or_update, name="chrono_update"), - path(r"details//", views.jump_chrono_details, name="jump_chrono_details"), - path(r"details//add/", views.jump_chrono_values_create_or_update, name="jump_chrono_values_create_or_update"), + path(r"chrono/edit//", views.chrono_create_or_update, name="chrono_update"), + path(r"chrono/details//", views.jump_chrono_details, name="jump_chrono_details"), + path(r"chrono/details//add/", views.jump_chrono_values_create_or_update, name="jump_chrono_values_create_or_update"), path( - r"add_jump_chrono_value/", + r"chrono/add_jump_chrono_value/", views.add_jump_chrono_value, name="add_jump_chrono_value" ), path( - r"remove_jump_chrono_value/", + r"chrono/remove_jump_chrono_value/", views.remove_jump_chrono_value, name="remove_jump_chrono_value" ), - path(r"detailed_score_for_date_range//", views.average_jump_chrono_details, name="average_jump_chrono_details"), -] + path(r"chrono/detailed_score_for_date_range//", views.average_jump_chrono_details, name="average_jump_chrono_details"), -# Learned Skill -learnedskill_urlpatterns = [ - path(r"add/", views.learnedskill_create_or_update, name="learnedskill_create"), + + path(r"learnedskill/add/", views.learnedskill_create_or_update, name="learnedskill_create"), path( - r"add//", + r"learnedskill/add//", views.learnedskill_create_or_update, name="learnedskill_create", ), - path(r"new/", views.gymnast_learn_skill), -] + path(r"learnedskill/new/", views.gymnast_learn_skill, name="gymnast_learn_skill"), -# Score -score_urlpatterns = [ - path(r"", views.score_listing), + + path(r"score/", views.score_listing, name="score_listing"), path( - r"gymnast//", + r"score/gymnast//", views.score_listing, name="score_list_for_gymnast", ), path( - r"add/", + r"score/add/gymnast//", views.score_create_or_update, name="score_create_for_gymnast", ), - path(r"add", views.score_create_or_update, name="score_create"), - path(r"edit/", views.score_create_or_update, name="score_update"), -] + path(r"score/add/", views.score_create_or_update, name="score_create"), + path(r"score/edit//", views.score_create_or_update, name="score_update"), -# Accident -accident_urlpatterns = [ - path(r"search/", views.accident_listing), - path(r"", views.accident_listing, name="accident_list"), - path(r"add/", views.accident_create_or_update, name="accident_create"), + + path(r"accident/search/", views.accident_listing, name="accident_search"), + path(r"accident/", views.accident_listing, name="accident_list"), + path(r"accident/add/", views.accident_create_or_update, name="accident_create"), path( - r"add/", + r"accident/add//", views.accident_create_or_update, name="accident_create_for_gymnast", ), path( - r"edit//", + r"accident/edit//", views.accident_create_or_update, name="accident_update", ), - path(r"/", views.accident_detail, name="accident_details"), -] + path(r"accident//", views.accident_detail, name="accident_details"), -# Minstate -mindstate_urlpatterns = [ - path(r"", views.mindstate_listing, name="mindstate_list"), + + path(r"mindstate/", views.mindstate_listing, name="mindstate_list"), path( - r"gymnast//", + r"mindstate/gymnast//", views.mindstate_listing, name="mindstate_list_for_gymnast", ), - path(r"add/", views.mindstate_create_or_update, name="mindstate_create"), + path(r"mindstate/add/", views.mindstate_create_or_update, name="mindstate_create"), path( - r"add/", + r"mindstate/add//", views.mindstate_create_or_update, name="mindstate_create_for_gymnast", ), path( - r"edit//", + r"mindstate/edit//", views.mindstate_create_or_update, name="mindstate_update", ), - path(r"/", views.mindstate_detail, name="mindstate_details"), -] + path(r"mindstate//", views.mindstate_detail, name="mindstate_details"), + -# Height & Weight -heightweight_urlpatterns = [ path( - r"gymnast//", + r"heightweight/gymnast//", views.heightweight_listing, name="heightweight_list_for_gymnast", ), - path(r"add/", views.heightweight_create_or_update, name="heightweight_create"), + path(r"heightweight/add/", views.heightweight_create_or_update, name="heightweight_create"), path( - r"add/", + r"heightweight/add//", views.heightweight_create_or_update, name="heightweight_create_for_gymnast", ), path( - r"edit//", + r"heightweight/edit//", views.heightweight_create_or_update, name="heightweight_update", ), -] -# Routine done -routinedone_urlpatterns = [ + path( - r"add/", + r"routinedone/add/", views.routinedone_create_or_update, name="routinedone_create" ), path( - r"increment/", + r"routinedone/increment/", views.increment_routinedone, name="increment_routinedone" ), path( - r"add//", + r"routinedone/add//", views.routinedone_create_or_update, name="routinedone_create_for_gymnast", ), path( - r"edit//", + r"routinedone/edit//", views.routinedone_create_or_update, name="routinedone_update", ), path( - r"gymnast//", + r"routinedone/gymnast//", views.routine_done_listing, name="routinedone_list_for_gymnast", ), - path(r"", views.routine_done_listing, name="routinedone_list"), -] + path(r"routinedone/", views.routine_done_listing, name="routinedone_list"), -# Plan -plan_urlpatterns = [ - path(r"add/", views.plan_create_or_update, name="plan_create"), + + path(r"plan/add/", views.plan_create_or_update, name="plan_create"), path( - r"add//", + r"plan/add//", views.plan_create_or_update, name="add_plan_for_gymnast", ), path( - r"add///", + r"plan/add///", views.plan_create_or_update, name="add_skill_for_gymnast", ), path( - r"edit//", + r"plan/edit//", views.plan_create_or_update, name="plan_update", ),