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

edc_randomization/utils.py

@@ -1,17 +1,18 @@
 from __future__ import annotations
 
 import csv
-import os
+import sys
+from pathlib import Path
 from typing import Any
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ObjectDoesNotExist
+from django.utils import timezone
 from django_pandas.io import read_frame
 
 from edc_pdutils.constants import SYSTEM_COLUMNS
 from edc_sites.site import sites
-from edc_utils import get_utcnow
 
 from .site_randomizers import site_randomizers
 
@@ -20,13 +21,13 @@ class RandomizationListExporterError(Exception):
     pass
 
 
-class SubjectNotRandomization(Exception):
+class SubjectNotRandomization(Exception):  # noqa: N818
     pass
 
 
 def get_assignment_for_subject(
     subject_identifier: str,
-    randomizer_name: str = None,
+    randomizer_name: str,
     identifier_fld: str | None = None,
 ) -> str:
     """Returns the assignment for a randomized subject.
@@ -42,7 +43,7 @@ def get_assignment_for_subject(
 
 def get_assignment_description_for_subject(
     subject_identifier: str,
-    randomizer_name: str = None,
+    randomizer_name: str,
     identifier_fld: str | None = None,
 ) -> str:
     """Returns the assignment description for a randomized subject.
@@ -60,7 +61,7 @@ def get_assignment_description_for_subject(
 
 def get_object_for_subject(
     subject_identifier: str,
-    randomizer_name: str = None,
+    randomizer_name: str,
     identifier_fld: str | None = None,
     label: str | None = None,
 ) -> Any:
@@ -81,11 +82,11 @@ def get_object_for_subject(
     }
     try:
         obj = randomizer_cls.model_cls().objects.get(**opts)
-    except ObjectDoesNotExist:
+    except ObjectDoesNotExist as e:
         raise SubjectNotRandomization(
             f"{label.title()} not randomized. See Randomizer `{randomizer_name}`. "
             f"Got {identifier_fld}=`{subject_identifier}`."
-        )
+        ) from e
     return obj
 
 
@@ -118,7 +119,7 @@ def generate_fake_randomization_list(
 
     # get site ID and write the file
     site_id = sites.get_by_attr("name", site_name)
-    with open(filename, "a+", newline="") as f:
+    with Path(filename).open("a+", newline="") as f:
         writer = csv.DictWriter(f, fieldnames=["sid", "assignment", "site_name", "country"])
         if write_header:
             writer.writeheader()
@@ -133,7 +134,7 @@ def generate_fake_randomization_list(
                 )
             )
 
-    print(f"(*) Added {slots} slots for {site_name}.")
+    sys.stdout.write(f"(*) Added {slots} slots for {site_name}.\n")
 
 
 def export_randomization_list(
@@ -143,20 +144,20 @@ def export_randomization_list(
 
     try:
         user = get_user_model().objects.get(username=username)
-    except ObjectDoesNotExist:
-        raise RandomizationListExporterError(f"User `{username}` does not exist")
+    except ObjectDoesNotExist as e:
+        raise RandomizationListExporterError(f"User `{username}` does not exist") from e
     if not user.has_perm(randomizer_cls.model_cls()._meta.label_lower.replace(".", ".view_")):
         raise RandomizationListExporterError(
             f"User `{username}` does not have "
             f"permission to view '{randomizer_cls.model_cls()._meta.label_lower}'"
         )
-    path = path or settings.EXPORT_FOLDER
-    timestamp = get_utcnow().strftime("%Y%m%d%H%M")
-    filename = os.path.expanduser(
+    path = Path(path or settings.EXPORT_FOLDER)
+    timestamp = timezone.now().strftime("%Y%m%d%H%M")
+    filename = Path(
         f"~/{settings.APP_NAME}_{randomizer_cls.name}_"
         f"randomizationlist_exported_{timestamp}.csv"
-    )
-    filename = os.path.join(path, filename)
+    ).expanduser()
+    filename = path / filename
 
     df = (
         read_frame(randomizer_cls.model_cls().objects.all(), verbose=False)
@@ -172,5 +173,5 @@ def export_randomization_list(
         sep="|",
     )
     df.to_csv(**opts)
-    print(filename)
+    sys.stdout.write(f"{filename!s}\n")
     return filename

edc_refusal/auths.py

@@ -3,5 +3,10 @@ from edc_screening.auth_objects import SCREENING, SCREENING_SUPER
 
 from .auth_objects import codenames
 
-site_auths.update_group(*codenames, name=SCREENING, no_delete=True)
-site_auths.update_group(*codenames, name=SCREENING_SUPER)
+
+def update_site_auths() -> None:
+    site_auths.update_group(*codenames, name=SCREENING, no_delete=True)
+    site_auths.update_group(*codenames, name=SCREENING_SUPER)
+
+
+update_site_auths()

edc_refusal/migrations/0001_initial.py

@@ -11,7 +11,7 @@ from django.db import migrations, models
 
 import edc_model.models.fields.other_charfield
 import edc_sites.models
-import edc_utils.date
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -103,14 +103,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,
                     ),
                 ),
                 (
@@ -164,7 +164,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         verbose_name="Report Date and Time",
                     ),
                 ),

