reset_visit_code_sequence_for_subject in view mixin, remove refs to b…

…ootstrap3 template folder
clinicedc · Jan 20, 2025 · a7cb7a1 · a7cb7a1
1 parent f56578f
commit a7cb7a1
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 11 deletions.
diff --git a/...s/edc_visit_schedule/bootstrap3/home.html → ...le/templates/edc_visit_schedule/home.html b/...s/edc_visit_schedule/bootstrap3/home.html → ...le/templates/edc_visit_schedule/home.html
diff --git a/...otstrap3/subject_schedule_footer_row.html → ...schedule/subject_schedule_footer_row.html b/...otstrap3/subject_schedule_footer_row.html → ...schedule/subject_schedule_footer_row.html
diff --git a/...t_schedule/bootstrap3/visit_schedule.html → ...es/edc_visit_schedule/visit_schedule.html b/...t_schedule/bootstrap3/visit_schedule.html → ...es/edc_visit_schedule/visit_schedule.html
diff --git a/edc_visit_schedule/templatetags/edc_visit_schedule_extras.py b/edc_visit_schedule/templatetags/edc_visit_schedule_extras.py
@@ -3,17 +3,13 @@
 from django import template
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils.html import format_html
-from edc_dashboard.utils import get_bootstrap_version
 
 from ..models import SubjectScheduleHistory
 
 register = template.Library()
 
 
-@register.inclusion_tag(
-    f"edc_visit_schedule/bootstrap{get_bootstrap_version()}/"
-    f"subject_schedule_footer_row.html"
-)
+@register.inclusion_tag("edc_visit_schedule/subject_schedule_footer_row.html")
 def subject_schedule_footer_row(
     subject_identifier, visit_schedule, schedule, subject_dashboard_url
 ):

diff --git a/edc_visit_schedule/view_mixins.py b/edc_visit_schedule/view_mixins.py
@@ -3,6 +3,7 @@
 from typing import TYPE_CHECKING, Any
 
 from django.core.exceptions import ObjectDoesNotExist
+from edc_appointment.utils import reset_visit_code_sequence_for_subject
 from edc_utils import get_utcnow
 
 from .site_visit_schedules import site_visit_schedules
@@ -42,6 +43,12 @@ def get_context_data(self, **kwargs) -> dict[str, Any]:
                             self.current_schedule = schedule
                             self.current_visit_schedule = visit_schedule
                             self.current_onschedule_model = onschedule_model_obj
+                            reset_visit_code_sequence_for_subject(
+                                subject_identifier=self.subject_identifier,
+                                visit_schedule_name=self.current_visit_schedule.name,
+                                schedule_name=self.current_schedule.name,
+                            )
+
         kwargs.update(
             visit_schedules=self.visit_schedules,
             current_onschedule_model=self.current_onschedule_model,

diff --git a/edc_visit_schedule/views/home_view.py b/edc_visit_schedule/views/home_view.py
@@ -1,10 +1,9 @@
 from django.views.generic.base import TemplateView
-from edc_dashboard.utils import get_bootstrap_version
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_navbar.view_mixin import NavbarViewMixin
 
 
 class HomeView(EdcViewMixin, NavbarViewMixin, TemplateView):
-    template_name = f"edc_visit_schedule/bootstrap{get_bootstrap_version()}/home.html"
+    template_name = "edc_visit_schedule/home.html"
     navbar_name = "edc_visit_schedule"
     navbar_selected_item = "visit_schedule"
diff --git a/edc_visit_schedule/views/visit_schedule_view.py b/edc_visit_schedule/views/visit_schedule_view.py
@@ -1,17 +1,14 @@
 from typing import Any
 
 from django.views.generic.base import TemplateView
-from edc_dashboard.utils import get_bootstrap_version
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_navbar.view_mixin import NavbarViewMixin
 
 from ..site_visit_schedules import SiteVisitScheduleError, site_visit_schedules
 
 
 class VisitScheduleView(EdcViewMixin, NavbarViewMixin, TemplateView):
-    template_name = (
-        f"edc_visit_schedule/bootstrap{get_bootstrap_version()}/visit_schedule.html"
-    )
+    template_name = "edc_visit_schedule/visit_schedule.html"
     navbar_name = "edc_visit_schedule"
     navbar_selected_item = "visit_schedule"