clinicedc 2.0.5__py3-none-any.whl → 2.0.7__py3-none-any.whl

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",

edc_registration/migrations/0033_alter_historicalregisteredsubject_additional_key_and_more.py

@@ -0,0 +1,302 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "edc_registration",
+            "0032_alter_historicalregisteredsubject_revision_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalregisteredsubject",
+            name="additional_key",
+            field=models.CharField(
+                default="",
+                editable=False,
+                help_text="A uuid (or some other text value) to be added to bypass the unique constraint of just firstname, initials, and dob.The default constraint proves limiting since the source model usually has some other attribute in additional to first_name, initials and dob which is not captured in this model",
+                max_length=36,
+                verbose_name="-",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalregisteredsubject",
+            name="comment",
+            field=models.TextField(
+                blank=True, default="", max_length=250, verbose_name="Comment"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalregisteredsubject",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalregisteredsubject",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalregisteredsubject",
+            name="dm_comment",
+            field=models.CharField(
+                default="",
+                editable=False,
+                max_length=150,
+                verbose_name="Data Management comment",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalregisteredsubject",
+            name="ethnicity",
+            field=models.CharField(blank=True, default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="historicalregisteredsubject",
+            name="gender",
+            field=models.CharField(
+                choices=[("M", "Male"), ("F", "Female")],
+                default="",
+                max_length=1,
+                verbose_name="Gender",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalregisteredsubject",
+            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="historicalregisteredsubject",
+            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="historicalregisteredsubject",
+            name="randomization_list_model",
+            field=models.CharField(default="", max_length=150),
+        ),
+        migrations.AlterField(
+            model_name="historicalregisteredsubject",
+            name="registration_identifier",
+            field=models.CharField(blank=True, default="", max_length=36),
+        ),
+        migrations.AlterField(
+            model_name="historicalregisteredsubject",
+            name="registration_status",
+            field=models.CharField(
+                blank=True,
+                default="",
+                max_length=25,
+                verbose_name="Registration status",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalregisteredsubject",
+            name="relative_identifier",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="For example, mother's identifier, if available / appropriate",
+                max_length=36,
+                verbose_name="Identifier of immediate relation",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalregisteredsubject",
+            name="screening_identifier",
+            field=models.CharField(blank=True, default="", max_length=36),
+        ),
+        migrations.AlterField(
+            model_name="historicalregisteredsubject",
+            name="sid",
+            field=models.CharField(
+                blank=True, default="", max_length=15, verbose_name="SID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalregisteredsubject",
+            name="subject_consent_id",
+            field=models.CharField(blank=True, default="", max_length=100),
+        ),
+        migrations.AlterField(
+            model_name="historicalregisteredsubject",
+            name="subject_identifier_aka",
+            field=models.CharField(
+                default="",
+                editable=False,
+                help_text="track a previously allocated identifier.",
+                max_length=50,
+                verbose_name="Subject Identifier a.k.a",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalregisteredsubject",
+            name="subject_type",
+            field=models.CharField(blank=True, default="", max_length=25),
+        ),
+        migrations.AlterField(
+            model_name="registeredsubject",
+            name="additional_key",
+            field=models.CharField(
+                default="",
+                editable=False,
+                help_text="A uuid (or some other text value) to be added to bypass the unique constraint of just firstname, initials, and dob.The default constraint proves limiting since the source model usually has some other attribute in additional to first_name, initials and dob which is not captured in this model",
+                max_length=36,
+                verbose_name="-",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="registeredsubject",
+            name="comment",
+            field=models.TextField(
+                blank=True, default="", max_length=250, verbose_name="Comment"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="registeredsubject",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="registeredsubject",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="registeredsubject",
+            name="dm_comment",
+            field=models.CharField(
+                default="",
+                editable=False,
+                max_length=150,
+                verbose_name="Data Management comment",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="registeredsubject",
+            name="ethnicity",
+            field=models.CharField(blank=True, default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="registeredsubject",
+            name="gender",
+            field=models.CharField(
+                choices=[("M", "Male"), ("F", "Female")],
+                default="",
+                max_length=1,
+                verbose_name="Gender",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="registeredsubject",
+            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="registeredsubject",
+            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="registeredsubject",
+            name="randomization_list_model",
+            field=models.CharField(default="", max_length=150),
+        ),
+        migrations.AlterField(
+            model_name="registeredsubject",
+            name="registration_identifier",
+            field=models.CharField(blank=True, default="", max_length=36),
+        ),
+        migrations.AlterField(
+            model_name="registeredsubject",
+            name="registration_status",
+            field=models.CharField(
+                blank=True,
+                default="",
+                max_length=25,
+                verbose_name="Registration status",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="registeredsubject",
+            name="relative_identifier",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="For example, mother's identifier, if available / appropriate",
+                max_length=36,
+                verbose_name="Identifier of immediate relation",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="registeredsubject",
+            name="screening_identifier",
+            field=models.CharField(blank=True, default="", max_length=36),
+        ),
+        migrations.AlterField(
+            model_name="registeredsubject",
+            name="sid",
+            field=models.CharField(
+                blank=True, default="", max_length=15, verbose_name="SID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="registeredsubject",
+            name="subject_consent_id",
+            field=models.CharField(blank=True, default="", max_length=100),
+        ),
+        migrations.AlterField(
+            model_name="registeredsubject",
+            name="subject_identifier_aka",
+            field=models.CharField(
+                default="",
+                editable=False,
+                help_text="track a previously allocated identifier.",
+                max_length=50,
+                verbose_name="Subject Identifier a.k.a",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="registeredsubject",
+            name="subject_type",
+            field=models.CharField(blank=True, default="", max_length=25),
+        ),
+    ]

edc_registration/model_mixins/updates_or_creates_registered_subject_model_mixin.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 from typing import TYPE_CHECKING
 
 from django.core.exceptions import ObjectDoesNotExist
@@ -64,10 +65,8 @@ class UpdatesOrCreatesRegistrationModelMixin(models.Model):
 
         Converts UUID to string using .hex.
         """
-        try:
+        with contextlib.suppress(AttributeError):
             value = str(value.hex)
-        except AttributeError:
-            pass
         return value
 
     @property

edc_registration/models/registered_subject.py

@@ -44,7 +44,7 @@ class RegisteredSubject(UniqueSubjectIdentifierModelMixin, SiteModelMixin, BaseU
         validators=[
             RegexValidator(
                 regex=r"^[A-Z]{2,3}$",
-                message=("Ensure initials consist of letters only in upper case, no spaces."),
+                message="Ensure initials consist of letters only in upper case, no spaces.",
             )
         ],
         null=True,
@@ -62,27 +62,27 @@ class RegisteredSubject(UniqueSubjectIdentifierModelMixin, SiteModelMixin, BaseU
     )
 
     gender = models.CharField(
-        verbose_name="Gender", max_length=1, choices=GENDER, null=True, blank=False
+        verbose_name="Gender", max_length=1, choices=GENDER, default="", blank=False
     )
 
     ethnicity = models.CharField(
         max_length=15,
-        null=True,
+        default="",
         blank=True,
     )
 
-    subject_consent_id = models.CharField(max_length=100, null=True, blank=True)
+    subject_consent_id = models.CharField(max_length=100, default="", blank=True)
 
-    registration_identifier = models.CharField(max_length=36, null=True, blank=True)
+    registration_identifier = models.CharField(max_length=36, default="", blank=True)
 
-    sid = models.CharField(verbose_name="SID", max_length=15, null=True, blank=True)
+    sid = models.CharField(verbose_name="SID", max_length=15, default="", blank=True)
 
-    subject_type = models.CharField(max_length=25, null=True, blank=True)
+    subject_type = models.CharField(max_length=25, default="", blank=True)
 
     relative_identifier = models.CharField(
         verbose_name="Identifier of immediate relation",
         max_length=36,
-        null=True,
+        default="",
         blank=True,
         help_text="For example, mother's identifier, if available / appropriate",
     )
@@ -91,7 +91,7 @@ class RegisteredSubject(UniqueSubjectIdentifierModelMixin, SiteModelMixin, BaseU
 
     identity_type = IdentityTypeField(null=True, blank=True)
 
-    screening_identifier = models.CharField(max_length=36, null=True, blank=True)
+    screening_identifier = models.CharField(max_length=36, default="", blank=True)
 
     screening_datetime = models.DateTimeField(null=True, blank=True)
 
@@ -104,19 +104,18 @@ class RegisteredSubject(UniqueSubjectIdentifierModelMixin, SiteModelMixin, BaseU
     randomization_datetime = models.DateTimeField(null=True, blank=True)
 
     registration_status = models.CharField(
-        verbose_name="Registration status", max_length=25, null=True, blank=True
+        verbose_name="Registration status", max_length=25, default="", blank=True
     )
 
     consent_datetime = models.DateTimeField(null=True, blank=True)
 
-    comment = models.TextField(verbose_name="Comment", max_length=250, null=True, blank=True)
+    comment = models.TextField(verbose_name="Comment", max_length=250, default="", blank=True)
 
     additional_key = models.CharField(
         max_length=36,
         verbose_name="-",
         editable=False,
-        default=None,
-        null=True,
+        default="",
         help_text=(
             "A uuid (or some other text value) to be added to bypass the "
             "unique constraint of just firstname, initials, and dob."
@@ -130,11 +129,11 @@ class RegisteredSubject(UniqueSubjectIdentifierModelMixin, SiteModelMixin, BaseU
     dm_comment = models.CharField(
         verbose_name="Data Management comment",
         max_length=150,
-        null=True,
+        default="",
         editable=False,
     )
 
-    randomization_list_model = models.CharField(max_length=150, null=True)
+    randomization_list_model = models.CharField(max_length=150, default="")
 
     objects = RegisteredSubjectManager()
 
@@ -157,7 +156,7 @@ class RegisteredSubject(UniqueSubjectIdentifierModelMixin, SiteModelMixin, BaseU
     def __str__(self):
         return self.masked_subject_identifier
 
-    natural_key.dependencies = ["sites.Site"]
+    natural_key.dependencies = ("sites.Site",)
 
     def update_subject_identifier_on_save(self):
         """Overridden to not set the subject identifier on save."""
@@ -202,13 +201,15 @@ class RegisteredSubject(UniqueSubjectIdentifierModelMixin, SiteModelMixin, BaseU
         if self.id and self.subject_identifier_is_set:
             with transaction.atomic():
                 obj = self.__class__.objects.get(pk=self.id)
-                if obj.subject_identifier != self.subject_identifier_as_pk.hex:
-                    if self.subject_identifier != obj.subject_identifier:
-                        raise RegisteredSubjectError(
-                            "Subject identifier cannot be changed for "
-                            "existing registered subject. "
-                            f"Got {self.subject_identifier} <> {obj.subject_identifier}."
-                        )
+                if obj.subject_identifier not in (
+                    self.subject_identifier_as_pk.hex,
+                    self.subject_identifier,
+                ):
+                    raise RegisteredSubjectError(
+                        "Subject identifier cannot be changed for "
+                        "existing registered subject. "
+                        f"Got {self.subject_identifier} <> {obj.subject_identifier}."
+                    )
 
     def raise_on_duplicate(self, attrname):
         """Checks if the subject identifier (or other attr) is in use,
@@ -246,12 +247,12 @@ class RegisteredSubject(UniqueSubjectIdentifierModelMixin, SiteModelMixin, BaseU
     class Meta(UniqueSubjectIdentifierModelMixin.Meta, BaseUuidModel.Meta):
         verbose_name = "Registered Subject"
         verbose_name_plural = "Registered Subjects"
-        constraints = [
+        constraints = (
             UniqueConstraint(
                 fields=["first_name", "dob", "initials", "additional_key"],
                 name="%(app_label)s_%(class)s_first_name_uniq",
-            )
-        ]
+            ),
+        )
         indexes = (
             *BaseUuidModel.Meta.indexes,
             models.Index(fields=["first_name", "dob", "initials", "additional_key"]),

edc_reportable/age_evaluator.py

@@ -2,7 +2,9 @@ from __future__ import annotations
 
 from datetime import date, datetime
 
-from edc_utils import age, get_utcnow
+from django.utils import timezone
+
+from edc_utils import age
 
 from .evaluator import Evaluator
 
@@ -38,7 +40,7 @@ class AgeEvaluator(Evaluator):
         report_datetime: datetime = None,
         age_units: str | None = None,
     ) -> bool:
-        report_datetime = report_datetime or get_utcnow()
+        report_datetime = report_datetime or timezone.now()
         age_units = age_units or "years"
         rdelta = age(dob, report_datetime)
         value = getattr(rdelta, self.units)

edc_reportable/formula.py

@@ -41,8 +41,8 @@ class Formula:
     age_lower_inclusive: bool | None = None
     age_upper_inclusive: bool | None = None
     grade: int | None = None
-    lln: str | None = field(default=None, init=False, repr=False)
-    uln: str | None = field(default=None, init=False, repr=False)
+    lln: str | None = field(default="", init=False, repr=False)
+    uln: str | None = field(default="", init=False, repr=False)
     lower_operator: str = field(default="", init=False, repr=False)
     upper_operator: str = field(default="", init=False, repr=False)
     age_lower_operator: str = field(default="", init=False, repr=False)
@@ -108,8 +108,8 @@ class Formula:
 
     @staticmethod
     def parse_fragment(fragment: str) -> tuple[float, bool, str | None]:
-        limit_normal: str | None = None
-        inclusive = True if "=" in fragment else False
+        limit_normal: str = ""
+        inclusive = "=" in fragment
         try:
             value = float(
                 fragment.replace("<", "")
@@ -130,7 +130,7 @@ def formula(phrase, **kwargs):
     return Formula(phrase, **kwargs).description
 
 
-def dummy_formula(phrase: str = None, units: str = None) -> Formula:
+def dummy_formula(phrase: str, units: str) -> Formula:
     return Formula(
         phrase or "0<=x",
         units=units,

edc_reportable/migrations/0001_initial.py

@@ -8,10 +8,10 @@ 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):
-
     initial = True
 
     dependencies = []
@@ -35,14 +35,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,
                     ),
                 ),
                 (
@@ -167,14 +167,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,
                     ),
                 ),
                 (
@@ -309,14 +309,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_reportable/migrations/0003_referencerangecollection_grade1_and_more.py

@@ -9,10 +9,10 @@ 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):
-
     dependencies = [
         ("edc_reportable", "0002_alter_gradingdata_age_upper_and_more"),
     ]
@@ -113,14 +113,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,
                     ),
                 ),
                 (