clinicedc 2.0.6__py3-none-any.whl → 2.0.8__py3-none-any.whl

edc_crf/migrations/0009_alter_crfstatus_device_created_and_more.py

@@ -0,0 +1,54 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_crf", "0008_alter_crfstatus_revision"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="crfstatus",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="crfstatus",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="crfstatus",
+            name="locale_created",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale created",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="crfstatus",
+            name="locale_modified",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale modified",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="crfstatus",
+            name="visit_code",
+            field=models.CharField(default="", editable=False, max_length=25),
+        ),
+    ]

edc_dashboard/auths.py

@@ -3,11 +3,15 @@ from edc_auth.utils import remove_default_model_permissions_from_edc_permissions
 
 from .auth_objects import dashboard_tuples
 
-site_auths.add_post_update_func(
-    "edc_dashboard", remove_default_model_permissions_from_edc_permissions
-)
 
+def update_site_auths():
+    site_auths.add_post_update_func(
+        "edc_dashboard", remove_default_model_permissions_from_edc_permissions
+    )
 
-site_auths.add_custom_permissions_tuples(
-    model="edc_dashboard.edcpermissions", codename_tuples=dashboard_tuples
-)
+    site_auths.add_custom_permissions_tuples(
+        model="edc_dashboard.edcpermissions", codename_tuples=dashboard_tuples
+    )
+
+
+update_site_auths()

edc_dashboard/migrations/0001_initial.py

@@ -7,6 +7,7 @@ import django_audit_fields.fields.uuid_auto_field
 import django_audit_fields.models.audit_model_mixin
 import django_revision.revision_field
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -33,14 +34,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (

edc_dashboard/migrations/0006_alter_edcpermissions_device_created_and_more.py

@@ -0,0 +1,49 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_dashboard", "0005_alter_edcpermissions_revision"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="locale_created",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale created",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="locale_modified",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale modified",
+            ),
+        ),
+    ]

edc_dashboard/templatetags/edc_dashboard_extras.py

@@ -5,8 +5,9 @@ from django import template
 from django.conf import settings
 from django.template.defaultfilters import stringfilter
 from django.urls.base import reverse
+from django.utils import timezone
 
-from edc_utils import AgeValueError, age, get_utcnow
+from edc_utils.age import AgeValueError, age
 
 register = template.Library()
 
@@ -39,7 +40,7 @@ class UrlMaker:
 @register.simple_tag(takes_context=True)
 def age_in_years(context, born):
     if born:
-        reference_datetime = context.get("reference_datetime") or get_utcnow()
+        reference_datetime = context.get("reference_datetime") or timezone.now()
         try:
             _age_in_years = age(born, reference_datetime).years
         except AgeValueError:

edc_dashboard/url_config.py

@@ -20,12 +20,13 @@ if TYPE_CHECKING:
 class UrlConfig:
     def __init__(
         self,
-        url_name: str = None,
-        namespace: str = None,
-        view_class: type[View | UrlRequestContextMixin] = None,
-        label: str = None,
-        identifier_label: str = None,
-        identifier_pattern: str = None,
+        *,
+        url_name: str,
+        namespace: str,
+        view_class: type[View | UrlRequestContextMixin],
+        label: str,
+        identifier_label: str,
+        identifier_pattern: str,
     ):
         self.identifier_label = identifier_label
         self.identifier_pattern = identifier_pattern
@@ -39,102 +40,108 @@ class UrlConfig:
     @property
     def dashboard_urls(self) -> list[URLPattern]:
         """Returns url patterns."""
