clinicedc 2.0.38__py3-none-any.whl → 2.0.40__py3-none-any.whl

edc_consent/form_validators/consent_definition_form_validator_mixin.py

@@ -23,7 +23,9 @@ if TYPE_CHECKING:
 class ConsentDefinitionFormValidatorMixin:
     @property
     def subject_consent(self):
-        cdef = self.get_consent_definition()
+        cdef = self.get_consent_definition(
+            self.report_datetime, self.report_datetime_field_attr
+        )
         return cdef.model_cls.objects.get(subject_identifier=self.subject_identifier)
 
     def get_consent_datetime_or_raise(
@@ -71,8 +73,9 @@ class ConsentDefinitionFormValidatorMixin:
         self,
         report_datetime: datetime,
         fldname: str = None,
-        error_code: str = None,
+        error_code: str | None = None,
     ) -> ConsentDefinition:
+        error_code = error_code or INVALID_ERROR
         # get the consent definition (must be from this schedule)
         schedule = getattr(self, "related_visit", self.instance).schedule
 

edc_consent/model_mixins/consent_version_model_mixin.py

@@ -24,7 +24,7 @@ class ConsentVersionModelMixin(models.Model):
     update_versions = models.BooleanField(default=False)
 
     consent_definition_name = models.CharField(
-        verbose_name="Consent definition", max_length=50, null=True, editable=False
+        verbose_name="Consent definition", max_length=50, default="", editable=False
     )
 
     def __str__(self):

edc_consent/navbars.py

@@ -7,7 +7,8 @@ navbar.register(
         name="consent",
         label="Consent",
         fa_icon="fa-user-circle",
-        url_name="edc_consent:home_url",
+        url_names_key="consent_home",
+        url_with_namespace="edc_consent:home_url",
         codename="edc_consent.nav_consent",
     )
 )

edc_crf/model_mixins/crf_model_mixin.py

@@ -2,12 +2,16 @@ from django.contrib.sites.models import Site
 
 from edc_model.models import HistoricalRecords
 from edc_sites.model_mixins import SiteModelMixin
+from edc_timepoint.model_mixins import TimepointLookupModelMixin
+from edc_timepoint.timepoint_lookup import TimepointLookup
 from edc_visit_tracking.managers import CrfCurrentSiteManager, CrfModelManager
 
 from .crf_no_manager_model_mixin import CrfNoManagerModelMixin
 
 
-class CrfModelMixin(SiteModelMixin, CrfNoManagerModelMixin):
+class CrfModelMixin(SiteModelMixin, TimepointLookupModelMixin, CrfNoManagerModelMixin):
+    timepoint_lookup_cls = TimepointLookup
+
     objects = CrfModelManager()
     on_site = CrfCurrentSiteManager()
     history = HistoricalRecords(inherit=True)

edc_crf/model_mixins/crf_no_manager_model_mixin.py

