From 5778631982647e641d2efcf8e4592a45ad0d1f5b Mon Sep 17 00:00:00 2001 From: Gregory Trullemans Date: Fri, 30 Sep 2022 10:29:48 +0200 Subject: [PATCH] Rebase on master to take Note and Report functionnalities --- ultron/followup/urls.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ultron/followup/urls.py b/ultron/followup/urls.py index d7cac2df95..91fc009cb2 100644 --- a/ultron/followup/urls.py +++ b/ultron/followup/urls.py @@ -48,6 +48,21 @@ urlpatterns = [ path(r"note/details//", views.note_details, name="note_details"), + path(r"chrono/details//add/", views.jump_chrono_values_create_or_update, name="jump_chrono_values_create_or_update"), + path( + r"chrono/add_jump_chrono_value/", + views.add_jump_chrono_value, + name="add_jump_chrono_value" + ), + path( + r"chrono/remove_jump_chrono_value/", + 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"), +>>>>>>> 31a996c (CTRL+Z) + + path(r"learnedskill/add/", views.learnedskill_create_or_update, name="learnedskill_create"), path( r"learnedskill/add//",