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

edc_reportable/migrations/0004_alter_referencerangecollection_grade3_and_more.py

@@ -13,10 +13,10 @@ import django_revision.revision_field
 import simple_history.models
 from django.conf import settings
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_reportable", "0003_referencerangecollection_grade1_and_more"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
@@ -51,14 +51,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,
                     ),
                 ),
                 (
@@ -245,14 +245,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/0006_alter_gradingdata_revision_and_more.py

@@ -7,15 +7,14 @@ import django.db.models.deletion
 import django_audit_fields.fields.hostname_modification_field
 import django_audit_fields.fields.userfield
 import django_audit_fields.fields.uuid_auto_field
-import django_audit_fields.utils
 import django_revision.revision_field
 import simple_history.models
 from django.conf import settings
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_reportable", "0005_historicalnormaldata_auto_created_and_more"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
@@ -110,11 +109,11 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "created",
-                    models.DateTimeField(blank=True, default=django_audit_fields.utils.utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "modified",
-                    models.DateTimeField(blank=True, default=django_audit_fields.utils.utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "user_created",
@@ -251,11 +250,11 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "created",
-                    models.DateTimeField(blank=True, default=django_audit_fields.utils.utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "modified",
-                    models.DateTimeField(blank=True, default=django_audit_fields.utils.utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "user_created",

edc_reportable/migrations/0007_alter_gradingdata_age_phrase_and_more.py

@@ -0,0 +1,509 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_reportable", "0006_alter_gradingdata_revision_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="gradingdata",
+            name="age_phrase",
+            field=models.CharField(
+                default="", help_text="calculated in save()", max_length=25
+            ),
+        ),
+        migrations.AlterField(
+            model_name="gradingdata",
+            name="age_upper_operator",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="gradingdata",
+            name="description",
+            field=models.CharField(default="", max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="gradingdata",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="gradingdata",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="gradingdata",
+            name="lln",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="gradingdata",
+            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="gradingdata",
+            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="gradingdata",
+            name="lower_operator",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="gradingdata",
+            name="phrase",
+            field=models.CharField(
+                default="",
+                help_text="calculated by the formula instance",
+                max_length=50,
+                verbose_name="Value phrase",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="gradingdata",
+            name="reference_group",
+            field=models.CharField(default="", max_length=25),
+        ),
+        migrations.AlterField(
+            model_name="gradingdata",
+            name="uln",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="gradingdata",
+            name="upper_operator",
+            field=models.CharField(default="", max_length=2),
+        ),
+        migrations.AlterField(
+            model_name="gradingexception",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="gradingexception",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="gradingexception",
+            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="gradingexception",
+            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="historicalgradingdata",
+            name="age_phrase",
+            field=models.CharField(
+                default="", help_text="calculated in save()", max_length=25
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalgradingdata",
+            name="age_upper_operator",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="historicalgradingdata",
+            name="description",
+            field=models.CharField(default="", max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="historicalgradingdata",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalgradingdata",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalgradingdata",
+            name="lln",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="historicalgradingdata",
+            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="historicalgradingdata",
+            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="historicalgradingdata",
+            name="lower_operator",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="historicalgradingdata",
+            name="phrase",
+            field=models.CharField(
+                default="",
+                help_text="calculated by the formula instance",
+                max_length=50,
+                verbose_name="Value phrase",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalgradingdata",
+            name="reference_group",
+            field=models.CharField(default="", max_length=25),
+        ),
+        migrations.AlterField(
+            model_name="historicalgradingdata",
+            name="uln",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="historicalgradingdata",
+            name="upper_operator",
+            field=models.CharField(default="", max_length=2),
+        ),
+        migrations.AlterField(
+            model_name="historicalmolecularweight",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalmolecularweight",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalmolecularweight",
+            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="historicalmolecularweight",
+            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="historicalnormaldata",
+            name="age_phrase",
+            field=models.CharField(
+                default="", help_text="calculated in save()", max_length=25
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalnormaldata",
+            name="age_upper_operator",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="historicalnormaldata",
+            name="description",
+            field=models.CharField(default="", max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="historicalnormaldata",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalnormaldata",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalnormaldata",
+            name="lln",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="historicalnormaldata",
+            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="historicalnormaldata",
+            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="historicalnormaldata",
+            name="lower_operator",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="historicalnormaldata",
+            name="phrase",
+            field=models.CharField(
+                default="",
+                help_text="calculated by the formula instance",
+                max_length=50,
+                verbose_name="Value phrase",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalnormaldata",
+            name="reference_group",
+            field=models.CharField(default="", max_length=25),
+        ),
+        migrations.AlterField(
+            model_name="historicalnormaldata",
+            name="uln",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="historicalnormaldata",
+            name="upper_operator",
+            field=models.CharField(default="", max_length=2),
+        ),
+        migrations.AlterField(
+            model_name="molecularweight",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="molecularweight",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="molecularweight",
+            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="molecularweight",
+            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="normaldata",
+            name="age_phrase",
+            field=models.CharField(
+                default="", help_text="calculated in save()", max_length=25
+            ),
+        ),
+        migrations.AlterField(
+            model_name="normaldata",
+            name="age_upper_operator",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="normaldata",
+            name="description",
+            field=models.CharField(default="", max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="normaldata",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="normaldata",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="normaldata",
+            name="lln",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="normaldata",
+            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="normaldata",
+            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="normaldata",
+            name="lower_operator",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="normaldata",
+            name="phrase",
+            field=models.CharField(
+                default="",
+                help_text="calculated by the formula instance",
+                max_length=50,
+                verbose_name="Value phrase",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="normaldata",
+            name="reference_group",
+            field=models.CharField(default="", max_length=25),
+        ),
+        migrations.AlterField(
+            model_name="normaldata",
+            name="uln",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="normaldata",
+            name="upper_operator",
+            field=models.CharField(default="", max_length=2),
+        ),
+        migrations.AlterField(
+            model_name="referencerangecollection",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="referencerangecollection",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="referencerangecollection",
+            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="referencerangecollection",
+            name="locale_modified",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale modified",
+            ),
+        ),
+    ]

edc_reportable/models/normal_data.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import re
 from datetime import date, datetime
 
@@ -10,9 +12,6 @@ from .reference_model_mixins import ReferenceModelMixin
 
 
 class NormalData(ReferenceModelMixin, BaseUuidModel):
-
-    # sites = models.ManyToManyField(Site, blank=True)
-
     auto_created = models.BooleanField(default=False)
 
     history = HistoricalRecords()
@@ -54,8 +53,8 @@ class NormalData(ReferenceModelMixin, BaseUuidModel):
 
     def get_eval_phrase(self, value) -> str:
         return (
-            f'{"" if not self.lower else self.lower}{self.lower_operator or ""}{value}'
-            f'{self.upper_operator or ""}{"" if not self.upper else self.upper}'
+            f"{'' if not self.lower else self.lower}{self.lower_operator or ''}{value}"
+            f"{self.upper_operator or ''}{'' if not self.upper else self.upper}"
         )
 
     class Meta:

edc_reportable/models/reference_model_mixins.py

@@ -12,26 +12,25 @@ from .reference_range_collection import ReferenceRangeCollection
 
 
 class ReferenceModelMixin(models.Model):
-
     reference_range_collection = models.ForeignKey(
         ReferenceRangeCollection, on_delete=models.PROTECT
     )
 
     label = models.CharField(max_length=25)
 
-    description = models.CharField(max_length=255, null=True)
+    description = models.CharField(max_length=255, default="")
 
-    reference_group = models.CharField(max_length=25, null=True)
+    reference_group = models.CharField(max_length=25, default="")
 
     lower = models.FloatField(null=True)
-    lower_operator = models.CharField(max_length=15, null=True)
+    lower_operator = models.CharField(max_length=15, default="")
     lower_inclusive = models.BooleanField(default=False)
-    lln = models.CharField(default=None, max_length=15, null=True)
+    lln = models.CharField(max_length=15, default="")
 
     upper = models.FloatField(null=True)
-    upper_operator = models.CharField(max_length=2, null=True)
+    upper_operator = models.CharField(max_length=2, default="")
     upper_inclusive = models.BooleanField(default=False)
-    uln = models.CharField(default=None, max_length=15, null=True)
+    uln = models.CharField(max_length=15, default="")
 
     gender = models.CharField(max_length=1, validators=[RegexValidator(r"[MF]{1}")])
     units = models.CharField(max_length=15)
@@ -43,19 +42,19 @@ class ReferenceModelMixin(models.Model):
     age_lower_inclusive = models.BooleanField(default=False)
 
     age_upper = models.IntegerField(null=True)
-    age_upper_operator = models.CharField(max_length=15, null=True)
+    age_upper_operator = models.CharField(max_length=15, default="")
     age_upper_inclusive = models.BooleanField(null=True)
 
     fasting = models.BooleanField(default=False)
 
     phrase = models.CharField(
         max_length=50,
-        null=True,
+        default="",
         verbose_name="Value phrase",
         help_text="calculated by the formula instance",
     )
 
-    age_phrase = models.CharField(max_length=25, null=True, help_text="calculated in save()")
+    age_phrase = models.CharField(max_length=25, default="", help_text="calculated in save()")
 
     grade = models.IntegerField(
         null=True, validators=[MinValueValidator(1), MaxValueValidator(5)]
@@ -113,7 +112,7 @@ class ReferenceModelMixin(models.Model):
         age_units = age_units or "years"
         if age_units not in ["days", "months", "years"]:
             raise ValueError(
-                f'Invalid age units. Expected one of {["days", "months", "years"]}. '
+                f"Invalid age units. Expected one of {['days', 'months', 'years']}. "
                 f"Got {age_units}"
             )
         rdelta = age(dob, report_datetime)