@@ -23,11 +23,11 @@ class CrfNoManagerModelMixin(
     def natural_key(self) -> tuple:
         return self.related_visit.natural_key()
 
-    natural_key.dependencies = [
+    natural_key.dependencies = (
         settings.SUBJECT_VISIT_MODEL,
         "sites.Site",
         "edc_appointment.appointment",
-    ]
+    )
 
     class Meta:
         abstract = True

edc_crf/model_mixins/singleton_crf_model_mixin.py

@@ -1,6 +1,7 @@
 from django.db import models
 
 
+
 class SingletonCrfModelMixin(models.Model):
     """Enforces one record per subject.
 
@@ -12,7 +13,6 @@ class SingletonCrfModelMixin(models.Model):
         max_length=50,
         unique=True,
         help_text="auto updated for unique constraint",
-        null=True,
         editable=False,
     )
 

edc_dashboard/middleware.py

@@ -1,33 +1,27 @@
 from django.conf import settings
 
 from .dashboard_templates import dashboard_templates
+from .middleware_mixins import EdcTemplateMiddlewareMixin
 from .url_names import url_names
 
 
-class DashboardMiddleware:
+class DashboardMiddleware(EdcTemplateMiddlewareMixin):
     def __init__(self, get_response):
         self.get_response = get_response
 
     def __call__(self, request):
-        try:
-            request.url_name_data
-        except AttributeError:
-            request.url_name_data = url_names.registry
-        try:
-            request.template_data
-        except AttributeError:
-            request.template_data = {}
-        response = self.get_response(request)
-        return response
+        self.check_for_required_request_attrs(request)
+        return self.get_response(request)
 
     def process_view(self, request, *args):
         """Adds/Updates references to urls and templates."""
-        template_data = dashboard_templates
-        try:
-            template_data.update(settings.DASHBOARD_BASE_TEMPLATES)
-        except AttributeError:
-            pass
+        request.url_name_data.update(**url_names.registry)
+        template_data = getattr(settings, "DASHBOARD_BASE_TEMPLATES", {})
+        template_data.update(**dashboard_templates)
         request.template_data.update(**template_data)
 
     def process_template_response(self, request, response):
+        if getattr(response, "context_data", None):
+            response.context_data.update(**request.url_name_data)
+            response.context_data.update(**request.template_data)
         return response

edc_dashboard/middleware_mixins.py

@@ -0,0 +1,10 @@
+class EdcTemplateMiddlewareMixin:
+    def check_for_required_request_attrs(self, request):
+        try:
+            request.url_name_data  # noqa: B018
+        except AttributeError:
+            request.url_name_data = {}
+        try:
+            request.template_data  # noqa: B018
+        except AttributeError:
+            request.template_data = {}

edc_dashboard/navbars.py

@@ -7,7 +7,7 @@ navbar.register(
         label="Edc Dashboard",
         fa_icon="fa-cogs",
         codename="edc_navbar.nav_edc_dashboard",
-        url_name="edc_dashboard:home_url",
+        url_with_namespace="edc_dashboard:home_url",
     )
 )
 

edc_dashboard/url_config.py

@@ -17,25 +17,44 @@ if TYPE_CHECKING:
     class View(UrlRequestContextMixin, BaseView): ...
 
 
+class UrlConfigError(Exception):
+    pass
+
+
 class UrlConfig:
+    """A class to generate url_patterns for edc DashboardViews,
+    ListBoardViews and SubjectReviewDashboardView.
+
+    * registers the url_with_namespace to `url_names`
+    * The pretty url uses the `url_names_key` less the '_url' suffix
+    * the url pattern name is the same as the given `url_names_key`
+
+    """
+
     def __init__(
         self,
         *,
-        url_name: str,
+        url_names_key: str,
         namespace: str,
         view_class: type[View | UrlRequestContextMixin],
-        label: str,
         identifier_label: str,
         identifier_pattern: str,
     ):
+        if not url_names_key.endswith("_url"):
+            raise UrlConfigError(
+                f"Invalid `url_names_key`. Must end with '_url'. Got {url_names_key}."
+            )
+        self.url_pattern_name = url_names_key
+        self.url_pretty_label = url_names_key.replace("_url", "")
+        self.view_class = view_class
         self.identifier_label = identifier_label
         self.identifier_pattern = identifier_pattern
-        self.label = label
-        self.url_name = url_name
-        self.view_class = view_class
 
-        # register {urlname, namespace:urlname} with url_names
-        url_names.register(url=self.url_name, namespace=namespace)
+        # register with url_names dictionary / registry
+        url_names.register(
+            key=url_names_key,
+            url_with_namespace=f"{namespace}:{self.url_pattern_name}",
+        )
 
     @property
     def dashboard_urls(self) -> list[URLPattern]:
@@ -49,13 +68,13 @@ class UrlConfig:
                 r"(?P<visit_code>\w+)/"
                 r"(?P<unscheduled>\w+)/".format(
                     **dict(
-                        label=self.label,
+                        label=self.url_pretty_label,
                         identifier_label=self.identifier_label,
                         identifier_pattern=self.identifier_pattern,
                     )
                 ),
                 self.view_class.as_view(),
-                name=self.url_name,
+                name=self.url_pattern_name,
             ),
             re_path(
                 "{label}/"
@@ -64,13 +83,13 @@ class UrlConfig:
                 r"(?P<schedule_name>\w+)/"
                 r"(?P<visit_code>\w+)/".format(
                     **dict(
-                        label=self.label,
+                        label=self.url_pretty_label,
                         identifier_label=self.identifier_label,
                         identifier_pattern=self.identifier_pattern,
                     )
                 ),
                 self.view_class.as_view(),
-                name=self.url_name,
+                name=self.url_pattern_name,
             ),
             re_path(
                 "{label}/"
@@ -79,14 +98,14 @@ class UrlConfig:
                 r"(?P<scanning>\d)/"
                 r"(?P<error>\d)/".format(
                     **dict(
-                        label=self.label,
+                        label=self.url_pretty_label,
                         identifier_label=self.identifier_label,
                         identifier_pattern=self.identifier_pattern,
                         uuid_pattern=UUID_PATTERN.pattern,
                     )
                 ),
                 self.view_class.as_view(),
-                name=self.url_name,
+                name=self.url_pattern_name,
             ),
             re_path(
                 "{label}/"
@@ -94,52 +113,52 @@ class UrlConfig:
                 "(?P<appointment>{uuid_pattern})/"
                 r"(?P<reason>\w+)/".format(
                     **dict(
-                        label=self.label,
+                        label=self.url_pretty_label,
                         identifier_label=self.identifier_label,
                         identifier_pattern=self.identifier_pattern,
                         uuid_pattern=UUID_PATTERN.pattern,
                     )
                 ),
                 self.view_class.as_view(),
-                name=self.url_name,
+                name=self.url_pattern_name,
             ),
             re_path(
                 "{label}/"
                 "(?P<{identifier_label}>{identifier_pattern})/"
                 "(?P<appointment>{uuid_pattern})/".format(
                     **dict(
-                        label=self.label,
+                        label=self.url_pretty_label,
                         identifier_label=self.identifier_label,
                         identifier_pattern=self.identifier_pattern,
                         uuid_pattern=UUID_PATTERN.pattern,
                     )
                 ),
                 self.view_class.as_view(),
-                name=self.url_name,
+                name=self.url_pattern_name,
             ),
             re_path(
                 "{label}/"
                 "(?P<{identifier_label}>{identifier_pattern})/"
                 r"(?P<schedule_name>\w+)/".format(
                     **dict(
-                        label=self.label,
+                        label=self.url_pretty_label,
                         identifier_label=self.identifier_label,
                         identifier_pattern=self.identifier_pattern,
                     )
                 ),
                 self.view_class.as_view(),
-                name=self.url_name,
+                name=self.url_pattern_name,
             ),
             re_path(
                 "{label}/(?P<{identifier_label}>{identifier_pattern})/".format(
                     **dict(
-                        label=self.label,
+                        label=self.url_pretty_label,
                         identifier_label=self.identifier_label,
                         identifier_pattern=self.identifier_pattern,
                     )
                 ),
                 self.view_class.as_view(),
-                name=self.url_name,
+                name=self.url_pattern_name,
             ),
         ]
 
@@ -154,34 +173,34 @@ class UrlConfig:
                 "{label}/(?P<{identifier_label}>{identifier_pattern})/"
                 r"(?P<page>\d+)/".format(
                     **dict(
-                        label=self.label,
+                        label=self.url_pretty_label,
                         identifier_label=self.identifier_label,
                         identifier_pattern=self.identifier_pattern,
                     )
                 ),
                 self.view_class.as_view(),
-                name=self.url_name,
+                name=self.url_pattern_name,
             ),
             re_path(
                 "{label}/(?P<{identifier_label}>{identifier_pattern})/".format(
                     **dict(
-                        label=self.label,
+                        label=self.url_pretty_label,
                         identifier_label=self.identifier_label,
                         identifier_pattern=self.identifier_pattern,
                     )
                 ),
                 self.view_class.as_view(),
-                name=self.url_name,
+                name=self.url_pattern_name,
             ),
             re_path(
-                r"{label}/(?P<page>\d+)/".format(**dict(label=self.label)),
+                r"{label}/(?P<page>\d+)/".format(**dict(label=self.url_pretty_label)),
                 self.view_class.as_view(),
-                name=self.url_name,
+                name=self.url_pattern_name,
             ),
             re_path(
-                r"{label}/".format(**dict(label=self.label)),
+                r"{label}/".format(**dict(label=self.url_pretty_label)),
                 self.view_class.as_view(),
-                name=self.url_name,
+                name=self.url_pattern_name,
             ),
         ]
 
@@ -192,14 +211,14 @@ class UrlConfig:
                 "{label}/(?P<{identifier_label}>{identifier_pattern})/"
                 "(?P<appointment>{uuid_pattern})/".format(
                     **dict(
-                        label=self.label,
+                        label=self.url_pretty_label,
                         identifier_label=self.identifier_label,
                         identifier_pattern=self.identifier_pattern,
                         uuid_pattern=UUID_PATTERN.pattern,
                     )
                 ),
                 self.view_class.as_view(),
-                name=self.url_name,
+                name=self.url_pattern_name,
             )
         ]
         url_patterns.extend(self.listboard_urls)

edc_dashboard/url_names.py

@@ -16,35 +16,41 @@ class UrlNames:
     registry: dict[str, str] = field(default_factory=dict)
 
     def register(
-        self, name: str | None = None, url: str | None = None, namespace: str | None = None
+        self,
+        key: str,
+        namespace: str | None = None,
+        url: str | None = None,
+        url_with_namespace: str | None = None,
     ) -> None:
-        name = name or url
-        complete_url = f"{namespace}:{url}" if namespace else url
-        if name in self.registry:
-            raise AlreadyRegistered(f"Url already registered. Got {complete_url}.")
-        self.registry.update({name: complete_url})
+        url_with_namespace = url_with_namespace or f"{namespace}:{url}"
+        if key in self.registry:
+            raise AlreadyRegistered(
+                "Url already registered with url_names. "
+                f"See {key}:{self.registry[key]}. Got {url_with_namespace}."
+            )
+        self.registry.update({key: url_with_namespace})
 
     def register_from_dict(self, **urldata: str) -> None:
-        for name, complete_url in urldata.items():
+        for key, url_with_namespace in urldata.items():
             try:
-                namespace, url = complete_url.split(":")
+                namespace, url = url_with_namespace.split(":")
             except ValueError:
-                namespace, url = complete_url, None
-            self.register(name=name, url=url, namespace=namespace)
+                namespace, url = url_with_namespace, None
+            self.register(key, namespace, url=url)
 
     def all(self) -> dict[str, str]:
         return self.registry
 
-    def get(self, name: str) -> str:
-        if name not in self.registry:
+    def get(self, key: str) -> str:
+        if key not in self.registry:
             raise InvalidDashboardUrlName(
-                f"Invalid dashboard url name. Expected one of {self.registry.keys()}. "
-                f"Got '{name}'."
+                f"Invalid key for url_names. Expected one of {self.registry.keys()}. "
+                f"Got '{key}'."
             )
-        return self.registry.get(name)
+        return self.registry.get(key)
 
-    def get_or_raise(self, name: str) -> str:
-        return self.get(name)
+    def get_or_raise(self, key: str) -> str:
+        return self.get(key)
 
 
 url_names = UrlNames()

edc_dashboard/utils.py

@@ -5,14 +5,14 @@ from django.conf import settings
 from django.template.loader import select_template
 
 
-class EdcTemplateDoesNotExist(Exception):
+class EdcTemplateDoesNotExist(Exception):  # noqa: N818
     pass
 
 
 def get_index_page() -> int:
     index_page = getattr(settings, "INDEX_PAGE", None)
     if not index_page:
-        warn("Settings attribute not set. See settings.INDEX_PAGE")
+        warn("Settings attribute not set. See settings.INDEX_PAGE", stacklevel=2)
     return getattr(settings, "INDEX_PAGE", None)
 
 
@@ -44,8 +44,8 @@ def select_edc_template(relative_path, default_app_label):
     default_path = default_app_label
     return select_template(
         [
-            os.path.join(local_path, relative_path),
-            os.path.join(default_path, relative_path),
+            str(os.path.join(local_path, relative_path)),  # noqa: PTH118
+            str(os.path.join(default_path, relative_path)),  # noqa: PTH118
         ]
     )
 

edc_dashboard/view_mixins/template_request_context_mixin.py

@@ -1,6 +1,3 @@
-from typing import Any
-
-
 class TemplateRequestContextError(Exception):
     pass
 
@@ -13,10 +10,10 @@ class TemplateRequestContextMixin:
             return [self.get_template_from_context(self.listboard_template)]
     """
 
-    def get_context_data(self, **kwargs) -> dict[str, Any]:
-        """Adds template data to context."""
-        kwargs.update(self.request.template_data)
-        return super().get_context_data(**kwargs)
+    # def get_context_data(self, **kwargs) -> dict[str, Any]:
+    #     """Adds template data to context."""
+    #     kwargs.update(self.request.template_data)
+    #     return super().get_context_data(**kwargs)
 
     def get_template_from_context(self, key=None):
         """Returns a template_name from request.context_data."""
@@ -26,5 +23,5 @@ class TemplateRequestContextMixin:
             raise TemplateRequestContextError(
                 f"Template name not defined in request context data. "
                 f"Expected one of {list(self.request.template_data.keys())}. Got {e}. "
-            )
+            ) from e
         return template_name

