Merge branch 'release/0.3.83' into main

edc_visit_tracking/modelform_mixins/utils.py

@@ -10,20 +10,27 @@
     from edc_crf.crf_form_validator import CrfFormValidator
     from edc_crf.crf_form_validator_mixins import CrfFormValidatorMixin
     from edc_crf.modelform_mixins import InlineCrfModelFormMixin
+    from edc_metadata.model_mixins.creates import CreatesMetadataModelMixin
+    from edc_model.models import BaseUuidModel
+    from edc_sites.model_mixins import SiteModelMixin
+
+    from edc_visit_tracking.model_mixins import VisitModelMixin as Base
 
-    from ..model_mixins import VisitModelMixin
     from ..modelform_mixins import VisitTrackingCrfModelFormMixin
 
+    class RelatedVisitModel(SiteModelMixin, CreatesMetadataModelMixin, Base, BaseUuidModel):
+        pass
+
 
 def get_related_visit(
     modelform: (
         VisitTrackingCrfModelFormMixin
         | InlineCrfModelFormMixin
         | CrfFormValidator
-        | CrfFormValidatorMixin
+        | CrfFormValidatorMixin,
     ),
     related_visit_model_attr: str = None,
-) -> VisitModelMixin | None:
+) -> RelatedVisitModel | None:
     """Returns the related visit mode instance or None.
 
     Tries instance and cleaned data.

edc_visit_tracking/modelform_mixins/visit_tracking_modelform_mixin.py

@@ -4,7 +4,6 @@
 from typing import TYPE_CHECKING
 
 from django import forms
-from django.contrib.sites.models import Site
 from edc_appointment.constants import MISSED_APPT
 from edc_sites.modelform_mixins import SiteModelFormMixin
 from edc_visit_schedule.schedule import Schedule
@@ -13,6 +12,7 @@
 from ..constants import MISSED_VISIT
 
 if TYPE_CHECKING:
+    from django.contrib.sites.models import Site
     from edc_appointment.models import Appointment