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

edc_unblinding/migrations/0015_alter_historicalunblindingrequest_report_datetime_and_more.py

@@ -0,0 +1,45 @@
+# Generated by Django 5.2.6 on 2025-09-18 00:24
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "edc_unblinding",
+            "0014_alter_historicalunblindingrequest_action_identifier_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalunblindingrequest",
+            name="report_datetime",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now, verbose_name="Report Date and Time"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalunblindingreview",
+            name="report_datetime",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now, verbose_name="Report Date and Time"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="unblindingrequest",
+            name="report_datetime",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now, verbose_name="Report Date and Time"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="unblindingreview",
+            name="report_datetime",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now, verbose_name="Report Date and Time"
+            ),
+        ),
+    ]

edc_unblinding/models/unblinding_request.py

@@ -4,6 +4,7 @@ from django.core.validators import (
     RegexValidator,
 )
 from django.db import models
+from django.utils import timezone
 
 from edc_action_item.models.action_model_mixin import ActionModelMixin
 from edc_constants.choices import YES_NO_TBD
@@ -13,7 +14,6 @@ from edc_identifier.model_mixins import NonUniqueSubjectIdentifierFieldMixin
 from edc_model.models.base_uuid_model import BaseUuidModel
 from edc_sites.managers import CurrentSiteManager
 from edc_sites.model_mixins import SiteModelMixin
-from edc_utils.date import get_utcnow
 
 from ..constants import UNBLINDING_REQUEST_ACTION
 from .unblinding_user import UnblindingRequestorUser
