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

edc_lab_results/model_mixins/fbg_model_mixin.py

@@ -37,13 +37,13 @@ class FbgModelMixin(
         verbose_name="Was a point-of-care test used?",
         max_length=15,
         choices=YES_NO,
-        null=True,
+        default="",
     )
     fasting = models.CharField(
         verbose_name="Was this fasting or non-fasting?",
         max_length=25,
         choices=FASTING_CHOICES,
-        null=True,
+        default="",
         blank=False,
     )
 
@@ -55,7 +55,7 @@ class FbgModelMixin(
 
     def get_summary_options(self) -> dict:
         opts = super().get_summary_options()
-        fasting = True if self.fasting == FASTING else False
+        fasting = self.fasting == FASTING
         opts.update(fasting=fasting)
         return opts
 

edc_lab_results/model_mixins/glucose_model_mixin.py

@@ -34,13 +34,13 @@ class GlucoseModelMixin(
         verbose_name="Was a point-of-care test used?",
         max_length=15,
         choices=YES_NO,
-        null=True,
+        default="",
     )
     fasting = models.CharField(
         verbose_name="Was this fasting or non-fasting?",
         max_length=25,
         choices=FASTING_CHOICES,
-        null=True,
+        default="",
         blank=False,
     )
 
@@ -52,7 +52,7 @@ class GlucoseModelMixin(
 
     def get_summary_options(self: Any) -> dict:
         opts = super().get_summary_options()
-        fasting = True if self.fasting == FASTING else False
+        fasting = self.fasting == FASTING
         opts.update(fasting=fasting)
         return opts
 

edc_lab_results/model_mixins/hba1c_model_mixin.py

@@ -10,18 +10,18 @@ class Hba1cModelMixin(BaseHba1cModelMixin, models.Model):
         verbose_name="Was a point-of-care test used?",
         max_length=15,
         choices=YES_NO,
-        null=True,
+        default="",
     )
 
     hba1c_abnormal = models.CharField(
-        verbose_name="abnormal", choices=YES_NO, max_length=25, null=True, blank=True
+        verbose_name="abnormal", choices=YES_NO, max_length=25, default="", blank=True
     )
 
     hba1c_reportable = models.CharField(
         verbose_name="reportable",
         choices=REPORTABLE,
         max_length=25,
-        null=True,
+        default="",
         blank=True,
     )
 

edc_label/migrations/0001_initial.py

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

edc_label/migrations/0007_alter_zpllabeltemplates_device_created_and_more.py

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

edc_list_data/list_model_maker.py

@@ -33,7 +33,7 @@ class ListModelMaker:
         try:
             self.name, self.display_name = row
         except ValueError as e:
-            raise ListModelMakerError(e)
+            raise ListModelMakerError(e) from e
         except TypeError as e:
             if "Row" not in str(e):
                 raise
@@ -46,7 +46,7 @@ class ListModelMaker:
         opts = dict(
             display_index=self.display_index,
             display_name=self.display_name,
-            extra_value=self.extra_value,
+            extra_value=self.extra_value or "",
         )
         if "custom_name" in [f.name for f in self.model_cls._meta.get_fields()]:
             opts.update(custom_name=self.custom_name)

edc_list_data/load_list_data.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import contextlib
+
 from django.apps import AppConfig
 
 from .list_model_maker import ListModelMaker, ListModelMakerError
@@ -10,7 +12,7 @@ class LoadListDataError(Exception):
 
 
 def load_list_data(
-    list_data: dict = None, model_name: str | None = None, apps: AppConfig | None = None
+    list_data: dict | None = None, model_name: str | None = None, apps: AppConfig | None = None
 ) -> int:
     """Loads data into a list model.
 
@@ -24,25 +26,20 @@ def load_list_data(
          (name2, display_name),...],
         ...}
     """
-    if model_name:
-        model_names = [model_name]
-    else:
-        model_names = [k for k in list_data]
+    model_names = [model_name] if model_name else [k for k in list_data]
     n = 0
-    for model_name in model_names:
+    for _model_name in model_names:
         try:
-            data = list_data.get(model_name)()
+            data = list_data.get(_model_name)()
         except TypeError:
-            data = list_data.get(model_name)
+            data = list_data.get(_model_name)
         try:
             for display_index, row in enumerate(data):
-                try:
-                    row = row()
-                except TypeError:
-                    pass
-                maker = ListModelMaker(display_index, row, model_name, apps=apps)
+                with contextlib.suppress(TypeError):
+                    row = row()  # noqa: PLW2901
+                maker = ListModelMaker(display_index, row, _model_name, apps=apps)
                 maker.create_or_update()
         except ListModelMakerError as e:
-            raise LoadListDataError(f"{e} See {list_data.get(model_name)}.")
+            raise LoadListDataError(f"{e} See {list_data.get(_model_name)}.") from e
         n += 1
     return n

edc_list_data/model_mixins.py

@@ -18,7 +18,11 @@ class BaseListModelMixin(models.Model):
         help_text="This is the stored value, required",
     )
 
