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

edc_metadata/migrations/0005_auto_20170112_0602.py

@@ -6,7 +6,7 @@ from django.db import migrations, models
 
 import edc_model_fields.fields.hostname_modification_field
 import edc_model_fields.fields.userfield
-import edc_utils
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -16,7 +16,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="crfmetadata",
             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="crfmetadata",
@@ -40,7 +40,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="crfmetadata",
             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="crfmetadata",
@@ -59,7 +59,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="requisitionmetadata",
             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="requisitionmetadata",
@@ -83,7 +83,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="requisitionmetadata",
             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="requisitionmetadata",

edc_metadata/migrations/0011_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="crfmetadata",
             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="crfmetadata",
@@ -29,9 +28,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="crfmetadata",
             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="crfmetadata",
@@ -56,9 +53,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="requisitionmetadata",
             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="requisitionmetadata",
@@ -72,9 +67,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="requisitionmetadata",
             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="requisitionmetadata",

edc_metadata/migrations/0031_alter_crfmetadata_device_created_and_more.py

@@ -0,0 +1,120 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_metadata", "0030_alter_crfmetadata_revision_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="crfmetadata",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="crfmetadata",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="crfmetadata",
+            name="document_name",
+            field=models.CharField(default="", max_length=250, verbose_name="Document"),
+        ),
+        migrations.AlterField(
+            model_name="crfmetadata",
+            name="document_user",
+            field=models.CharField(default="", max_length=50, verbose_name="User"),
+        ),
+        migrations.AlterField(
+            model_name="crfmetadata",
+            name="entry_comment",
+            field=models.TextField(blank=True, default="", max_length=250),
+        ),
+        migrations.AlterField(
+            model_name="crfmetadata",
+            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="crfmetadata",
+            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="requisitionmetadata",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="requisitionmetadata",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="requisitionmetadata",
+            name="document_name",
+            field=models.CharField(default="", max_length=250, verbose_name="Document"),
+        ),
+        migrations.AlterField(
+            model_name="requisitionmetadata",
+            name="document_user",
+            field=models.CharField(default="", max_length=50, verbose_name="User"),
+        ),
+        migrations.AlterField(
+            model_name="requisitionmetadata",
+            name="entry_comment",
+            field=models.TextField(blank=True, default="", max_length=250),
+        ),
+        migrations.AlterField(
+            model_name="requisitionmetadata",
+            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="requisitionmetadata",
+            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="requisitionmetadata",
+            name="panel_name",
+            field=models.CharField(default="", max_length=50),
+        ),
+    ]

edc_metadata/model_mixins/updates/updates_crf_metadata_model_mixin.py

@@ -50,16 +50,19 @@ class UpdatesCrfMetadataModelMixin(UpdatesMetadataModelMixin):
         return django_apps.get_model(metadata_model)
 
     @property
-    def metadata_default_entry_status(self: CrfModel) -> str:
+    def metadata_default_entry_status(self: CrfModel) -> str | None:
         """Returns a string that represents the default entry status
         of the CRF in the visit schedule.
         """
         crfs_prn = self.metadata_visit_object.crfs_prn
         if self.related_visit.visit_code_sequence != 0:
-            crfs = self.metadata_visit_object.crfs_unscheduled.forms + crfs_prn.forms
+            crfs = (*self.metadata_visit_object.crfs_unscheduled.forms, *crfs_prn.forms)
         else:
-            crfs = self.metadata_visit_object.crfs.forms + crfs_prn.forms
-        crf = [c for c in crfs if c.model == self._meta.label_lower][0]
+            crfs = (*self.metadata_visit_object.crfs.forms, *crfs_prn.forms)
+        try:
+            crf = next(c for c in crfs if c.model == self._meta.label_lower)
+        except StopIteration:
+            return None
         return REQUIRED if crf.required else NOT_REQUIRED
 
     class Meta:

edc_metadata/model_mixins/updates/updates_requisition_metadata_model_mixin.py

@@ -50,7 +50,7 @@ class UpdatesRequisitionMetadataModelMixin(UpdatesMetadataModelMixin):
         return options
 
     @property
-    def metadata_default_entry_status(self: RequisitionModel) -> str:
+    def metadata_default_entry_status(self: RequisitionModel) -> str | None:
         """Returns a string that represents the configured
         entry status of the requisition in the visit schedule.
         """