@@ -28,7 +28,7 @@ class UnblindingRequest(
     action_name = UNBLINDING_REQUEST_ACTION
 
     report_datetime = models.DateTimeField(
-        verbose_name="Report Date and Time", default=get_utcnow
+        verbose_name="Report Date and Time", default=timezone.now
     )
 
     initials = models.CharField(

edc_unblinding/models/unblinding_review.py

@@ -1,4 +1,5 @@
 from django.db import models
+from django.utils import timezone
 
 from edc_action_item.models.action_model_mixin import ActionModelMixin
 from edc_constants.choices import YES_NO_TBD
@@ -8,7 +9,6 @@ from edc_identifier.model_mixins import NonUniqueSubjectIdentifierFieldMixin
 from edc_model.models.base_uuid_model import BaseUuidModel
 from edc_sites.managers import CurrentSiteManager
 from edc_sites.model_mixins import SiteModelMixin
-from edc_utils.date import get_utcnow
 
 from ..constants import UNBLINDING_REVIEW_ACTION
 from .unblinding_user import UnblindingReviewerUser
@@ -23,7 +23,7 @@ class UnblindingReview(
     action_name = UNBLINDING_REVIEW_ACTION
 
     report_datetime = models.DateTimeField(
-        verbose_name="Report Date and Time", default=get_utcnow
+        verbose_name="Report Date and Time", default=timezone.now
     )
 
     reviewer = models.ForeignKey(
@@ -36,7 +36,7 @@ class UnblindingReview(
 
     approved = models.CharField(max_length=15, default=TBD, choices=YES_NO_TBD)
 
-    comment = models.TextField(verbose_name="Comment", null=True)
+    comment = models.TextField(verbose_name="Comment", default="")
 
     objects = SubjectIdentifierManager()
 

edc_utils/__init__.py

@@ -8,7 +8,7 @@ from .get_static_file import get_static_file
 from .get_uuid import get_uuid
 from .message_in_queue import message_in_queue
 from .round_up import round_half_away_from_zero, round_half_up, round_up
-from .show_urls import show_url_names, show_urls
+from .show_urls import show_namespaces, show_url_names, show_urls, show_urls_from_patterns
 from .text import (
     convert_from_camel,
     convert_php_dateformat,
@@ -48,8 +48,10 @@ __all__ = [
     "round_half_up",
     "round_up",
     "safe_allowed_chars",
+    "show_namespaces",
     "show_url_names",
     "show_urls",
+    "show_urls_from_patterns",
     "to_local",
     "to_utc",
     "truncate_string",

edc_utils/age.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
+import contextlib
 from datetime import date, datetime
 from zoneinfo import ZoneInfo
 
 from dateutil.relativedelta import relativedelta
 from django.conf import settings
-
-from .date import get_utcnow
+from django.utils import timezone
 
 
 class AgeValueError(Exception):
@@ -22,19 +22,13 @@ def get_dob(age_in_years: int, now: date | datetime | None = None) -> date:
 
     Used in tests.
     """
-    now = now or get_utcnow()
-    try:
+    now = now or timezone.now()
+    with contextlib.suppress(AttributeError):
         now = now.date()
-    except AttributeError:
-        pass
     return now - relativedelta(years=age_in_years)
 
 
-def age(
-    born: date | datetime,
-    reference_dt: date | datetime,
-    timezone: str | None = None,
-) -> relativedelta:
+def age(born: date | datetime, reference_dt: date | datetime) -> relativedelta:
     """Returns a relative delta.
 
     Convert dates or datetimes to UTC datetimes.
@@ -61,14 +55,14 @@ def age(
 def formatted_age(
     born: date | datetime | None,
     reference_dt: date | datetime,
-    timezone: str | None = None,
+    tz: str | None = None,
 ) -> str:
     age_as_str = "?"
     if born:
-        timezone = timezone or getattr(settings, "TIME_ZONE", "UTC")
-        born = datetime(*[*born.timetuple()][0:6], tzinfo=ZoneInfo(timezone))
-        reference_dt = reference_dt or get_utcnow()
-        age_delta = age(born, reference_dt or get_utcnow())
+        tz = tz or getattr(settings, "TIME_ZONE", "UTC")
+        born = datetime(*[*born.timetuple()][0:6], tzinfo=ZoneInfo(tz))
+        reference_dt = reference_dt or timezone.now()
+        age_delta = age(born, reference_dt or timezone.now())
         if age_delta.years == 0 and age_delta.months <= 0:
             age_as_str = f"{age_delta.days}d"
         elif age_delta.years == 0 and 0 < age_delta.months <= 2:

edc_utils/show_urls.py

@@ -2,7 +2,7 @@
 # https://github.com/django-extensions/django-extensions/blob/master/django_extensions/management/commands/show_urls.py
 
 from django.core.exceptions import ViewDoesNotExist
-from django.urls import URLPattern, URLResolver
+from django.urls import URLPattern, URLResolver, get_resolver
 
 
 class RegexURLPattern:
@@ -21,7 +21,26 @@ def describe_pattern(p):
     return str(p.pattern)
 
 
-def show_urls(urlpatterns, base="", namespace=None, search=None):
+def show_namespaces():
+    """Returns a list of all registered URL namespaces."""
+    resolver = get_resolver()
+    return list(resolver.namespace_dict.keys())
+
+
+def show_urls():
+    """Return a list of all URL patterns in the project."""
+    urls = []
+    resolver = get_resolver()
+    url_patterns = resolver.url_patterns
+    for pattern in url_patterns:
+        try:
+            urls.append(f"URL: {pattern.pattern} -> View: {pattern.callback.__name__}")
+        except AttributeError:
+            urls.append(f"URL: {pattern.pattern}")
+    return urls
+
+
+def show_urls_from_patterns(urlpatterns, base="", namespace=None, search=None):
     urls = extract_views_from_urlpatterns(urlpatterns, base=base, namespace=namespace)
     if search:
         return [url[1] for url in urls if search in url[1]]
@@ -29,6 +48,14 @@ def show_urls(urlpatterns, base="", namespace=None, search=None):
 
 
 def show_url_names(urlpatterns, base="", namespace=None, search=None):
+    """Returns a list of url names.
+
+    For example:
+        resolver = get_resolver()
+        url_patterns = resolver.url_patterns
+        pprint(show_url_names(url_patterns))
+    """
+
     urls = extract_views_from_urlpatterns(urlpatterns, base=base, namespace=namespace)
     if search:
         return [url[2] for url in urls if search in url[2]]

edc_visit_schedule/auths.py

@@ -1,4 +1,9 @@
 from edc_auth.constants import EVERYONE
 from edc_auth.site_auths import site_auths
 
-site_auths.update_group("edc_visit_schedule.view_subjectschedulehistory", name=EVERYONE)
+
+def update_site_auths() -> None:
+    site_auths.update_group("edc_visit_schedule.view_subjectschedulehistory", name=EVERYONE)
+
+
+update_site_auths()

edc_visit_schedule/migrations/0001_initial.py

@@ -8,7 +8,7 @@ import edc_model.models
 import edc_model_fields.fields.hostname_modification_field
 import edc_model_fields.fields.userfield
 import edc_protocol.validators
-import edc_utils
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -22,11 +22,11 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "created",
-                    models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "modified",
-                    models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "user_created",

edc_visit_schedule/migrations/0002_auto_20190305_0123.py

@@ -4,6 +4,7 @@ import django_audit_fields.fields.hostname_modification_field
 import django_audit_fields.fields.userfield
 import django_audit_fields.models.audit_model_mixin
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -13,9 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="subjectschedulehistory",
             name="created",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="subjectschedulehistory",
@@ -29,9 +28,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="subjectschedulehistory",
             name="modified",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="subjectschedulehistory",

edc_visit_schedule/migrations/0003_historicalvisitschedule_visitschedule.py

@@ -12,6 +12,7 @@ import django_revision.revision_field
 import simple_history.models
 from django.conf import settings
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -39,14 +40,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,
                     ),
                 ),
                 (
@@ -124,14 +125,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_visit_schedule/migrations/0015_historicalonschedule_offschedule_onschedule.py

@@ -17,7 +17,7 @@ import edc_identifier.managers
 import edc_model.validators.date
 import edc_protocol.validators
 import edc_sites.managers
-import edc_utils.date
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -46,14 +46,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,
                     ),
                 ),
                 (
@@ -136,7 +136,7 @@ class Migration(migrations.Migration):
                 (
                     "onschedule_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         validators=[
                             edc_protocol.validators.datetime_not_before_study_start,
                             edc_model.validators.date.datetime_not_future,
@@ -210,14 +210,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,
                     ),
                 ),
                 (
@@ -301,7 +301,7 @@ class Migration(migrations.Migration):
                 (
                     "offschedule_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         validators=[
                             edc_protocol.validators.datetime_not_before_study_start,
                             edc_model.validators.date.datetime_not_future,
@@ -362,14 +362,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,
                     ),
                 ),
                 (
@@ -453,7 +453,7 @@ class Migration(migrations.Migration):
                 (
                     "onschedule_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         validators=[
                             edc_protocol.validators.datetime_not_before_study_start,
                             edc_model.validators.date.datetime_not_future,

edc_visit_schedule/migrations/0019_alter_historicalonschedule_device_created_and_more.py

@@ -0,0 +1,229 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_visit_schedule", "0018_alter_historicalonschedule_revision_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalonschedule",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalonschedule",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalonschedule",
+            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="historicalonschedule",
+            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="historicalvisitschedule",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalvisitschedule",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalvisitschedule",
+            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="historicalvisitschedule",
+            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="offschedule",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="offschedule",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="offschedule",
+            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="offschedule",
+            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="onschedule",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="onschedule",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="onschedule",
+            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="onschedule",
+            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="subjectschedulehistory",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectschedulehistory",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectschedulehistory",
+            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="subjectschedulehistory",
+            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="visitschedule",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="visitschedule",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="visitschedule",
+            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="visitschedule",
+            name="locale_modified",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale modified",
+            ),
+        ),
+    ]