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

{clinicedc-2.0.38.dist-info → clinicedc-2.0.40.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/templates/edc_adverse_event/tmg/tmg_ae_listboard_result.html

@@ -13,12 +13,15 @@
       {% has_perms_for_tmg_role as may_access_page %}
       {% if may_access_page %}
         {% for result in results %}
+        {% with results_loop=forloop %}
           <div class="panel panel-default">
             <div class="panel-heading clearfix">
-              <span class="badge">{{ forloop.counter }}</span> <span class="text text-uppercase">{{ result.subject_identifier }}</span> {% copy_string_to_clipboard_button result.subject_identifier %} <span class="text text-muted small">{{ utc_date|timeuntil:result.report_datetime.date }} ago</span>
+              <span class="badge">{{ results_loop.counter }}</span> <span class="text text-uppercase">{{ result.subject_identifier }}</span> {% copy_string_to_clipboard_button result.subject_identifier %} <span class="text text-muted small">{{ utc_date|timeuntil:result.report_datetime.date }} ago</span>
               <span class="pull-right">
                 <div class="btn-group">
-                  <a class="btn btn-sm btn-default" role="button" title="Go to action item" href="{{ result.get_absolute_url }}?next={{ listboard_filter_url }},subject_identifier&subject_identifier={{ result.subject_identifier }}">{{ result.identifier }}</a>
+                    {%  if result.identifier %}
+                        <a class="btn btn-sm btn-default" role="button" title="Go to action item" href="{{ result.get_absolute_url }}?next={{ listboard_filter_url }},subject_identifier&subject_identifier={{ result.subject_identifier }}">{{ result.identifier }}</a>
+                    {%  endif %}
                   <a class="btn btn-sm btn-primary" role="button" title="go to list of reported visits for this subject" href="{% url subject_review_listboard_url|default:"subject_review_listboard_url_cannot_be_none" subject_identifier=result.subject_identifier %}?q={{ result.subject_identifier }}">Subject Review  <i class="fas fa-share fa-fw"></i></a>
                 </div>
               </span>
@@ -30,19 +33,18 @@
                 <div class="list-group">
                   <div class="list-group-item list-group-item-default"><i class="fa-solid fa-folder-tree fa-fw"></i> TMG documents in workflow </div>
 
-                {# {% render_tmg_panel action_item=result by_user_created_only=True counter=forloop.counter report_status=result.reference_obj.report_status next_url_name=listboard_filter_url %} #}
+                {# {% render_tmg_panel action_item=result by_user_created_only=True counter=results_loop.counter report_status=result.reference_obj.report_status next_url_name=listboard_filter_url %} #}
 
                 {# AE TMG #}
-                {% ae_tmg_queryset subject_identifier=result.subject_identifier as qs %}
-                {% if qs.count == 0 %}
-                  {% ae_tmg_action_item subject_identifier=result.subject_identifier as tmg_action_item %}
-                  {% if tmg_action_item %}
-                    {% render_tmg_panel action_item=tmg_action_item by_user_created_only=True counter=forloop.counter report_status=result.reference_obj.report_status next_url_name=listboard_filter_url %}
-                  {% endif %}
-                {% else %}
-                  {% for ae_tmg in qs %}
-                    {% render_tmg_panel reference_obj=ae_tmg by_user_created_only=True counter=forloop.counter next_url_name=listboard_filter_url %}
-                  {% endfor %}
+                {% ae_tmg_action_item_queryset result.subject_identifier status as ae_tmg_action_item_qs %}
+                {% for ae_tmg_action_item in ae_tmg_action_item_qs %}
+                  {% render_tmg_panel action_item=ae_tmg_action_item by_user_created_only=True counter=results_loop.counter report_status=result.reference_obj.report_status next_url_name=listboard_filter_url %}
+                {% endfor %}
+                {% if status != NEW %}
+                {% ae_tmg_queryset subject_identifier=result.subject_identifier as ae_tmg_qs %}
+                {% for ae_tmg in ae_tmg_qs %}
+                  {% render_tmg_panel reference_obj=ae_tmg by_user_created_only=True counter=results_loop.counter next_url_name=listboard_filter_url %}
+                {% endfor %}
                 {% endif %}
 
                 {# DEATH REPORT TMG #}
@@ -50,11 +52,11 @@
                 {% if qs.count == 0 %}
                   {% death_report_tmg_action_item subject_identifier=result.subject_identifier as tmg_action_item %}
                   {% if tmg_action_item %}
-                    {% render_tmg_panel action_item=tmg_action_item by_user_created_only=True counter=forloop.counter report_status=result.reference_obj.report_status next_url_name=listboard_filter_url %}
+                    {% render_tmg_panel action_item=tmg_action_item by_user_created_only=True counter=results_loop.counter report_status=result.reference_obj.report_status next_url_name=listboard_filter_url %}
                   {% endif %}
                 {% else %}
                   {% for death_report_tmg in qs %}
-                    {% render_tmg_panel reference_obj=death_report_tmg by_user_created_only=True counter=forloop.counter next_url_name=listboard_filter_url %}
+                    {% render_tmg_panel reference_obj=death_report_tmg by_user_created_only=True counter=results_loop.counter next_url_name=listboard_filter_url %}
                   {% endfor %}
                 {% endif %}
 
@@ -63,11 +65,11 @@
                 {% if qs.count == 0 %}
                   {% death_report_tmg_second_action_item subject_identifier=result.subject_identifier as tmg_action_item %}
                   {% if tmg_action_item %}
-                    {% render_tmg_panel action_item=tmg_action_item by_user_created_only=True counter=forloop.counter report_status=result.reference_obj.report_status next_url_name=listboard_filter_url %}
+                    {% render_tmg_panel action_item=tmg_action_item by_user_created_only=True counter=results_loop.counter report_status=result.reference_obj.report_status next_url_name=listboard_filter_url %}
                   {% endif %}
                 {% else %}
                   {% for death_report_tmg in qs %}
-                    {% render_tmg_panel reference_obj=death_report_tmg by_user_created_only=True counter=forloop.counter next_url_name=listboard_filter_url %}
+                    {% render_tmg_panel reference_obj=death_report_tmg by_user_created_only=True counter=results_loop.counter next_url_name=listboard_filter_url %}
                   {% endfor %}
                 {% endif %}
 
@@ -80,12 +82,13 @@
                 <div class="list-group">
                   {# AE INTIAL #}
                   <div class="list-group-item"><i class="fa-regular fa-file fa-fw"></i> First document in workflow</div>
-                  {% if result.parent_action_item %}
-                    {% render_tmg_panel action_item=result.parent_action_item counter=forloop.counter next_url_name=listboard_filter_url %}
+                    {% ae_tmg_action_item_queryset result.subject_identifier status as ae_tmg_action_item_qs %}
+                    {% for ae_tmg_action_item in ae_tmg_action_item_qs %}
+                        {% render_tmg_panel action_item=ae_tmg_action_item.parent_action_item counter=results_loop.counter next_url_name=listboard_filter_url %}
+                    {% endfor %}
                     {% if result.related_action_item and result.parent_action_item.reference_obj.action_identifier != result.related_action_item.reference_obj.action_identifier %}
-                      {% render_tmg_panel action_item=result.related_action_item counter=forloop.counter next_url_name=listboard_filter_url %}
+                      {% render_tmg_panel action_item=result.related_action_item counter=results_loop.counter next_url_name=listboard_filter_url %}
                     {% endif %}
-                  {% endif %}
                 </div>
               </div>
 
@@ -97,12 +100,12 @@
                 {% ae_followup_queryset ae_initial=result.parent_action_item.reference_obj as qs %}
                 {% if qs.count == 0 %}<div class="list-group-item">There are no follow-ups to this AE</div>{% endif  %}
                 {% for ae_followup in qs %}
-                  {% render_tmg_panel reference_obj=ae_followup counter=forloop.counter next_url_name=listboard_filter_url %}
+                  {% render_tmg_panel reference_obj=ae_followup counter=results_loop.counter next_url_name=listboard_filter_url %}
                 {% endfor %}
 
                 {% death_report_queryset subject_identifier=result.subject_identifier as qs %}
                 {% for death_report in qs %}
-                  {% render_tmg_panel reference_obj=death_report counter=forloop.counter next_url_name=listboard_filter_url %}
+                  {% render_tmg_panel reference_obj=death_report counter=results_loop.counter next_url_name=listboard_filter_url %}
                 {% endfor %}
                 </div>
 
@@ -110,6 +113,7 @@
             </div>
             </div>
           </div>
+        {% endwith %}
         {% endfor %}
       {% else %}
         <div class="alert alert-danger">

edc_adverse_event/templatetags/edc_adverse_event_extras.py

@@ -88,15 +88,13 @@ def format_ae_description(context, ae_initial, wrap_length):
     context["YES"] = YES
     context["ae_initial"] = ae_initial
     try:
-        context["sae_reason"] = format_html(
-            "{}",
-            mark_safe(wrapx(escape_braces(ae_initial.sae_reason.name), wrap_length)),  # nosec B703, B308
+        context["sae_reason"] = mark_safe(  # noqa: S308
+            wrapx(escape_braces(ae_initial.sae_reason.name), wrap_length)
         )
     except AttributeError:
         context["sae_reason"] = ""
-    context["ae_description"] = format_html(
-        "{}",
-        mark_safe(wrapx(escape_braces(ae_initial.ae_description), wrap_length)),  # nosec B703, B308
+    context["ae_description"] = mark_safe(
+        wrapx(escape_braces(ae_initial.ae_description), wrap_length)
     )
     return context
 
@@ -111,11 +109,8 @@ def format_ae_followup_description(context, ae_followup, wrap_length):
     context["ae_followup"] = ae_followup
     context["ae_initial"] = ae_followup.ae_initial
     try:
-        context["sae_reason"] = format_html(
-            "{}",
-            mark_safe(
-                wrapx(escape_braces(ae_followup.ae_initial.sae_reason.name), wrap_length)
-            ),  # nosec B703, B308
+        context["sae_reason"] = mark_safe(  # noqa: S308
+            wrapx(escape_braces(ae_followup.ae_initial.sae_reason.name), wrap_length)
         )
     except AttributeError:
         context["sae_reason"] = ""
@@ -177,55 +172,47 @@ def render_death_report_tmg_panel(context, action_item: ActionItem = None):
 
 
 @register.simple_tag
-def ae_tmg_queryset(subject_identifier: str = None) -> QuerySet[DeathReportTmgModel]:
+def ae_tmg_queryset(subject_identifier) -> QuerySet[DeathReportTmgModel]:
     return get_ae_model("aetmg").objects.filter(subject_identifier=subject_identifier)
 
 
 @register.simple_tag
-def death_report_tmg_queryset(
-    subject_identifier: str = None,
-) -> QuerySet[DeathReportTmgModel]:
+def death_report_tmg_queryset(subject_identifier: str) -> QuerySet[DeathReportTmgModel]:
     return get_ae_model("deathreporttmg").objects.filter(subject_identifier=subject_identifier)
 
 
 @register.simple_tag
-def death_report_tmg2_queryset(
-    subject_identifier: str = None,
-) -> QuerySet[DeathReportTmgSecondModel]:
+def death_report_tmg2_queryset(subject_identifier: str) -> QuerySet[DeathReportTmgSecondModel]:
     return get_ae_model("deathreporttmgsecond").objects.filter(
         subject_identifier=subject_identifier
     )
 
 
 @register.simple_tag
-def death_report_queryset(
-    subject_identifier: str = None,
-) -> QuerySet[DeathReportTmgSecondModel]:
+def death_report_queryset(subject_identifier: str) -> QuerySet[DeathReportTmgSecondModel]:
     return get_ae_model("deathreport").objects.filter(subject_identifier=subject_identifier)
 
 
 @register.simple_tag
 def ae_followup_queryset(
     ae_initial: AeInitialModel = None,
-) -> QuerySet[AeFollowupModel] | None:
+) -> QuerySet[AeFollowupModel]:
     if ae_initial:
         return get_ae_model("aefollowup").objects.filter(ae_initial_id=ae_initial.id)
-    return None
+    return get_ae_model("aefollowup").objects.none()
 
 
 @register.simple_tag
-def ae_tmg_action_item(subject_identifier: str = None) -> ActionItem:
-    try:
-        obj = django_apps.get_model("edc_action_item.actionitem").objects.get(
-            subject_identifier=subject_identifier, action_type__name=AE_TMG_ACTION
-        )
-    except ObjectDoesNotExist:
-        obj = None
-    return obj
+def ae_tmg_action_item_queryset(subject_identifier: str, *status) -> QuerySet[ActionItem]:
+    return django_apps.get_model("edc_action_item.actionitem").objects.filter(
+        subject_identifier=subject_identifier,
+        action_type__name=AE_TMG_ACTION,
+        status__in=status,
+    )
 
 
 @register.simple_tag
-def death_report_tmg_action_item(subject_identifier: str = None) -> ActionItem:
+def death_report_tmg_action_item(subject_identifier: str) -> ActionItem:
     try:
         obj = django_apps.get_model("edc_action_item.actionitem").objects.get(
             subject_identifier=subject_identifier,
@@ -237,7 +224,7 @@ def death_report_tmg_action_item(subject_identifier: str = None) -> ActionItem:
 
 
 @register.simple_tag
-def death_report_tmg_second_action_item(subject_identifier: str = None) -> ActionItem:
+def death_report_tmg_second_action_item(subject_identifier: str) -> ActionItem:
     try:
         obj = django_apps.get_model("edc_action_item.actionitem").objects.get(
             subject_identifier=subject_identifier,
@@ -265,7 +252,7 @@ def render_tmg_panel(
     reference_obj = reference_obj or get_reference_obj(action_item)
     if not action_item and reference_obj:
         action_item = reference_obj.action_item
-    disable_all = True if not has_valid_tmg_perms(request=context["request"]) else False
+    disable_all = bool(not has_valid_tmg_perms(request=context["request"]))
     if action_item:
         params = dict(
             user=context["request"].user,

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,13 +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,
@@ -46,29 +46,31 @@ 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
     search_form_url = "tmg_ae_listboard_url"
-    action_type_names = [
+    action_type_names = (
         AE_TMG_ACTION,
         DEATH_REPORT_TMG_ACTION,
         DEATH_REPORT_TMG_SECOND_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,
+            NEW=NEW,
+            CANCELLED=CANCELLED,
             utc_date=timezone.now().date(),
             subject_identifier=self.kwargs.get("subject_identifier"),
         )

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