@@ -64,7 +64,10 @@ class UpdatesRequisitionMetadataModelMixin(UpdatesMetadataModelMixin):
             requisitions = (
                 self.metadata_visit_object.requisitions.forms + requisitions_prn.forms
             )
-        requisition = [r for r in requisitions if r.panel.name == self.panel.name][0]
+        try:
+            requisition = next(r for r in requisitions if r.panel.name == self.panel.name)
+        except StopIteration:
+            return None
         return REQUIRED if requisition.required else NOT_REQUIRED
 
     @property

edc_metadata/models/crf_metadata.py

@@ -29,7 +29,7 @@ class CrfMetadata(CrfMetadataModelMixin, BaseUuidModel):
         )
 
     # noinspection PyTypeHints
-    natural_key.dependencies = ["sites.Site"]  # type: ignore
+    natural_key.dependencies = ("sites.Site",)
 
     @property
     def verbose_name(self) -> str:
@@ -42,8 +42,8 @@ class CrfMetadata(CrfMetadataModelMixin, BaseUuidModel):
     class Meta(CrfMetadataModelMixin.Meta, BaseUuidModel.Meta):
         verbose_name = "Crf collection status"
         verbose_name_plural = "Crf collection status"
-        unique_together = []
-        constraints = [
+        unique_together = ()
+        constraints = (
             UniqueConstraint(
                 fields=[
                     "subject_identifier",
@@ -54,8 +54,8 @@ class CrfMetadata(CrfMetadataModelMixin, BaseUuidModel):
                     "model",
                 ],
                 name="%(app_label)s_%(class)s_subject_iden_visit_uniq",
-            )
-        ]
+            ),
+        )
         indexes = (
             *CrfMetadataModelMixin.Meta.indexes,
             *BaseUuidModel.Meta.indexes,

edc_metadata/models/crf_metadata_model_mixin.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 from typing import TYPE_CHECKING, Any
 
 from django.apps import apps as django_apps
@@ -38,7 +39,7 @@ class CrfMetadataModelMixin(
 
     model = models.CharField(max_length=50)
 
-    document_name = models.CharField(verbose_name=_("Document"), max_length=250, null=True)
+    document_name = models.CharField(verbose_name=_("Document"), max_length=250, default="")
 
     show_order = models.IntegerField()  # must always be provided!
 
@@ -54,7 +55,7 @@ class CrfMetadataModelMixin(
 
     fill_datetime = models.DateTimeField(null=True, blank=True)
 
-    document_user = models.CharField(verbose_name=_("User"), max_length=50, null=True)
+    document_user = models.CharField(verbose_name=_("User"), max_length=50, default="")
 
     def natural_key(self):
         return (
@@ -92,10 +93,8 @@ class CrfMetadataModelMixin(
     def model_instance(self: Any) -> Any:
         """Returns the CRF/Requisition model instance or None"""
         instance = None
-        try:
+        with contextlib.suppress(ObjectDoesNotExist):
             instance = self.model_cls.objects.get(**self.model_instance_query_opts())
-        except ObjectDoesNotExist:
-            pass
         return instance
 
     def refresh_entry_status(self) -> str:

edc_metadata/models/requisition_metadata.py

@@ -10,7 +10,7 @@ from .crf_metadata_model_mixin import CrfMetadataModelMixin
 
 
 class RequisitionMetadata(CrfMetadataModelMixin, BaseUuidModel):
-    panel_name = models.CharField(max_length=50, null=True)
+    panel_name = models.CharField(max_length=50, default="")
 
     objects = RequisitionMetadataManager()
 
@@ -26,7 +26,7 @@ class RequisitionMetadata(CrfMetadataModelMixin, BaseUuidModel):
 
     @property
     def verbose_name(self) -> str:
-        from edc_lab.site_labs import site_labs
+        from edc_lab.site_labs import site_labs  # noqa: PLC0415
 
         return site_labs.panel_names.get(self.panel_name) or self.panel_name
 
@@ -42,7 +42,7 @@ class RequisitionMetadata(CrfMetadataModelMixin, BaseUuidModel):
         )
 
     # noinspection PyTypeHints
-    natural_key.dependencies = ["sites.Site"]  # type: ignore
+    natural_key.dependencies = ("sites.Site",)  # type: ignore
 
     def model_instance_query_opts(self) -> dict:
         opts = super().model_instance_query_opts()
@@ -71,7 +71,7 @@ class RequisitionMetadata(CrfMetadataModelMixin, BaseUuidModel):
         app_label = "edc_metadata"
         verbose_name = "Requisition collection status"
         verbose_name_plural = "Requisition collection status"
-        constraints = [
+        constraints = (
             UniqueConstraint(
                 fields=[
                     "subject_identifier",
@@ -83,8 +83,8 @@ class RequisitionMetadata(CrfMetadataModelMixin, BaseUuidModel):
                     "panel_name",
                 ],
                 name="%(app_label)s_%(class)s_subject_iden_visit_uniq",
-            )
-        ]
+            ),
+        )
         indexes = (
             *CrfMetadataModelMixin.Meta.indexes,
             *BaseUuidModel.Meta.indexes,

edc_metadata/models/signals.py

@@ -94,14 +94,13 @@ def metadata_reset_on_post_delete(sender, instance, using, **kwargs) -> None:
 def metadata_update_previous_timepoints_for_singleton_on_post_save(
     sender, instance, raw, created, using, **kwargs
 ):
-    if not raw and not kwargs.get("update_fields"):
-        if isinstance(instance, (SingletonCrfModelMixin,)):
-            appointment = (
-                instance.related_visit.appointment.relative_previous_with_related_visit
-            )
-            while appointment:
-                if appointment.related_visit:
-                    refresh_metadata_for_timepoint(
-                        appointment.related_visit, allow_create=False
-                    )
-                appointment = appointment.relative_previous_with_related_visit
+    if (
+        not raw
+        and not kwargs.get("update_fields")
+        and isinstance(instance, (SingletonCrfModelMixin,))
+    ):
+        appointment = instance.related_visit.appointment.relative_previous_with_related_visit
+        while appointment:
+            if appointment.related_visit:
+                refresh_metadata_for_timepoint(appointment.related_visit, allow_create=False)
+            appointment = appointment.relative_previous_with_related_visit

edc_metadata/views/refresh_metadata_actions_view.py

@@ -3,11 +3,11 @@ from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.messages import SUCCESS
 from django.http.response import HttpResponseRedirect
 from django.urls import reverse
+from django.utils import timezone
 from django.views import View
 
 from edc_appointment.utils import update_appt_status_for_timepoint
 from edc_dashboard.url_names import url_names
-from edc_utils import get_utcnow
 from edc_utils.round_up import round_half_away_from_zero
 from edc_visit_tracking.utils import get_related_visit_model_cls
 
@@ -34,7 +34,7 @@ class RefreshMetadataActionsView(LoginRequiredMixin, View):
         return related_visit
 
     def get(self, request, *args, **kwargs):
-        dte1 = get_utcnow()
+        dte1 = timezone.now()
         related_visit = self.refresh_metadata_for_timepoint(**kwargs)
         url_name = url_names.get("subject_dashboard_url")
         args = (
@@ -47,7 +47,7 @@ class RefreshMetadataActionsView(LoginRequiredMixin, View):
             SUCCESS,
             f"The data collection schedule for {related_visit.visit_code}."
             f"{related_visit.visit_code_sequence} has been refreshed "
-            f"({round_half_away_from_zero((get_utcnow()-dte1).microseconds/1000000, 2)} "
+            f"({round_half_away_from_zero((timezone.now() - dte1).microseconds / 1000000, 2)} "
             "seconds)",
         )
         return HttpResponseRedirect(url)

edc_model/models/address_mixin.py

@@ -2,7 +2,7 @@ from django.db import models
 
 
 class AddressMixin(models.Model):
-    contact_name = models.CharField(max_length=50, null=True, blank=True)
+    contact_name = models.CharField(max_length=50, default="", blank=True)
 
     address = models.CharField(verbose_name="Address", max_length=50)
 
@@ -11,18 +11,18 @@ class AddressMixin(models.Model):
     city = models.CharField(max_length=50)
 
     state = models.CharField(
-        verbose_name="State or Province", null=True, blank=True, max_length=50
+        verbose_name="State or Province", default="", blank=True, max_length=50
     )
 
     country = models.CharField(max_length=50)
 
-    telephone = models.CharField(null=True, blank=True, max_length=50)
+    telephone = models.CharField(default="", blank=True, max_length=50)
 
-    mobile = models.CharField(null=True, blank=True, max_length=50)
+    mobile = models.CharField(default="", blank=True, max_length=50)
 
-    fax = models.CharField(null=True, blank=True, max_length=50)
+    fax = models.CharField(default="", blank=True, max_length=50)
 
-    email = models.EmailField(null=True, blank=True, max_length=50)
+    email = models.EmailField(default="", blank=True, max_length=50)
 
     class Meta:
         abstract = True

edc_model/models/fields/initials_field.py

@@ -12,6 +12,7 @@ class InitialsField(CharField):
         kwargs.setdefault("editable", True)
         kwargs.setdefault("verbose_name", _("Initials"))
         kwargs.setdefault("max_length", 3)
+        kwargs.setdefault("default", "")
         kwargs.setdefault("help_text", _("Type 2-3 letters, all in uppercase and no spaces"))
         CharField.__init__(self, *args, **kwargs)
 
@@ -31,4 +32,4 @@ class InitialsField(CharField):
             },
         }
         defaults.update(kwargs)
-        return super(InitialsField, self).formfield(**defaults)
+        return super().formfield(**defaults)

edc_model/models/historical_records.py

@@ -16,10 +16,7 @@ class SerializableModel(models.Model):
         return (self.history_id,)
 
     def related_visit_model_attr(self):
-        try:
-            return self.history_object.related_visit_model_attr()
-        except AttributeError:
-            raise
+        return self.history_object.related_visit_model_attr()
 
     @property
     def related_visit(self):
@@ -61,10 +58,6 @@ class HistoricalRecords(SimpleHistoricalRecords):
         super().__init__(**kwargs)
 
     def contribute_to_class(self, cls, name):
-        try:
-            cls.related_visit_model_attr
-        except AttributeError:
-            pass
-        else:
+        if getattr(cls, "related_visit_model_attr", None):
             self.model_cls = SerializableCrfModel
         return super().contribute_to_class(cls, name)

edc_model/models/url_model_mixin.py

@@ -5,7 +5,7 @@ from django.urls import reverse
 from django.urls.exceptions import NoReverseMatch
 
 
-class UrlModelMixinNoReverseMatch(Exception):
+class UrlModelMixinNoReverseMatch(Exception):  # noqa: N818
     pass
 
 
@@ -23,7 +23,7 @@ class UrlModelMixin(models.Model):
                 f"Tried {self.admin_url_name}. Got {e}. "
                 "Check urls and confirm app is in INSTALLED_APPS. If running tests, "
                 "you may need to set `use_test_urls=True`."
-            )
+            ) from e
         return absolute_url
 
     def get_changelist_url(self, search_term=None) -> str:

