[WIP] Modification of Follow-Up url configuration

This commit is contained in:
Gregory Trullemans 2022-09-10 17:44:53 +02:00
parent 58b78b5f62
commit 2360e76acc
3 changed files with 113 additions and 75 deletions

View File

@ -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)),

View File

@ -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')

View File

@ -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/<int:gymnast_id>/",
r"chrono/gymnast/<int:gymnast_id>/",
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/<int:gymnast_id>/",
r"chrono/add/<int:gymnast_id>/",
views.chrono_create_or_update,
name="chrono_create_for_gymnast",
),
path(r"edit/<int:chrono_id>/", views.chrono_create_or_update, name="chrono_update"),
path(r"details/<int:chrono_id>/", views.jump_chrono_details, name="jump_chrono_details"),
path(r"details/<int:chrono_id>/add/", views.jump_chrono_values_create_or_update, name="jump_chrono_values_create_or_update"),
path(r"chrono/edit/<int:chrono_id>/", views.chrono_create_or_update, name="chrono_update"),
path(r"chrono/details/<int:chrono_id>/", views.jump_chrono_details, name="jump_chrono_details"),
path(r"chrono/details/<int:chrono_id>/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/<int:gymnast_id>/", views.average_jump_chrono_details, name="average_jump_chrono_details"),
]
path(r"chrono/detailed_score_for_date_range/<int:gymnast_id>/", 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/<int:gymnast_id>/",
r"learnedskill/add/<int:gymnast_id>/",
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/<int:gymnast_id>/",
r"score/gymnast/<int:gymnast_id>/",
views.score_listing,
name="score_list_for_gymnast",
),
path(
r"add/<int:gymnast_id>",
r"score/add/gymnast/<int:gymnast_id>/",
views.score_create_or_update,
name="score_create_for_gymnast",
),
path(r"add", views.score_create_or_update, name="score_create"),
path(r"edit/<int:score_id>", views.score_create_or_update, name="score_update"),
]
path(r"score/add/", views.score_create_or_update, name="score_create"),
path(r"score/edit/<int:score_id>/", 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/<int:gymnast_id>",
r"accident/add/<int:gymnast_id>/",
views.accident_create_or_update,
name="accident_create_for_gymnast",
),
path(
r"edit/<int:accident_id>/",
r"accident/edit/<int:accident_id>/",
views.accident_create_or_update,
name="accident_update",
),
path(r"<int:accident_id>/", views.accident_detail, name="accident_details"),
]
path(r"accident/<int:accident_id>/", 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/<int:gymnast_id>/",
r"mindstate/gymnast/<int:gymnast_id>/",
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/<int:gymnast_id>",
r"mindstate/add/<int:gymnast_id>/",
views.mindstate_create_or_update,
name="mindstate_create_for_gymnast",
),
path(
r"edit/<int:mindstate_id>/",
r"mindstate/edit/<int:mindstate_id>/",
views.mindstate_create_or_update,
name="mindstate_update",
),
path(r"<int:mindstate_id>/", views.mindstate_detail, name="mindstate_details"),
]
path(r"mindstate/<int:mindstate_id>/", views.mindstate_detail, name="mindstate_details"),
# Height & Weight
heightweight_urlpatterns = [
path(
r"gymnast/<int:gymnast_id>/",
r"heightweight/gymnast/<int:gymnast_id>/",
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/<int:gymnast_id>",
r"heightweight/add/<int:gymnast_id>/",
views.heightweight_create_or_update,
name="heightweight_create_for_gymnast",
),
path(
r"edit/<int:heightweight_id>/",
r"heightweight/edit/<int:heightweight_id>/",
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/<int:gymnast_id>/",
r"routinedone/add/<int:gymnast_id>/",
views.routinedone_create_or_update,
name="routinedone_create_for_gymnast",
),
path(
r"edit/<int:routinedone_id>/",
r"routinedone/edit/<int:routinedone_id>/",
views.routinedone_create_or_update,
name="routinedone_update",
),
path(
r"gymnast/<int:gymnast_id>/",
r"routinedone/gymnast/<int:gymnast_id>/",
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/<int:gymnast_id>/",
r"plan/add/<int:gymnast_id>/",
views.plan_create_or_update,
name="add_plan_for_gymnast",
),
path(
r"add/<int:gymnast_id>/<int:skill_id>/",
r"plan/add/<int:gymnast_id>/<int:skill_id>/",
views.plan_create_or_update,
name="add_skill_for_gymnast",
),
path(
r"edit/<int:plan_id>/",
r"plan/edit/<int:plan_id>/",
views.plan_create_or_update,
name="plan_update",
),