edc_dashboard/view_mixins/url_request_context_mixin.py

@@ -6,7 +6,6 @@ from edc_protocol.research_protocol_config import ResearchProtocolConfig
 from edc_utils.text import convert_from_camel
 
 from ..url_config import UrlConfig
-from ..url_names import InvalidDashboardUrlName, url_names
 
 if TYPE_CHECKING:
     from django.urls import URLPattern
@@ -23,45 +22,58 @@ class UrlRequestContextMixin:
     urlconfig_label = None
     url_name = None
 
-    @classmethod
-    def get_urlname(cls):
-        return cls.url_name
+    # @classmethod
+    # def get_urlname(cls):
+    #     return cls.url_name
 
     @classmethod
     def urls(
         cls,
         *,
-        label: str,
-        identifier_pattern: str,
-        namespace: str | None = None,
+        namespace: str,
+        url_names_key: str,
         identifier_label: str | None = None,
+        identifier_pattern: str | None = None,
     ) -> list[URLPattern]:
-        label = (
-            label
+        """Returns a list of url patterns generated by UrlConfig.
+
+        Each url pattern has the same name; `cls.url_name`.
+        """
+        url_names_key = (
+            url_names_key
             or cls.urlconfig_label
             or convert_from_camel(cls.__name__.replace("view", "")).lower()
         )
         urlconfig = UrlConfig(
-            url_name=cls.get_urlname(),
-            namespace=namespace,
             view_class=cls,
-            label=label,
+            namespace=namespace,
+            url_names_key=url_names_key,
             identifier_label=identifier_label or cls.urlconfig_identifier_label,
             identifier_pattern=identifier_pattern or cls.urlconfig_identifier_pattern,
         )
+        if cls.urlconfig_getattr not in [
+            "dashboard_urls",
+            "listboard_urls",
+            "review_listboard_urls",
+        ]:
+            raise UrlRequestContextError(
+                f"Invalid urlconfig attr. Got {cls.urlconfig_getattr}."
+            )
         return getattr(urlconfig, cls.urlconfig_getattr)
 
-    @staticmethod
-    def add_url_to_context(new_key=None, existing_key=None) -> dict[str, str]:
-        """Add url as new_key to the context using the value
-        of the existing_key from request.context_data.
-        """
-        try:
-            url_data = {new_key: url_names.get(existing_key)}
-        except InvalidDashboardUrlName as e:
-            raise UrlRequestContextError(
-                f"Url name not defined in url_names. "
-                f"Expected one of {url_names.registry}. Got {e}. "
-                f"Hint: check if dashboard middleware is loaded."
-            ) from e
-        return url_data
+    # @staticmethod
+    # def add_url_to_context(new_key=None, existing_key=None) -> dict[str, str]:
+    #     """Add url as new_key to the context using the value
+    #     of the existing_key from request.context_data.
+    #     """
+    #     if new_key != existing_key:
+    #         try:
+    #             url_data = {new_key: url_names.get(existing_key)}
+    #         except InvalidDashboardUrlName as e:
+    #             raise UrlRequestContextError(
+    #                 f"Url name not defined in url_names. "
+    #                 f"Expected one of {url_names.registry}. Got {e}. "
+    #                 f"Hint: check if dashboard middleware is loaded."
+    #             ) from e
+    #         return url_data
+    #     return {existing_key: url_names.get(existing_key)}

edc_dashboard/views/administration_view.py

@@ -1,5 +1,5 @@
+from django.conf import settings
 from django.views.generic import TemplateView
-
 from edc_navbar import NavbarViewMixin
 
 from ..view_mixins import AdministrationViewMixin, EdcViewMixin
@@ -7,4 +7,4 @@ from ..view_mixins import AdministrationViewMixin, EdcViewMixin
 
 class AdministrationView(EdcViewMixin, NavbarViewMixin, AdministrationViewMixin, TemplateView):
     navbar_selected_item = "administration"
-    navbar_name = "default"  # settings.APP_NAME
+    navbar_name = getattr(settings, "APP_NAME", "default")

edc_dashboard/views/dashboard_view.py

@@ -8,7 +8,7 @@ from ..view_mixins import TemplateRequestContextMixin, UrlRequestContextMixin
 
 
 class DashboardView(UrlRequestContextMixin, TemplateRequestContextMixin, TemplateView):
-    dashboard_url_name = None
+    dashboard_url_name = None  # see url_names dictionary
     dashboard_template = None  # may be None if `dashboard_template_name` is defined
     dashboard_template_name = None  # may be None if `dashboard_template` is defined
 
@@ -31,15 +31,10 @@ class DashboardView(UrlRequestContextMixin, TemplateRequestContextMixin, Templat
         return url_names.get(self.dashboard_url_name)
 
     def get_template_names(self):
-        if self.dashboard_template_name:
-            return [self.dashboard_template_name]
-        return [self.get_template_from_context(self.dashboard_template)]
+        if self.dashboard_template:
+            return [self.dashboard_template]
+        return [self.get_template_from_context(self.dashboard_template_name)]
 
     def get_context_data(self, **kwargs) -> dict[str, Any]:
-        kwargs.update(
-            **self.add_url_to_context(
-                new_key="dashboard_url_name",
-                existing_key=self.dashboard_url_name,
-            )
-        )
+        kwargs.update(**{self.dashboard_url_name: url_names.get(self.dashboard_url_name)})
         return super().get_context_data(**kwargs)