meta-edc 0.3.39__py3-none-any.whl → 1.4.0__py3-none-any.whl

meta_consent/models/__init__.py

@@ -1,4 +1,14 @@
 from .signals import subject_consent_on_post_delete, subject_consent_on_post_save
 from .subject_consent import SubjectConsent
 from .subject_consent_v1 import SubjectConsentV1
+from .subject_consent_v1_ext import SubjectConsentV1Ext
 from .subject_reconsent import SubjectReconsent
+
+__all__ = [
+    "SubjectConsent",
+    "SubjectConsentV1",
+    "SubjectConsentV1Ext",
+    "SubjectReconsent",
+    "subject_consent_on_post_delete",
+    "subject_consent_on_post_save",
+]

meta_consent/models/model_mixins.py

@@ -4,8 +4,7 @@ from edc_search.model_mixins import SearchSlugModelMixin as Base
 class SearchSlugModelMixin(Base):
     def get_search_slug_fields(self):
         fields = super().get_search_slug_fields()
-        fields.append("subject_identifier")
-        return fields
+        return *fields, "subject_identifier"
 
     class Meta:
         abstract = True

meta_consent/models/signals.py

@@ -1,8 +1,10 @@
+import contextlib
+
+from clinicedc_constants import YES
 from django.core.exceptions import ValidationError
 from django.db.models.signals import post_delete, post_save
 from django.dispatch import receiver
-from edc_action_item import ActionItemDeleteError, delete_action_item
-from edc_constants.constants import YES
+from edc_action_item.delete_action_item import ActionItemDeleteError, delete_action_item
 from edc_pharmacy.exceptions import PrescriptionAlreadyExists
 from edc_pharmacy.prescribe import create_prescription
 from edc_randomization.site_randomizers import site_randomizers
@@ -23,10 +25,11 @@ from .subject_consent_v1 import SubjectConsentV1
     sender=SubjectConsentV1,
     dispatch_uid="subject_consent_on_post_save",
 )
-def subject_consent_on_post_save(sender, instance, raw, created, **kwargs):
+def subject_consent_on_post_save(sender, instance, raw, created, **kwargs):  # noqa: ARG001
     """Creates an onschedule instance for this consented subject, if
     it does not exist.
     """
+
     if not raw:
         if not created:
             _, schedule = site_visit_schedules.get_by_onschedule_model("meta_prn.onschedule")
@@ -59,28 +62,39 @@ def subject_consent_on_post_save(sender, instance, raw, created, **kwargs):
                     onschedule_datetime=instance.consent_datetime,
                 )
                 # All refills are created against this prescription
-                try:
+                with contextlib.suppress(PrescriptionAlreadyExists):
                     create_prescription(
                         subject_identifier=instance.subject_identifier,
                         report_datetime=instance.consent_datetime,
-                        medications=[instance.study_medication_name],
+                        medication_names=[instance.study_medication_name],
                         randomizer_name=get_meta_version(),
                         site=instance.site,
                     )
-                except PrescriptionAlreadyExists:
-                    pass
 
         # create / delete action for reconsent
         if instance.completed_by_next_of_kin == YES:
             ReconsentAction(subject_identifier=instance.subject_identifier)
         else:
-            try:
+            with contextlib.suppress(ActionItemDeleteError):
                 delete_action_item(
                     action_cls=ReconsentAction,
                     subject_identifier=instance.subject_identifier,
                 )
-            except ActionItemDeleteError:
-                pass
+
+
+# @receiver(
+#     post_save,
+#     weak=False,
+#     sender=SubjectConsentV1Ext,
+#     dispatch_uid="subject_consent_v1_ext_on_post_save",
+# )
+# def subject_consent_v1_ext_on_post_save(sender, instance, raw, created, **kwargs):
+#     if not raw:
+#         refresh_appointments(
+#             subject_identifier=instance.subject_identifier,
+#             visit_schedule_name=VISIT_SCHEDULE,
+#             schedule_name=SCHEDULE,
+#         )
 
 
 @receiver(
@@ -88,7 +102,7 @@ def subject_consent_on_post_save(sender, instance, raw, created, **kwargs):
     weak=False,
     dispatch_uid="subject_consent_on_post_delete",
 )