edc_refusal/migrations/0002_historicalsubjectrefusal.py

@@ -14,7 +14,7 @@ from django.conf import settings
 from django.db import migrations, models
 
 import edc_model.models.fields.other_charfield
-import edc_utils.date
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -43,14 +43,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,
                     ),
                 ),
                 (
@@ -106,7 +106,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         verbose_name="Report Date and Time",
                     ),
                 ),

edc_refusal/migrations/0012_alter_historicalsubjectrefusal_comment_and_more.py

@@ -0,0 +1,122 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_refusal", "0011_alter_historicalsubjectrefusal_revision_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalsubjectrefusal",
+            name="comment",
+            field=models.TextField(
+                blank=True, default="", verbose_name="Additional Comments"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectrefusal",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectrefusal",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectrefusal",
+            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="historicalsubjectrefusal",
+            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="refusalreasons",
+            name="extra_value",
+            field=models.CharField(default="", max_length=250),
+        ),
+        migrations.AlterField(
+            model_name="refusalreasons",
+            name="field_name",
+            field=models.CharField(
+                blank=True,
+                default="",
+                editable=False,
+                help_text="Not required",
+                max_length=25,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="refusalreasons",
+            name="plural_name",
+            field=models.CharField(
+                default="", max_length=250, verbose_name="Plural name"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectrefusal",
+            name="comment",
+            field=models.TextField(
+                blank=True, default="", verbose_name="Additional Comments"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectrefusal",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectrefusal",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectrefusal",
+            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="subjectrefusal",
+            name="locale_modified",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale modified",
+            ),
+        ),
+    ]

edc_refusal/migrations/0013_alter_historicalsubjectrefusal_report_datetime_and_more.py

@@ -0,0 +1,28 @@
+# 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_refusal", "0012_alter_historicalsubjectrefusal_comment_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalsubjectrefusal",
+            name="report_datetime",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now, verbose_name="Report Date and Time"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectrefusal",
+            name="report_datetime",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now, verbose_name="Report Date and Time"
+            ),
+        ),
+    ]

edc_refusal/model_mixins.py

@@ -1,14 +1,14 @@
 from django.db import models
+from django.utils import timezone
 
 from edc_model.models import OtherCharField