-    plural_name = models.CharField(verbose_name="Plural name", max_length=250, null=True)
+    plural_name = models.CharField(
+        verbose_name="Plural name",
+        max_length=250,
+        default="",
+    )
 
     display_name = models.CharField(
         verbose_name="Name",
@@ -34,10 +38,14 @@ class BaseListModelMixin(models.Model):
     )
 
     field_name = models.CharField(
-        max_length=25, editable=False, null=True, blank=True, help_text="Not required"
+        max_length=25,
+        editable=False,
+        default="",
+        blank=True,
+        help_text="Not required",
     )
 
-    extra_value = models.CharField(max_length=250, null=True)
+    extra_value = models.CharField(max_length=250, default="")
 
     version = models.CharField(max_length=35, editable=False, default="1.0")
 
@@ -85,7 +93,7 @@ class ListModelMixin2(BaseListModelMixin):
 
     custom_name = models.CharField(
         max_length=25,
-        null=True,
+        default="",
         blank=True,
         help_text="A custom name/value to use on export instead of or in addition to `name`",
     )

edc_list_data/preload_data.py

@@ -11,9 +11,9 @@ style = color_style()
 class PreloadData:
     def __init__(
         self,
-        list_data: dict[str, list[tuple[str | int, str]]] = None,
-        model_data: dict = None,
-        list_data_model_name: str = None,
+        list_data: dict[str, list[tuple[str | int, str]]] | None = None,
+        model_data: dict | None = None,
+        list_data_model_name: str | None = None,
         apps: AppConfig = None,
     ) -> None:
         self.list_data = list_data

edc_listboard/migrations/0001_initial.py

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

edc_listboard/migrations/0007_alter_listboard_device_created_and_more.py

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

edc_locator/migrations/0001_initial.py

@@ -14,7 +14,7 @@ from django.db import migrations, models
 import edc_model.validators.phone
 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):
@@ -31,11 +31,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",
@@ -293,7 +293,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "report_datetime",
-                    models.DateTimeField(default=edc_utils.date.get_utcnow),
+                    models.DateTimeField(default=django.utils.timezone.now),
                 ),
                 ("history_date", models.DateTimeField()),
                 ("history_change_reason", models.CharField(max_length=100, null=True)),
@@ -342,11 +342,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",
@@ -605,7 +605,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "report_datetime",
-                    models.DateTimeField(default=edc_utils.date.get_utcnow),
+                    models.DateTimeField(default=django.utils.timezone.now),
                 ),
                 (
                     "site",

edc_locator/migrations/0018_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="historicalsubjectlocator",
             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="historicalsubjectlocator",
@@ -29,9 +28,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="historicalsubjectlocator",
             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="historicalsubjectlocator",
@@ -56,9 +53,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="subjectlocator",
             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="subjectlocator",
@@ -72,9 +67,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="subjectlocator",
             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="subjectlocator",

edc_locator/migrations/0040_alter_historicalsubjectlocator_action_identifier_and_more.py

@@ -0,0 +1,187 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_locator", "0039_alter_historicalsubjectlocator_revision_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalsubjectlocator",
+            name="action_identifier",
+            field=models.CharField(
+                blank=True, db_index=True, default="", max_length=50
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectlocator",
+            name="action_item_reason",
+            field=models.TextField(default="", editable=False),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectlocator",
+            name="consent_model",
+            field=models.CharField(blank=True, default="", max_length=50),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectlocator",
+            name="consent_version",
+            field=models.CharField(blank=True, default="", max_length=10),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectlocator",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectlocator",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectlocator",
+            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="historicalsubjectlocator",
+            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="historicalsubjectlocator",
+            name="may_sms",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                default="",
+                max_length=25,
+                verbose_name="Has the participant given permission <b>to be contacted by SMS</b> by study staff for follow-up purposes during the study?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectlocator",
+            name="parent_action_identifier",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="action identifier that links to parent reference model instance.",
+                max_length=30,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectlocator",
+            name="related_action_identifier",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="action identifier that links to related reference model instance.",
+                max_length=30,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectlocator",
+            name="action_identifier",
+            field=models.CharField(blank=True, default="", max_length=50, unique=True),
+        ),
+        migrations.AlterField(
+            model_name="subjectlocator",
+            name="action_item_reason",
+            field=models.TextField(default="", editable=False),
+        ),
+        migrations.AlterField(
+            model_name="subjectlocator",
+            name="consent_model",
+            field=models.CharField(blank=True, default="", max_length=50),
+        ),
+        migrations.AlterField(
+            model_name="subjectlocator",
+            name="consent_version",
+            field=models.CharField(blank=True, default="", max_length=10),
+        ),
+        migrations.AlterField(
+            model_name="subjectlocator",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectlocator",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectlocator",
+            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="subjectlocator",
+            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="subjectlocator",
+            name="may_sms",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                default="",
+                max_length=25,
+                verbose_name="Has the participant given permission <b>to be contacted by SMS</b> by study staff for follow-up purposes during the study?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectlocator",
+            name="parent_action_identifier",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="action identifier that links to parent reference model instance.",
+                max_length=30,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectlocator",
+            name="related_action_identifier",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="action identifier that links to related reference model instance.",
+                max_length=30,
+            ),
+        ),
+    ]

edc_locator/migrations/0041_alter_historicalsubjectlocator_report_datetime_and_more.py

@@ -0,0 +1,27 @@
+# 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_locator",
+            "0040_alter_historicalsubjectlocator_action_identifier_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalsubjectlocator",
+            name="report_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="subjectlocator",
+            name="report_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+    ]