-        urlpatterns = [
+        return [
             re_path(
-                "%(label)s/"
-                "(?P<%(identifier_label)s>%(identifier_pattern)s)/"
+                "{label}/"
+                "(?P<{identifier_label}>{identifier_pattern})/"
                 r"(?P<visit_schedule_name>\w+)/"
                 r"(?P<schedule_name>\w+)/"
                 r"(?P<visit_code>\w+)/"
-                r"(?P<unscheduled>\w+)/"
-                % {
-                    "label": self.label,
-                    "identifier_label": self.identifier_label,
-                    "identifier_pattern": self.identifier_pattern,
-                },
+                r"(?P<unscheduled>\w+)/".format(
+                    **dict(
+                        label=self.label,
+                        identifier_label=self.identifier_label,
+                        identifier_pattern=self.identifier_pattern,
+                    )
+                ),
                 self.view_class.as_view(),
                 name=self.url_name,
             ),
             re_path(
-                "%(label)s/"
-                "(?P<%(identifier_label)s>%(identifier_pattern)s)/"
+                "{label}/"
+                "(?P<{identifier_label}>{identifier_pattern})/"
                 r"(?P<visit_schedule_name>\w+)/"
                 r"(?P<schedule_name>\w+)/"
-                r"(?P<visit_code>\w+)/"
-                % dict(
-                    label=self.label,
-                    identifier_label=self.identifier_label,
-                    identifier_pattern=self.identifier_pattern,
+                r"(?P<visit_code>\w+)/".format(
+                    **dict(
+                        label=self.label,
+                        identifier_label=self.identifier_label,
+                        identifier_pattern=self.identifier_pattern,
+                    )
                 ),
                 self.view_class.as_view(),
                 name=self.url_name,
             ),
             re_path(
-                "%(label)s/"
-                "(?P<%(identifier_label)s>%(identifier_pattern)s)/"
-                "(?P<appointment>%(uuid_pattern)s)/"
+                "{label}/"
+                "(?P<{identifier_label}>{identifier_pattern})/"
+                "(?P<appointment>{uuid_pattern})/"
                 r"(?P<scanning>\d)/"
-                r"(?P<error>\d)/"
-                % dict(
-                    label=self.label,
-                    identifier_label=self.identifier_label,
-                    identifier_pattern=self.identifier_pattern,
-                    uuid_pattern=UUID_PATTERN.pattern,
+                r"(?P<error>\d)/".format(
+                    **dict(
+                        label=self.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,
             ),
             re_path(
-                "%(label)s/"
-                "(?P<%(identifier_label)s>%(identifier_pattern)s)/"
-                "(?P<appointment>%(uuid_pattern)s)/"
-                r"(?P<reason>\w+)/"
-                % dict(
-                    label=self.label,
-                    identifier_label=self.identifier_label,
-                    identifier_pattern=self.identifier_pattern,
-                    uuid_pattern=UUID_PATTERN.pattern,
+                "{label}/"
+                "(?P<{identifier_label}>{identifier_pattern})/"
+                "(?P<appointment>{uuid_pattern})/"
+                r"(?P<reason>\w+)/".format(
+                    **dict(
+                        label=self.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,
             ),
             re_path(
-                "%(label)s/"
-                "(?P<%(identifier_label)s>%(identifier_pattern)s)/"
-                "(?P<appointment>%(uuid_pattern)s)/"
-                % dict(
-                    label=self.label,
-                    identifier_label=self.identifier_label,
-                    identifier_pattern=self.identifier_pattern,
-                    uuid_pattern=UUID_PATTERN.pattern,
+                "{label}/"
+                "(?P<{identifier_label}>{identifier_pattern})/"
+                "(?P<appointment>{uuid_pattern})/".format(
+                    **dict(
+                        label=self.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,
             ),
             re_path(
-                "%(label)s/"
-                "(?P<%(identifier_label)s>%(identifier_pattern)s)/"
-                r"(?P<schedule_name>\w+)/"
-                % dict(
-                    label=self.label,
-                    identifier_label=self.identifier_label,
-                    identifier_pattern=self.identifier_pattern,
+                "{label}/"
+                "(?P<{identifier_label}>{identifier_pattern})/"
+                r"(?P<schedule_name>\w+)/".format(
+                    **dict(
+                        label=self.label,
+                        identifier_label=self.identifier_label,
+                        identifier_pattern=self.identifier_pattern,
+                    )
                 ),
                 self.view_class.as_view(),
                 name=self.url_name,
             ),
             re_path(
-                "%(label)s/(?P<%(identifier_label)s>%(identifier_pattern)s)/"
-                % dict(
-                    label=self.label,
-                    identifier_label=self.identifier_label,
-                    identifier_pattern=self.identifier_pattern,
+                "{label}/(?P<{identifier_label}>{identifier_pattern})/".format(
+                    **dict(
+                        label=self.label,
+                        identifier_label=self.identifier_label,
+                        identifier_pattern=self.identifier_pattern,
+                    )
                 ),
                 self.view_class.as_view(),
                 name=self.url_name,
             ),
         ]
-        return urlpatterns
 
     @property
     def listboard_urls(self) -> list[URLPattern]:
@@ -142,52 +149,54 @@ class UrlConfig:
 
         configs = [(listboard_url, listboard_view_class, label), (), ...]
         """
-        urlpatterns = [
+        return [
             re_path(
-                "%(label)s/(?P<%(identifier_label)s>%(identifier_pattern)s)/"
-                r"(?P<page>\d+)/"
-                % dict(
-                    label=self.label,
-                    identifier_label=self.identifier_label,
-                    identifier_pattern=self.identifier_pattern,
+                "{label}/(?P<{identifier_label}>{identifier_pattern})/"
+                r"(?P<page>\d+)/".format(
+                    **dict(
+                        label=self.label,
+                        identifier_label=self.identifier_label,
+                        identifier_pattern=self.identifier_pattern,
+                    )
                 ),
                 self.view_class.as_view(),
                 name=self.url_name,
             ),
             re_path(
-                "%(label)s/(?P<%(identifier_label)s>%(identifier_pattern)s)/"
-                % dict(
-                    label=self.label,
-                    identifier_label=self.identifier_label,
-                    identifier_pattern=self.identifier_pattern,
+                "{label}/(?P<{identifier_label}>{identifier_pattern})/".format(
+                    **dict(
+                        label=self.label,
+                        identifier_label=self.identifier_label,
+                        identifier_pattern=self.identifier_pattern,
+                    )
                 ),
                 self.view_class.as_view(),
                 name=self.url_name,
             ),
             re_path(
-                r"%(label)s/(?P<page>\d+)/" % dict(label=self.label),
+                r"{label}/(?P<page>\d+)/".format(**dict(label=self.label)),
                 self.view_class.as_view(),
                 name=self.url_name,
             ),
             re_path(
-                r"%(label)s/" % dict(label=self.label),
+                r"{label}/".format(**dict(label=self.label)),
                 self.view_class.as_view(),
                 name=self.url_name,
             ),
         ]
-        return urlpatterns
 
     @property
     def review_listboard_urls(self) -> list[URLPattern]:
         url_patterns = [
             re_path(
-                "%(label)s/(?P<%(identifier_label)s>%(identifier_pattern)s)/"
-                "(?P<appointment>%(uuid_pattern)s)/"
-                % dict(
-                    label=self.label,
-                    identifier_label=self.identifier_label,
-                    identifier_pattern=self.identifier_pattern,
-                    uuid_pattern=UUID_PATTERN.pattern,
+                "{label}/(?P<{identifier_label}>{identifier_pattern})/"
+                "(?P<appointment>{uuid_pattern})/".format(
+                    **dict(
+                        label=self.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,

edc_dashboard/url_names.py

@@ -3,11 +3,11 @@ from __future__ import annotations
 from dataclasses import dataclass, field
 
 
-class AlreadyRegistered(Exception):
+class AlreadyRegistered(Exception):  # noqa: N818
     pass
 
 
-class InvalidDashboardUrlName(Exception):
+class InvalidDashboardUrlName(Exception):  # noqa: N818
     pass
 
 
@@ -16,12 +16,12 @@ class UrlNames:
     registry: dict[str, str] = field(default_factory=dict)
 
     def register(
-        self, name: str = None, url: str = None, namespace: str | None = None
+        self, name: str | None = None, url: str | None = None, 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 {name}.")
+            raise AlreadyRegistered(f"Url already registered. Got {complete_url}.")
         self.registry.update({name: complete_url})
 
     def register_from_dict(self, **urldata: str) -> None:

edc_dashboard/view_mixins/url_request_context_mixin.py

@@ -30,10 +30,11 @@ class UrlRequestContextMixin:
     @classmethod
     def urls(
         cls,
-        namespace: str = None,
-        label: str = None,
-        identifier_label: str = None,
-        identifier_pattern: str = None,
+        *,
+        label: str,
+        identifier_pattern: str,
+        namespace: str | None = None,
+        identifier_label: str | None = None,
     ) -> list[URLPattern]:
         label = (
             label
@@ -62,5 +63,5 @@ class UrlRequestContextMixin:
                 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

edc_data_manager/action_items.py

@@ -1,5 +1,6 @@
 from django.conf import settings
 from django.template.loader import render_to_string
+from django.utils import timezone
 
 from edc_action_item.action import Action
 from edc_action_item.site_action_items import site_action_items
@@ -11,7 +12,6 @@ from edc_constants.constants import (
     NORMAL,
     RESOLVED,
 )
-from edc_utils.date import get_utcnow
 
 from .constants import CLOSED_WITH_ACTION
 
@@ -35,12 +35,10 @@ class DataQueryAction(Action):
         return not self.close_action_item_on_save()
 
     def close_action_item_on_save(self):
-        if self.reference_obj and self.reference_obj.status in [
+        return self.reference_obj and self.reference_obj.status in [
             CLOSED,
             CLOSED_WITH_ACTION,
-        ]:
-            return True
-        return False
+        ]
 
     def get_priority(self):
         return self.query_priority or self.priority
@@ -98,7 +96,7 @@ class DataQueryAction(Action):
             object=self.reference_obj,
             query_priority=query_priority,
             title=title,
-            utcnow=get_utcnow(),
+            utcnow=timezone.now(),
             visit_schedule=visit_schedule,
         )
         form_and_numbers_to_string = getattr(

edc_data_manager/admin/actions.py

@@ -4,11 +4,12 @@ from django.conf import settings
 from django.contrib import admin, messages
 from django.core.exceptions import ObjectDoesNotExist
 from django.urls.base import reverse
+from django.utils import timezone
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
 from edc_constants.constants import CLOSED, OPEN
-from edc_utils import formatted_datetime, get_utcnow
+from edc_utils import formatted_datetime
 
 from ..models import QueryRule
 from ..rule import update_query_rules
@@ -65,14 +66,13 @@ def copy_query_rule_action(modeladmin, request, queryset):
 def update_query_rules_action(modeladmin, request, queryset):
     if not DATA_MANAGER_ENABLED:
         msg = (
-            "Data manager features are currently disabled. "
-            "See settings.DATA_MANAGER_ENABLED."
+            "Data manager features are currently disabled. See settings.DATA_MANAGER_ENABLED."
         )
         messages.add_message(request, messages.ERROR, msg)
     elif queryset:
         if settings.CELERY_ENABLED:
             update_query_rules.delay(pks=[o.pk for o in queryset])
-            dte = get_utcnow()
+            dte = timezone.now()
             taskresult_url = reverse("admin:django_celery_results_taskresult_changelist")
             msg = format_html(
                 "Updating data queries in the background. "
@@ -86,7 +86,7 @@ def update_query_rules_action(modeladmin, request, queryset):
         else:
             results = update_query_rules(pks=[o.pk for o in queryset])
             msg = format_html(
-                "Done updating data queries. Created {}, " "resolved {}.",
+                "Done updating data queries. Created {}, resolved {}.",
                 mark_safe(results.get("created")),  # nosec B703, B308
                 mark_safe(results.get("resolved")),  # nosec B703, B308
             )

edc_data_manager/admin/data_query_admin.py

@@ -45,7 +45,7 @@ class DataQueryAdmin(SiteModelAdminMixin, ModelAdminSubjectDashboardMixin, Simpl
 
     locked_column_template_name = "edc_data_manager/columns/locked.html"
 
-    status_column_context = {
+    status_column_context = {  # noqa: RUF012
         "NEW": NEW,
         "OPEN": OPEN,
         "FEEDBACK": FEEDBACK,
@@ -61,13 +61,13 @@ class DataQueryAdmin(SiteModelAdminMixin, ModelAdminSubjectDashboardMixin, Simpl
 
     actions = (toggle_dm_status,)
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "status": admin.VERTICAL,
         "site_response_status": admin.VERTICAL,
         "query_priority": admin.VERTICAL,
     }
 
-    autocomplete_fields = [
+    autocomplete_fields = (
         "sender",
         "recipients",
         "data_dictionaries",
@@ -75,7 +75,7 @@ class DataQueryAdmin(SiteModelAdminMixin, ModelAdminSubjectDashboardMixin, Simpl
         "visit_schedule",
         "registered_subject",
         "dm_user",
-    ]
+    )
 
     list_display = (
         "wrapped_title",
@@ -201,11 +201,10 @@ class DataQueryAdmin(SiteModelAdminMixin, ModelAdminSubjectDashboardMixin, Simpl
     wrapped_title.short_description = "Title"
 
     def formfield_for_manytomany(self, db_field, request, **kwargs):
-        if db_field.name == "data_dictionaries":
-            if request.GET.get("title"):
-                kwargs["queryset"] = DataDictionary.objects.filter(
-                    model_verbose_name=request.GET.get("title")
-                )
+        if db_field.name == "data_dictionaries" and request.GET.get("title"):
+            kwargs["queryset"] = DataDictionary.objects.filter(
+                model_verbose_name=request.GET.get("title")
+            )
         return super().formfield_for_manytomany(db_field, request, **kwargs)
 
     def query_dates(self, obj):
@@ -332,7 +331,8 @@ class DataQueryAdmin(SiteModelAdminMixin, ModelAdminSubjectDashboardMixin, Simpl
             "missed_visit",
             "auto_resolved",
             "registered_subject",
-        ) + action_fields
+            *action_fields,
+        )
         if not request.user.groups.filter(name=DATA_MANAGER):
             extra_fields = (
                 "data_dictionaries",
@@ -350,10 +350,11 @@ class DataQueryAdmin(SiteModelAdminMixin, ModelAdminSubjectDashboardMixin, Simpl
                 "title",
                 "visit_code_sequence",
                 "visit_schedule",
+                *extra_fields,
             )
         if not obj:
             extra_fields = tuple(f for f in extra_fields if f != "registered_subject")
-        return fields + extra_fields
+        return *fields, *extra_fields
 
     def get_subject_dashboard_url_kwargs(self, obj):
         def get_opts():