-def subject_consent_on_post_delete(sender, instance, using, **kwargs):
+def subject_consent_on_post_delete(sender, instance, using, **kwargs):  # noqa: ARG001
     """Updates/Resets subject screening."""
     # don't allow if subject visits exist. This should be caught
     # in the ModelAdmin delete view

meta_consent/models/subject_consent.py

@@ -1,3 +1,4 @@
+from clinicedc_constants import NO, NOT_APPLICABLE
 from django.apps import apps as django_apps
 from django.contrib.sites.managers import CurrentSiteManager
 from django.db import models
@@ -13,7 +14,6 @@ from edc_consent.field_mixins import (
 from edc_consent.managers import ConsentObjectsManager
 from edc_consent.model_mixins import ConsentModelMixin
 from edc_constants.choices import YES_NO
-from edc_constants.constants import NO, NOT_APPLICABLE
 from edc_identifier.model_mixins import NonUniqueSubjectIdentifierModelMixin
 from edc_identifier.subject_identifier import SubjectIdentifier as BaseSubjectIdentifier
 from edc_model.models import BaseUuidModel, HistoricalRecords
@@ -62,7 +62,7 @@ class SubjectConsent(
         max_length=15,
         help_text=_("from screening"),
         editable=False,
-        null=True,
+        default="",
     )
 
     completed_by_next_of_kin = models.CharField(

meta_consent/models/subject_consent_v1.py

@@ -5,7 +5,6 @@ from .subject_consent import SubjectConsent
 
 
 class SubjectConsentV1(SubjectConsent):
-
     objects = ConsentObjectsByCdefManager()
     on_site = CurrentSiteByCdefManager()
     history = HistoricalRecords()

meta_consent/models/subject_consent_v1_ext.py

@@ -0,0 +1,34 @@
+from django.db import models
+from edc_action_item.models import ActionModelMixin
+from edc_consent.field_mixins import ReviewFieldsMixin
+from edc_consent.model_mixins import ConsentExtensionModelMixin
+from edc_model.models import BaseUuidModel
+from edc_sites.model_mixins import SiteModelMixin
+
+from ..constants import CONSENT_V1_EXTENSION_ACTION
+from .subject_consent_v1 import SubjectConsentV1
+
+
+class SubjectConsentV1Ext(
+    ConsentExtensionModelMixin,
+    SiteModelMixin,
+    ActionModelMixin,
+    ReviewFieldsMixin,
+    BaseUuidModel,
+):
+    """A consent extension to allow a participant to extend followup
+    up to 48 months, or not.
+    """
+
+    subject_consent = models.ForeignKey(SubjectConsentV1, on_delete=models.PROTECT)
+
+    action_name = CONSENT_V1_EXTENSION_ACTION
+
+    class Meta(
+        ConsentExtensionModelMixin.Meta,
+        SiteModelMixin.Meta,
+        ActionModelMixin.Meta,
+        BaseUuidModel.Meta,
+    ):
+        verbose_name = "Consent V1 Extension"
+        verbose_name_plural = "Consent V1 Extension"

meta_consent/models/subject_reconsent.py

@@ -1,3 +1,4 @@
+from clinicedc_constants import ABNORMAL
 from django.apps import apps as django_apps
 from django.contrib.sites.managers import CurrentSiteManager
 from django.contrib.sites.models import Site
@@ -6,7 +7,6 @@ from django.db import models
 from django_crypto_fields.fields.identity_field import IdentityField
 from edc_action_item.models import ActionModelMixin
 from edc_consent.field_mixins import ReviewFieldsMixin
-from edc_constants.constants import ABNORMAL
 from edc_identifier.managers import SubjectIdentifierManager
 from edc_identifier.model_mixins import UniqueSubjectIdentifierModelMixin
 from edc_model.models import BaseUuidModel
@@ -67,12 +67,12 @@ class SubjectReconsent(
             self.get_subject_consent(
                 screening_identifier=subject_screening.screening_identifier
             )
-        except ObjectDoesNotExist:
-            raise ValidationError("Previous consent does not exist.")
+        except ObjectDoesNotExist as e:
+            raise ValidationError("Previous consent does not exist.") from e
         super().save(*args, **kwargs)
 
     def natural_key(self):
-        return (self.subject_identifier, self.version)
+        return self.subject_identifier, self.version
 
     def get_subject_consent(self, screening_identifier=None):
         """Returns the first subject consent model instance."""

meta_dashboard/navbars.py

@@ -4,8 +4,6 @@ from edc_navbar import Navbar, NavbarItem, site_navbars
 from edc_pharmacy.navbars import pharmacy_navbar_item
 from edc_review_dashboard.navbars import navbar_item as review_navbar_item
 
-no_url_namespace = False  # True if settings.APP_NAME == "meta_dashboard" else False
-
 navbar = Navbar(name="meta_dashboard")
 
 
@@ -16,8 +14,7 @@ navbar.register(
         label="Screening",
         fa_icon="fa-user-plus",
         codename="edc_screening.view_screening_listboard",
-        url_name="screening_listboard_url",
-        no_url_namespace=no_url_namespace,
+        url_names_key="screening_listboard_url",
     )
 )
 
@@ -28,8 +25,7 @@ navbar.register(
         label="Subjects",
         fa_icon="fa-user-circle",
         codename="edc_subject_dashboard.view_subject_listboard",
-        url_name="subject_listboard_url",
-        no_url_namespace=no_url_namespace,
+        url_names_key="subject_listboard_url",
     )
 )
 

meta_dashboard/patterns.py

@@ -1 +1 @@
-screening_identifier = "[A-Z0-9]{6,8}"  # noqa
+screening_identifier = "[A-Z0-9]{6,8}"

meta_dashboard/templates/meta_dashboard/{bootstrap3/buttons → buttons}/eligibility_button.html

@@ -12,4 +12,4 @@
 </ul>
 {% endif %}
 </div>
-{% endif %}
+{% endif %}

meta_dashboard/templates/meta_dashboard/{bootstrap3/buttons → buttons}/screening_button.html

@@ -12,4 +12,4 @@
    class="btn btn-sm btn-{% if p3 == YES %}success{% elif p1 == YES and p2 == YES and p3 == TBD %}warning{% else %}default{% endif %}"
        {% if p3_enabled %}href="{{ href_p3 }}"{% else %} disabled {% endif %}>
     <i class="fas fa-pencil-alt fa-sm"></i> P3
-</a>
+</a>

meta_dashboard/templates/meta_dashboard/subject/dashboard/sidebar.html

@@ -0,0 +1,24 @@
+{% extends 'edc_subject_dashboard/dashboard/sidebar.html' %}
+{% load edc_subject_dashboard_extras %}
+
+{% block consents %}
+    {{ block.super }}
+    {% if subject_consent_v1_ext %}
+      <table class="table table-condensed">
+        <thead></thead>
+        <tbody>
+          <tr>
+            <td class="{% if subject_consent_v1_ext %}default{% else %}warning{% endif %}">
+            {% render_subject_consent_dashboard_button subject_consent_v1_ext appointment %}
+            </td>
+            <td class="{% if subject_consent_v1_ext %}default{% else %}warning{% endif %}">
+                <span class="h6">{{ subject_consent_v1_ext.verbose_name|title }}&nbsp;<span class="text {% if subject_consent_v1_ext.agrees_to_extension == YES %}text-success{% else %}text-danger{% endif %}">{{ subject_consent_v1_ext.agrees_to_extension }}</span>
+                <span class="text text-muted">{{ subject_consent_v1_ext.report_datetime|date:"SHORT_DATE_FORMAT"}}</span>
+              </span>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    {% endif %}
+
+{% endblock consents %}

meta_dashboard/templates/meta_dashboard/{bootstrap3/subject → subject}/dashboard/top_bar.html

@@ -1,3 +1,3 @@
-{% extends 'edc_subject_dashboard/bootstrap3/dashboard/topbar.html' %}
+{% extends 'edc_subject_dashboard/dashboard/topbar.html' %}
 
 {% block close_url %}href="{% url subject_listboard_url|default:'subject_listboard_url_cannot_be_none' %}?q={{ subject_identifier }}"{% endblock close_url %}

meta_dashboard/templates/meta_dashboard/subject/dashboard.html

@@ -0,0 +1,14 @@
+{% extends 'edc_subject_dashboard/dashboard.html' %}
+
+{% load static %}
+
+{% block locator_information %}{% endblock locator_information %}
+
+{% block top_bar %}
+
+    {% include "meta_dashboard/subject/dashboard/top_bar.html" %}
+
+{% endblock top_bar %}
+
+
+{% block side_bar %}{% include 'meta_dashboard/subject/dashboard/sidebar.html' %}{% endblock side_bar %}

meta_dashboard/templatetags/meta_dashboard_extras.py

@@ -3,13 +3,12 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 from bs4 import BeautifulSoup
+from clinicedc_constants import TBD
 from django import template
-from edc_constants.constants import TBD
 from edc_dashboard.url_names import url_names
-from edc_dashboard.utils import get_bootstrap_version
 
 from meta_consent.models import SubjectConsent
-from meta_dashboard.view_utils.subject_screening_button import (
+from meta_dashboard.view_utils import (
     SubjectScreeningPartOneButton,
     SubjectScreeningPartThreeButton,
     SubjectScreeningPartTwoButton,
@@ -29,9 +28,7 @@ if TYPE_CHECKING:
 register = template.Library()
 
 
-@register.inclusion_tag(
-    f"meta_dashboard/bootstrap{get_bootstrap_version()}/" f"buttons/eligibility_button.html"
-)
+@register.inclusion_tag("meta_dashboard/buttons/eligibility_button.html")
 def eligibility_button(subject_screening: SubjectScreening):
     comment = []
     tooltip = None
@@ -52,7 +49,7 @@ def eligibility_button(subject_screening: SubjectScreening):
 
 
 @register.inclusion_tag(
-    f"meta_dashboard/bootstrap{get_bootstrap_version()}/buttons/add_consent_button.html",
+    "meta_dashboard/buttons/add_consent_button.html",
     takes_context=True,
 )
 def render_consent_button(context, subject_screening: SubjectScreening):
@@ -67,7 +64,7 @@ def render_consent_button(context, subject_screening: SubjectScreening):
     )
 
 
-def refusal_button(context, subject_refusal):
+def refusal_button(context, subject_refusal):  # noqa: ARG001
     title = ["Capture subject's primary reason for not joining."]
 
     return dict(
@@ -77,9 +74,7 @@ def refusal_button(context, subject_refusal):
     )
 
 
-@register.inclusion_tag(
-    f"edc_listboard/bootstrap{get_bootstrap_version()}/buttons/dashboard_button.html"
-)
+@register.inclusion_tag("edc_listboard/buttons/dashboard_button.html")
 def render_dashboard_button(subject_consent: SubjectConsent):
     subject_dashboard_url = url_names.get("subject_dashboard_url")
     return dict(
@@ -89,7 +84,7 @@ def render_dashboard_button(subject_consent: SubjectConsent):
 
 
 @register.inclusion_tag(
-    f"edc_subject_dashboard/bootstrap{get_bootstrap_version()}/buttons/forms_button.html",
+    "edc_subject_dashboard/buttons/forms_button.html",
     takes_context=True,
 )
 def render_screening_part_one_button(context, subject_screening: ScreeningPartOne) -> dict:
@@ -102,7 +97,7 @@ def render_screening_part_one_button(context, subject_screening: ScreeningPartOn
 
 
 @register.inclusion_tag(
-    f"edc_subject_dashboard/bootstrap{get_bootstrap_version()}/buttons/forms_button.html",
+    "edc_subject_dashboard/buttons/forms_button.html",
     takes_context=True,
 )
 def render_screening_part_two_button(context, subject_screening: ScreeningPartTwo) -> dict:
@@ -115,7 +110,7 @@ def render_screening_part_two_button(context, subject_screening: ScreeningPartTw
 
 
 @register.inclusion_tag(
-    f"edc_subject_dashboard/bootstrap{get_bootstrap_version()}/buttons/forms_button.html",
+    "edc_subject_dashboard/buttons/forms_button.html",
     takes_context=True,
 )
 def render_screening_part_three_button(context, subject_screening: ScreeningPartThree) -> dict:

meta_dashboard/urls.py

@@ -13,28 +13,28 @@ app_name = "meta_dashboard"
 
 urlpatterns = SubjectListboardView.urls(
     namespace=app_name,
-    label="subject_listboard",
+    url_names_key="subject_listboard_url",
     identifier_pattern=ResearchProtocolConfig().subject_identifier_pattern,
 )
 urlpatterns += ScreeningListboardView.urls(
     namespace=app_name,
-    label="screening_listboard",
+    url_names_key="screening_listboard_url",
     identifier_label="screening_identifier",
     identifier_pattern=screening_identifier,
 )
 urlpatterns += SubjectDashboardView.urls(
     namespace=app_name,
-    label="subject_dashboard",
+    url_names_key="subject_dashboard_url",
     identifier_pattern=ResearchProtocolConfig().subject_identifier_pattern,
 )
 
 urlpatterns += AeListboardView.urls(
     namespace=app_name,
-    label="ae_listboard",
+    url_names_key="ae_listboard_url",
     identifier_pattern=ResearchProtocolConfig().subject_identifier_pattern,
 )
 urlpatterns += DeathReportListboardView.urls(
     namespace=app_name,
-    label="death_report_listboard",
+    url_names_key="death_report_listboard_url",
     identifier_pattern=ResearchProtocolConfig().subject_identifier_pattern,
 )

meta_dashboard/view_utils/__init__.py

@@ -0,0 +1,13 @@
+from .subject_screening_button import (
+    SubjectScreeningButton,
+    SubjectScreeningPartOneButton,
+    SubjectScreeningPartThreeButton,
+    SubjectScreeningPartTwoButton,
+)
+
+__all__ = [
+    "SubjectScreeningButton",
+    "SubjectScreeningPartOneButton",
+    "SubjectScreeningPartThreeButton",
+    "SubjectScreeningPartTwoButton",
+]

meta_dashboard/view_utils/subject_screening_button.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import Type
 
+from clinicedc_constants import TBD, YES
 from django.utils.translation import gettext as _
-from edc_constants.constants import TBD, YES
 from edc_subject_dashboard.view_utils import (
     SubjectScreeningButton as BaseSubjectScreeningButton,
 )
@@ -14,8 +13,8 @@ from meta_screening.models import ScreeningPartOne, ScreeningPartThree, Screenin
 
 __all__ = [
     "SubjectScreeningPartOneButton",
-    "SubjectScreeningPartTwoButton",
     "SubjectScreeningPartThreeButton",
+    "SubjectScreeningPartTwoButton",
 ]
 
 
@@ -38,17 +37,13 @@ class SubjectScreeningButton(BaseSubjectScreeningButton):
 
     @property
     def title(self) -> str:
-        if self.perms.view_only or self.model_obj.consented:
-            title = _("View")
-        else:
-            title = _("Edit")
-        return title
+        return _("View") if self.perms.view_only or self.model_obj.consented else _("Edit")
 
 
 @dataclass
 class SubjectScreeningPartOneButton(SubjectScreeningButton):
-    model_obj: ScreeningPartOne = None
-    model_cls: Type[ScreeningPartOne] = field(default=ScreeningPartOne)
+    model_obj: ScreeningPartOne | None = None
+    model_cls: type[ScreeningPartOne] = field(default=ScreeningPartOne)
 
     @property
     def label(self) -> str:
@@ -57,8 +52,8 @@ class SubjectScreeningPartOneButton(SubjectScreeningButton):
 
 @dataclass
 class SubjectScreeningPartTwoButton(SubjectScreeningButton):
-    model_obj: ScreeningPartTwo = None
-    model_cls: Type[ScreeningPartTwo] = field(default=ScreeningPartTwo)
+    model_obj: ScreeningPartTwo | None = None
+    model_cls: type[ScreeningPartTwo] = field(default=ScreeningPartTwo)
 
     @property
     def label(self) -> str:
@@ -76,9 +71,8 @@ class SubjectScreeningPartTwoButton(SubjectScreeningButton):
             self._action = VIEW
             if self.model_obj.eligible_part_two == TBD:
                 self._action = ADD
-            elif self.model_obj:
-                if self.perms.change:
-                    self._action = CHANGE
+            elif self.model_obj and self.perms.change:
+                self._action = CHANGE
         return self._action
 
     @property
@@ -90,8 +84,8 @@ class SubjectScreeningPartTwoButton(SubjectScreeningButton):
 
 @dataclass
 class SubjectScreeningPartThreeButton(SubjectScreeningButton):
-    model_obj: ScreeningPartThree = None
-    model_cls: Type[ScreeningPartThree] = field(default=ScreeningPartThree)
+    model_obj: ScreeningPartThree | None = None
+    model_cls: type[ScreeningPartThree] = field(default=ScreeningPartThree)
 
     @property
     def label(self) -> str:
@@ -109,9 +103,8 @@ class SubjectScreeningPartThreeButton(SubjectScreeningButton):
             self._action = VIEW
             if self.model_obj.eligible_part_three == TBD:
                 self._action = ADD
-            elif self.model_obj:
-                if self.perms.change:
-                    self._action = CHANGE
+            elif self.model_obj and self.perms.change:
+                self._action = CHANGE
         return self._action
 
     @property

meta_dashboard/views/__init__.py

@@ -2,3 +2,11 @@ from .ae import AeListboardView, DeathReportListboardView
 from .screening import ListboardView as ScreeningListboardView
 from .subject import DashboardView as SubjectDashboardView
 from .subject import SubjectListboardView
+
+__all__ = [
+    "AeListboardView",
+    "DeathReportListboardView",
+    "ScreeningListboardView",
+    "SubjectDashboardView",
+    "SubjectListboardView",
+]

meta_dashboard/views/ae/__init__.py

@@ -1,2 +1,4 @@
 from .ae_listboard_view import AeListboardView
 from .death_report_listboard_view import DeathReportListboardView
+
+__all__ = ["AeListboardView", "DeathReportListboardView"]

meta_dashboard/views/ae/ae_listboard_view.py

@@ -5,7 +5,7 @@ from meta_reports.ae_report import AePdfReport
 
 
 class CustomAeReport(AePdfReport):
-    logo_data = {
+    logo_data = {  # noqa: RUF012
         "app_label": "meta_edc",
         "filename": "meta_logo.png",
         "first_page": (4.0 * cm, 0.83 * cm),

meta_dashboard/views/ae/death_report_listboard_view.py

@@ -5,7 +5,7 @@ from meta_reports.death_report import DeathPdfReport
 
 
 class CustomDeathReport(DeathPdfReport):
-    logo_data = {
+    logo_data = {  # noqa: RUF012
         "app_label": "meta_edc",
         "filename": "meta_logo.png",
         "first_page": (4.0 * cm, 0.83 * cm),

meta_dashboard/views/screening/__init__.py

@@ -1 +1,3 @@
 from .listboard_view import ListboardView
+
+__all__ = ["ListboardView"]

meta_dashboard/views/screening/listboard_view.py

@@ -11,7 +11,6 @@ class ListboardView(ScreeningListboardView):
         kwargs.update(meta_version=get_meta_version())
         return super().get_context_data(**kwargs)
 
-    def get_search_fields(self) -> list[str]:
+    def get_search_fields(self) -> tuple[str, ...]:
         fields = super().get_search_fields()
-        fields.append("hospital_identifier__exact")
-        return fields
+        return *fields, "hospital_identifier__exact"

meta_dashboard/views/subject/__init__.py

@@ -1,2 +1,4 @@
 from .dashboard import DashboardView
 from .listboard import SubjectListboardView
+
+__all__ = ["DashboardView", "SubjectListboardView"]

meta_dashboard/views/subject/dashboard/__init__.py

@@ -1 +1,3 @@
 from .dashboard_view import DashboardView
+
+__all__ = ["DashboardView"]

meta_dashboard/views/subject/dashboard/dashboard_view.py

@@ -1,9 +1,11 @@
 from typing import Any
 
+from django.apps import apps as django_apps
 from django.core.checks import messages
 from django.core.exceptions import ObjectDoesNotExist
 from django.urls import reverse
 from django.utils.html import format_html
+from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 from edc_subject_dashboard.views import SubjectDashboardView
 
@@ -18,19 +20,28 @@ class DashboardView(SubjectDashboardView):
 
     def get_context_data(self, **kwargs) -> dict[str, Any]:
         """Add message if subject reaches DM Endpoint."""
-        context = super().get_context_data(**kwargs)
+        kwargs.update(subject_consent_v1_ext=self.subject_consent_v1_ext)
         try:
             Endpoints.objects.get(subject_identifier=self.subject_identifier)
         except ObjectDoesNotExist:
             pass
         else:
             url = reverse("meta_reports_admin:meta_reports_glucosesummary_changelist")
-            url = f"{url}?q={self.subject_identifier}"
-            message = _(
-                format_html(
-                    f"Subject has reached the protocol endpoint. "
-                    f'See <A href="{url}">{GlucoseSummary._meta.verbose_name}</A>'
-                )
+            url = mark_safe(f"{url}?q={self.subject_identifier}")  # noqa: S308
+            message = format_html(
+                '{text} <A href="{url}">{verbose_name}</A>',
+                text=_("Subject has reached the protocol endpoint. See "),
+                url=url,
+                verbose_name=GlucoseSummary._meta.verbose_name,
             )
             self.message_user(message, level=messages.WARNING)
-        return context
+        return super().get_context_data(**kwargs)
+
+    @property
+    def subject_consent_v1_ext(self):
+        model_cls = django_apps.get_model("meta_consent.subjectconsentv1ext")
+        try:
+            obj = model_cls.objects.get(subject_identifier=self.subject_identifier)
+        except ObjectDoesNotExist:
+            obj = None
+        return obj

meta_dashboard/views/subject/listboard/__init__.py

@@ -1 +1,3 @@
 from .listboard_view import SubjectListboardView
+
+__all__ = ["SubjectListboardView"]

meta_dashboard/views/subject/listboard/listboard_view.py

@@ -11,7 +11,6 @@ class SubjectListboardView(BaseSubjectListboardView):
         kwargs.update(meta_version=get_meta_version())
         return super().get_context_data(**kwargs)
 
-    def get_search_fields(self) -> list[str]:
+    def get_search_fields(self) -> tuple[str, ...]:
         fields = super().get_search_fields()
-        fields.append("identity__exact")
-        return fields
+        return *fields, "identity__exact"