-from edc_utils import get_utcnow
 
 
 class SubjectRefusalModelMixin(models.Model):
     screening_identifier = models.CharField(max_length=50, unique=True)
 
     report_datetime = models.DateTimeField(
-        verbose_name="Report Date and Time", default=get_utcnow
+        verbose_name="Report Date and Time", default=timezone.now
     )
 
     reason = models.ForeignKey(
@@ -21,7 +21,7 @@ class SubjectRefusalModelMixin(models.Model):
 
     comment = models.TextField(
         verbose_name="Additional Comments",
-        null=True,
+        default="",
         blank=True,
     )
 
@@ -33,7 +33,7 @@ class SubjectRefusalModelMixin(models.Model):
 
     @staticmethod
     def get_search_slug_fields():
-        return ["screening_identifier"]
+        return ("screening_identifier",)
 
     class Meta:
         abstract = True

edc_registration/auths.py

@@ -4,27 +4,32 @@ from edc_auth.constants import PII, PII_VIEW
 from edc_auth.site_auths import site_auths
 from edc_export.constants import EXPORT
 
-if django_apps.is_installed("edc_export"):
-    site_auths.update_group("edc_registration.export_registeredsubject", name=EXPORT)
-site_auths.update_group(
-    "edc_registration.display_dob",
-    "edc_registration.display_firstname",
-    "edc_registration.display_identity",
-    "edc_registration.display_initials",
-    "edc_registration.display_lastname",
-    "edc_registration.view_historicalregisteredsubject",
-    "edc_registration.view_registeredsubject",
-    name=PII,
-)
 
-site_auths.update_group(
-    "edc_registration.display_dob",
-    "edc_registration.display_firstname",
-    "edc_registration.display_identity",
-    "edc_registration.display_initials",
-    "edc_registration.display_lastname",
-    "edc_registration.view_historicalregisteredsubject",
-    "edc_registration.view_registeredsubject",
-    name=PII_VIEW,
-)
-site_auths.add_pii_model("edc_registration.registeredsubject")
+def update_site_auths() -> None:
+    if django_apps.is_installed("edc_export"):
+        site_auths.update_group("edc_registration.export_registeredsubject", name=EXPORT)
+    site_auths.update_group(
+        "edc_registration.display_dob",
+        "edc_registration.display_firstname",
+        "edc_registration.display_identity",
+        "edc_registration.display_initials",
+        "edc_registration.display_lastname",
+        "edc_registration.view_historicalregisteredsubject",
+        "edc_registration.view_registeredsubject",
+        name=PII,
+    )
+
+    site_auths.update_group(
+        "edc_registration.display_dob",
+        "edc_registration.display_firstname",
+        "edc_registration.display_identity",
+        "edc_registration.display_initials",
+        "edc_registration.display_lastname",
+        "edc_registration.view_historicalregisteredsubject",
+        "edc_registration.view_registeredsubject",
+        name=PII_VIEW,
+    )
+    site_auths.add_pii_model("edc_registration.registeredsubject")
+
+
+update_site_auths()

edc_registration/migrations/0002_auto_20161127_2226.py

@@ -3,8 +3,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
-
-import edc_utils
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -14,11 +13,11 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="registeredsubject",
             name="created",
-            field=models.DateTimeField(default=edc_utils.date.get_utcnow, editable=False),
+            field=models.DateTimeField(default=django.utils.timezone.now, editable=False),
         ),
         migrations.AlterField(
             model_name="registeredsubject",
             name="modified",
-            field=models.DateTimeField(default=edc_utils.date.get_utcnow, editable=False),
+            field=models.DateTimeField(default=django.utils.timezone.now, editable=False),
         ),
     ]

edc_registration/migrations/0005_auto_20170111_1809.py

@@ -6,6 +6,8 @@ from django.db import migrations, models
 
 import edc_model_fields.fields.hostname_modification_field
 import edc_model_fields.fields.userfield
+import django.utils.timezone
+
 import edc_utils
 
 
@@ -16,7 +18,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="registeredsubject",
             name="created",
-            field=models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="registeredsubject",
@@ -51,7 +53,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="registeredsubject",
             name="modified",
-            field=models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="registeredsubject",

edc_registration/migrations/0016_historicalregisteredsubject.py

@@ -20,6 +20,7 @@ import edc_model_fields.fields.hostname_modification_field
 import edc_model_fields.fields.identity_type_field
 import edc_model_fields.fields.userfield
 import edc_utils
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -35,11 +36,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_registration/migrations/0017_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="historicalregisteredsubject",
             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="historicalregisteredsubject",
@@ -29,9 +28,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="historicalregisteredsubject",
             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="historicalregisteredsubject",
@@ -56,9 +53,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="registeredsubject",
             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="registeredsubject",
@@ -72,9 +67,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="registeredsubject",
             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="registeredsubject",