edc_model/validators/date.py

@@ -1,37 +1,36 @@
 from datetime import date, datetime, timedelta
 
 from django.core.exceptions import ValidationError
-
-from edc_utils import get_utcnow
+from django.utils import timezone
 
 
 def datetime_not_future(utc_datetime: datetime) -> None:
     time_error = timedelta(minutes=10)
-    if utc_datetime > get_utcnow() + time_error:
+    if utc_datetime > timezone.now() + time_error:
         raise ValidationError("Cannot be a future date/time")
 
 
 def date_not_future(value: date) -> None:
-    if value > get_utcnow().date():
+    if value > timezone.now().date():
         raise ValidationError("Cannot be a future date")
 
 
 def date_is_past(value: date) -> None:
-    if value > get_utcnow().date():
+    if value > timezone.now().date():
         raise ValidationError("Expected a past date")
 
 
 def date_is_not_now(value: date) -> None:
-    if value == get_utcnow().date():
+    if value == timezone.now().date():
         raise ValidationError("Cannot be today")
 
 
 def datetime_is_future(utc_datetime: datetime) -> None:
     time_error = timedelta(minutes=10)
-    if utc_datetime < get_utcnow() + time_error:
+    if utc_datetime < timezone.now() + time_error:
         raise ValidationError("Expected a future date/time")
 
 
 def date_is_future(value: date) -> None:
-    if value < get_utcnow().date():
+    if value < timezone.now().date():
         raise ValidationError("Expected a future date")

edc_model_admin/list_filters/future_date_list_filter.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from dateutil.relativedelta import MO, relativedelta
 from django.contrib.admin import SimpleListFilter
 from django.db.models import QuerySet
+from django.utils import timezone
 from django.utils.translation import gettext as _
 
 from edc_constants.constants import (
@@ -16,7 +17,6 @@ from edc_constants.constants import (
     TODAY,
     TOMORROW,
 )
-from edc_utils import get_utcnow
 
 
 class FutureDateListFilter(SimpleListFilter):
@@ -42,9 +42,9 @@ class FutureDateListFilter(SimpleListFilter):
         return {}
 
     def queryset(self, request, queryset) -> QuerySet | None:
-        morning = get_utcnow().replace(second=0, hour=0, minute=0)
+        morning = timezone.now().replace(second=0, hour=0, minute=0)
         monday = morning + relativedelta(weekday=MO(-1))
-        night = get_utcnow().replace(second=59, hour=23, minute=59)
+        night = timezone.now().replace(second=59, hour=23, minute=59)
         qs = None
         if self.value() == NEXT_WEEK:
             qs = queryset.filter(

edc_model_admin/list_filters/past_date_list_filter.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from dateutil.relativedelta import MO, relativedelta
 from django.contrib.admin import SimpleListFilter
 from django.db.models import QuerySet
+from django.utils import timezone
 from django.utils.translation import gettext as _
 
 from edc_constants.constants import (
@@ -17,7 +18,6 @@ from edc_constants.constants import (
     TODAY,
     YESTERDAY,
 )
-from edc_utils import get_utcnow
 
 
 class PastDateListFilter(SimpleListFilter):
@@ -45,9 +45,9 @@ class PastDateListFilter(SimpleListFilter):
         return {}
 
     def queryset(self, request, queryset) -> QuerySet | None:
-        morning = get_utcnow().replace(second=0, hour=0, minute=0)
+        morning = timezone.now().replace(second=0, hour=0, minute=0)
         monday = morning + relativedelta(weekday=MO(-1))
-        night = get_utcnow().replace(second=59, hour=23, minute=59)
+        night = timezone.now().replace(second=59, hour=23, minute=59)
         qs = None
         if self.value() == THIS_WEEK:
             qs = queryset.filter(

edc_model_admin/mixins/model_admin_protect_pii_mixin.py

@@ -21,16 +21,15 @@ class ModelAdminProtectPiiMixin:
     the changelist, add the method name to `extra_pii_attrs`.
     """
 
-    extra_pii_attrs: list[str] | None = []
+    extra_pii_attrs: tuple[str] | None = ()
 
     def get_extra_pii_attrs(self) -> list[str | tuple[str, str]]:
         return self.extra_pii_attrs or []
 
-    def get_encrypted_fields(self) -> list[str]:
+    def get_encrypted_fields(self) -> tuple[str, ...]:
         encrypted_fields = [f.name for f in get_encrypted_fields(self.model)]
-        encrypted_fields.extend(self.get_extra_pii_attrs())
-        encrypted_fields = list(set(encrypted_fields))
-        return encrypted_fields
+        encrypted_fields.extend(*self.get_extra_pii_attrs())
+        return tuple(set(encrypted_fields))
 
     def get_list_display(self, request) -> tuple[str]:
         list_display = super().get_list_display(request)

edc_model_fields/fields/other_charfield.py

@@ -12,7 +12,7 @@ class OtherCharField(CharField):
     def __init__(self, metadata=None, *args, **kwargs):
         self.metadata = metadata
         kwargs.update(blank=True)
-        kwargs.update(null=True)
+        kwargs.update(default="")
         kwargs.setdefault("max_length", self.DEFAULT_MAX_LENGTH)
         kwargs.setdefault("verbose_name", _("If other, please specify ..."))
         self.max_length = kwargs["max_length"]
@@ -25,7 +25,7 @@ class OtherCharField(CharField):
     def deconstruct(self):
         name, path, args, kwargs = super().deconstruct()
         kwargs.update(blank=True)
-        kwargs.update(null=True)
+        kwargs.update(default="")
         kwargs.update(max_length=self.max_length)
         kwargs.update(verbose_name=self.verbose_name)
         if self.metadata is not None: