clinicedc 2.0.39__py3-none-any.whl → 2.0.41__py3-none-any.whl

{clinicedc-2.0.39.dist-info → clinicedc-2.0.41.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.8.23
+Generator: uv 0.9.5
 Root-Is-Purelib: true
 Tag: py3-none-any

edc_adverse_event/dashboard_urls.py

@@ -1,3 +1,5 @@
+"""These have nothing to do with url_names dictionary"""
+
 dashboard_urls = dict(
     ae_home_url="edc_adverse_event:ae_home_url",
     tmg_home_url="edc_adverse_event:tmg_home_url",

edc_adverse_event/middleware.py

@@ -1,22 +1,23 @@
+from edc_dashboard.middleware_mixins import EdcTemplateMiddlewareMixin
+
 from .dashboard_templates import dashboard_templates
 from .dashboard_urls import dashboard_urls
 
 
-class DashboardMiddleware:
+class DashboardMiddleware(EdcTemplateMiddlewareMixin):
     def __init__(self, get_response):
         self.get_response = get_response
 
     def __call__(self, request):
-        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):
         request.url_name_data.update(**dashboard_urls)
-        template_data = dashboard_templates
-        request.template_data.update(**template_data)
+        request.template_data.update(**dashboard_templates)
 
     def process_template_response(self, request, response):
-        if response.context_data:
+        if getattr(response, "context_data", None):
             response.context_data.update(**request.url_name_data)
             response.context_data.update(**request.template_data)
         return response

edc_adverse_event/navbars.py

@@ -1,24 +1,20 @@
-from django.conf import settings
-
 from edc_navbar import Navbar, NavbarItem, site_navbars
 
-no_url_namespace = True if settings.APP_NAME == "edc_adverse_event" else False
-
 ae_navbar_item = NavbarItem(
     name="ae_home",
     title="Adverse Events",
     label="AE",
     codename="edc_adverse_event.nav_ae_section",
-    url_name="edc_adverse_event:ae_home_url",
-    no_url_namespace=no_url_namespace,
+    url_names_key="ae_home_url",
+    url_with_namespace="edc_adverse_event:ae_home_url",
 )
 
 tmg_navbar_item = NavbarItem(
     name="tmg_home",
     label="TMG",
     codename="edc_adverse_event.nav_tmg_section",
-    url_name="edc_adverse_event:tmg_home_url",
-    no_url_namespace=no_url_namespace,
+    url_names_key="tmg_home_url",
+    url_with_namespace="edc_adverse_event:tmg_home_url",
 )
 
 ae_navbar = Navbar(name="edc_adverse_event")

edc_adverse_event/urls.py

@@ -1,5 +1,5 @@
 from django.urls.conf import path
-
+from edc_dashboard.url_names import url_names
 from edc_protocol.research_protocol_config import ResearchProtocolConfig
 
 from .admin_site import edc_adverse_event_admin
@@ -18,27 +18,32 @@ app_name = "edc_adverse_event"
 
 urlpatterns = NewTmgAeListboardView.urls(
     namespace=app_name,
-    label="new_tmg_ae_listboard",
+    url_names_key="new_tmg_ae_listboard_url",
+    identifier_label="subject_identifier",
     identifier_pattern=ResearchProtocolConfig().subject_identifier_pattern,
 )
 urlpatterns += OpenTmgAeListboardView.urls(
     namespace=app_name,
-    label="open_tmg_ae_listboard",
+    url_names_key="open_tmg_ae_listboard_url",
+    identifier_label="subject_identifier",
     identifier_pattern=ResearchProtocolConfig().subject_identifier_pattern,
 )
 urlpatterns += ClosedTmgAeListboardView.urls(
     namespace=app_name,
-    label="closed_tmg_ae_listboard",
+    url_names_key="closed_tmg_ae_listboard_url",
+    identifier_label="subject_identifier",
     identifier_pattern=ResearchProtocolConfig().subject_identifier_pattern,
 )
 urlpatterns += TmgDeathListboardView.urls(
     namespace=app_name,
-    label="tmg_death_listboard",
+    url_names_key="tmg_death_listboard_url",
+    identifier_label="subject_identifier",
     identifier_pattern=ResearchProtocolConfig().subject_identifier_pattern,
 )
 urlpatterns += TmgSummaryListboardView.urls(
     namespace=app_name,
-    label="tmg_summary_listboard",
+    url_names_key="tmg_summary_listboard_url",
+    identifier_label="subject_identifier",
     identifier_pattern=ResearchProtocolConfig().subject_identifier_pattern,
 )
 urlpatterns += [
@@ -47,3 +52,6 @@ urlpatterns += [
     path("admin/", edc_adverse_event_admin.urls),
     path("", AeHomeView.as_view(), name="home_url"),
 ]
+
+url_names.register(key="tmg_home_url", url_with_namespace=f"{app_name}:tmg_home_url")
+url_names.register(key="ae_home_url", url_with_namespace=f"{app_name}:ae_home_url")

edc_adverse_event/view_mixins/ae/ae_listboard_view_mixin.py

@@ -9,6 +9,7 @@ from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
 from edc_constants.constants import CLOSED, NEW, OPEN
+from edc_dashboard.url_names import url_names
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_listboard.view_mixins import ListboardFilterViewMixin, SearchFormViewMixin
 from edc_listboard.views import ListboardView as BaseListboardView
@@ -49,16 +50,16 @@ class AeListboardViewMixin(
     ordering = "-report_datetime"
     paginate_by = 25
     search_form_url = "ae_listboard_url"
-    action_type_names = [AE_INITIAL_ACTION]
+    action_type_names = (AE_INITIAL_ACTION, )
 
-    search_fields = [
+    search_fields = (
         "subject_identifier",
         "action_identifier",
         "parent_action_item__action_identifier",
         "related_action_item__action_identifier",
         "user_created",
         "user_modified",
-    ]
+    )
 
     @property
     def ae_initial_model_cls(self):
@@ -77,10 +78,7 @@ class AeListboardViewMixin(
         kwargs.update(
             AE_INITIAL_ACTION=AE_INITIAL_ACTION,
             utc_date=timezone.now().date(),
-            **self.add_url_to_context(
-                new_key="ae_home_url",
-                existing_key=self.home_url,
-            ),
+            **{"ae_home_url": url_names.get(self.home_url)},
         )
         return super().get_context_data(**kwargs)
 
@@ -98,7 +96,7 @@ class AeListboardViewMixin(
         pks = []
         for obj in queryset:
             try:
-                obj.reference_obj
+                obj.reference_obj # noqa: B018
             except ObjectDoesNotExist:
                 pks.append(obj.pk)
         return queryset.exclude(pk__in=pks)

edc_adverse_event/view_mixins/ae/death_report_listboard_view_mixin.py

@@ -8,6 +8,7 @@ from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
 from edc_constants.constants import CLOSED, NEW, OPEN
+from edc_dashboard.url_names import url_names
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_listboard.view_mixins import ListboardFilterViewMixin, SearchFormViewMixin
 from edc_listboard.views import ListboardView as BaseListboardView
@@ -70,10 +71,7 @@ class DeathReportListboardViewMixin(
         kwargs.update(
             DEATH_REPORT_ACTION=DEATH_REPORT_ACTION,
             utc_date=timezone.now().date(),
-            **self.add_url_to_context(
-                new_key="ae_home_url",
-                existing_key=self.home_url,
-            ),
+            **{"ae_home_url": url_names.get(self.home_url)},
         )
         return super().get_context_data(**kwargs)
 

edc_adverse_event/view_mixins/tmg/tmg_ae_listboard_view_mixin.py

@@ -4,14 +4,13 @@ from typing import TYPE_CHECKING, Any
 
 from django.db.models import Min
 from django.utils import timezone
-
 from edc_constants.constants import CLOSED, NEW, OPEN
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_export.constants import CANCELLED
 from edc_listboard.view_mixins import ListboardFilterViewMixin, SearchFormViewMixin
 from edc_listboard.views import ListboardView as BaseListboardView
 from edc_navbar import NavbarViewMixin
-from edc_navbar.get_default_navbar import get_default_navbar
+from edc_navbar.utils import get_default_navbar_name
 
 from ...constants import (
     AE_TMG_ACTION,
@@ -47,7 +46,7 @@ class TmgAeListboardViewMixin(
     listboard_panel_title = "TMG: AE Reports"
     listboard_view_permission_codename = "edc_adverse_event.view_tmg_listboard"
 
-    navbar_name = get_default_navbar()
+    navbar_name = get_default_navbar_name()
     navbar_selected_item = "tmg_home"
     ordering = "-report_datetime"
     paginate_by = 10

edc_adverse_event/views/home_view.py

@@ -2,7 +2,6 @@ from typing import Any
 
 from django.urls import reverse
 from django.views.generic import TemplateView
-
 from edc_dashboard.url_names import url_names
 from edc_dashboard.view_mixins import EdcViewMixin, UrlRequestContextMixin
 from edc_navbar import NavbarViewMixin
@@ -37,6 +36,6 @@ class AeHomeView(UrlRequestContextMixin, EdcViewMixin, NavbarViewMixin, Template
             ae_initial_changelist_url=ae_initial_changelist_url,
             death_report_changelist_url=death_report_changelist_url,
             death_report_listboard_url=death_report_listboard_url,
-            **self.add_url_to_context(new_key="ae_home_url", existing_key=self.url_name),
+            **{self.url_name: url_names.get(self.url_name)},
         )
         return super().get_context_data(**kwargs)

edc_adverse_event/views/tmg/death_listboard_view.py

@@ -5,7 +5,6 @@ from typing import Any
 
 from django.db.models import Q
 
-from edc_dashboard.url_names import url_names
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_listboard.view_mixins import ListboardFilterViewMixin, SearchFormViewMixin
 from edc_listboard.views import ListboardView as BaseListboardView
@@ -21,10 +20,11 @@ class DeathListboardView(
     SearchFormViewMixin,
     BaseListboardView,
 ):
+    subject_dashboard_url_name = "subject_dashboard_url"  # see url_names
     listboard_back_url = "tmg_home_url"
 
     listboard_template = "tmg_death_listboard_template"
-    listboard_url = "tmg_death_listboard_url"
+    listboard_url = "tmg_death_listboard_url"  # url_name
     listboard_panel_style = "warning"
     listboard_model = f"{get_adverse_event_app_label()}.deathreport"
     listboard_model_manager_name = "objects"
@@ -33,18 +33,20 @@ class DeathListboardView(
     navbar_selected_item = "tmg_home"
     ordering = "-created"
     paginate_by = 25
-    search_form_url = "tmg_death_listboard_url"
-    search_fields = [
+    search_form_url = "tmg_death_listboard_url"  # url_name
+    search_fields = (
         "subject_identifier",
         "action_identifier",
         "parent_action_item__action_identifier",
         "related_action_item__action_identifier",
         "user_created",
         "user_modified",
-    ]
+    )
 
     def get_context_data(self, **kwargs) -> dict[str, Any]:
-        kwargs.update({"subject_dashboard_url": url_names.get("subject_dashboard_url")})
+        # kwargs.update(
+        #     {"subject_dashboard_url": url_names.get(self.subject_dashboard_url_name)}
+        # )
         if self.kwargs.get("subject_identifier"):
             kwargs.update({"q": self.kwargs.get("subject_identifier")})
         return super().get_context_data(**kwargs)

edc_adverse_event/views/tmg/home_view.py

@@ -38,9 +38,10 @@ class TmgHomeView(EdcViewMixin, NavbarViewMixin, TemplateView):
             .values("status", "site__name")
             .annotate(items=Count("status"))
         )
-        notices = []
-        for item in qs.order_by("status", "site__name"):
-            notices.append([item.get("site__name"), item.get("status"), item.get("items")])
+        notices = [
+            (item.get("site__name"), item.get("status"), item.get("items"))
+            for item in qs.order_by("status", "site__name")
+        ]
         new_count = ActionItem.objects.filter(
             action_type__name=AE_TMG_ACTION,
             site__name=get_current_site(request=self.request).name,

edc_adverse_event/views/tmg/summary_listboard_view.py

@@ -42,20 +42,20 @@ class SummaryListboardView(
     ordering = "-report_datetime"
     paginate_by = 25
     search_form_url = "tmg_summary_listboard_url"
-    action_type_names = [
+    action_type_names = (
         AE_TMG_ACTION,
         DEATH_REPORT_TMG_ACTION,
         DEATH_REPORT_ACTION,
         AE_FOLLOWUP_ACTION,
-    ]
-    search_fields = [
+    )
+    search_fields = (
         "subject_identifier",
         "action_identifier",
         "parent_action_item__action_identifier",
         "related_action_item__action_identifier",
         "user_created",
         "user_modified",
-    ]
+    )
 
     def get_context_data(self, **kwargs) -> dict[str, Any]:
         kwargs.update(AE_TMG_ACTION=AE_TMG_ACTION, utc_date=timezone.now().date())

edc_appointment/utils.py

@@ -23,7 +23,6 @@ from django.db import transaction
 from django.db.models import Count, ProtectedError
 from django.urls import reverse
 from django.utils.translation import gettext as _
-
 from edc_constants.constants import CLINIC, NOT_APPLICABLE, OK
 from edc_constants.constants import ERROR as ERROR_CODE
 from edc_dashboard.url_names import url_names
@@ -67,7 +66,6 @@ if TYPE_CHECKING:
     from decimal import Decimal
 
     from django.db.models import QuerySet
-
     from edc_crf.model_mixins import CrfModelMixin as Base
     from edc_metadata.model_mixins.creates import CreatesMetadataModelMixin
 
@@ -709,9 +707,8 @@ def skip_appointment(appointment: Appointment, comment: str | None = None):
 
 def get_unscheduled_appointment_url(appointment: Appointment = None) -> str:
     """Returns a url for the unscheduled appointment."""
-    dashboard_url_name = "subject_dashboard_url"
-    dashboard_url = url_names.get(dashboard_url_name)
-    unscheduled_appointment_url_name = "edc_appointment:unscheduled_appointment_url"
+    dashboard_url = url_names.get("subject_dashboard_url")
+    unscheduled_appointment_url = "edc_appointment:unscheduled_appointment_url"
     kwargs = dict(
         subject_identifier=appointment.subject_identifier,
         visit_schedule_name=appointment.visit_schedule_name,
@@ -722,7 +719,7 @@ def get_unscheduled_appointment_url(appointment: Appointment = None) -> str:
     )
     kwargs.update(visit_code_sequence=str(appointment.visit_code_sequence + 1))
     kwargs.update(redirect_url=dashboard_url)
-    return reverse(unscheduled_appointment_url_name, kwargs=kwargs)
+    return reverse(unscheduled_appointment_url, kwargs=kwargs)
 
 
 def update_appt_status_for_timepoint(related_visit: RelatedVisitModel) -> None:

edc_appointment/views/unscheduled_appointment_view.py

@@ -27,7 +27,7 @@ class UnscheduledAppointmentView(View):
     """
 
     unscheduled_appointment_cls = UnscheduledAppointmentCreator
-    dashboard_template = "subject_dashboard_template"
+    dashboard_template_name = "subject_dashboard_template"
 
     def get(self, request, *args, **kwargs):  # noqa: ARG002
         kwargs["suggested_visit_code_sequence"] = int(kwargs["visit_code_sequence"])

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