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

edc_lab/migrations/0037_alter_historicalorder_order_datetime_and_more.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.2.6 on 2025-09-18 00:24
+
+import django.utils.timezone
+import edc_model.validators.date
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_lab", "0036_alter_aliquot_comment_alter_aliquot_device_created_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalorder",
+            name="order_datetime",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now,
+                validators=[edc_model.validators.date.datetime_not_future],
+            ),
+        ),
+        migrations.AlterField(
+            model_name="order",
+            name="order_datetime",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now,
+                validators=[edc_model.validators.date.datetime_not_future],
+            ),
+        ),
+    ]

edc_lab/model_mixins/aliquot/aliquot_identifier_model_mixin.py

@@ -11,9 +11,9 @@ class AliquotIdentifierModelMixin(models.Model):
 
     identifier_prefix = models.CharField(max_length=50, editable=False)
 
-    subject_identifier = models.CharField(max_length=50, null=True, editable=False)
+    subject_identifier = models.CharField(max_length=50, default="", editable=False)
 
-    requisition_identifier = models.CharField(max_length=50, null=True, editable=False)
+    requisition_identifier = models.CharField(max_length=50, default="", editable=False)
 
     class Meta:
         abstract = True

edc_lab/model_mixins/aliquot/aliquot_model_mixin.py

@@ -46,7 +46,7 @@ class AliquotModelMixin(SiteModelMixin, models.Model):
 
     condition = models.CharField(max_length=25, choices=ALIQUOT_CONDITIONS, default="10")
 
-    comment = models.CharField(max_length=50, null=True, blank=True)
+    comment = models.CharField(max_length=50, blank=True, default="")
 
     def __str__(self: Any):
         return self.aliquot_identifier
@@ -54,7 +54,7 @@ class AliquotModelMixin(SiteModelMixin, models.Model):
     def natural_key(self: Any):
         return (self.aliquot_identifier,)
 
-    natural_key.dependencies = ["sites.Site"]
+    natural_key.dependencies = ("sites.Site",)
 
     class Meta:
         abstract = True

edc_lab/model_mixins/panel_model_mixin.py

@@ -3,6 +3,17 @@ from django.db.models.deletion import PROTECT
 
 from ..site_labs import site_labs
 
+UNDEFINED_PANEL_OR_GROUP_NAME = (
+    "Undefined `panel` name or `panel group` name. "
+    "Got {panel_name}. See LabProfile and model Panel. Got {err}"
+)
+UNDEFINED_LAP_PROFILE_NAME = (
+    "Undefined lab profile name detected from panel {panel}. "
+    "Expected one of {lab_profiles}. "
+    "Got '{lab_profile_name}'. "
+    "See stored values in panel model."
+)
+
 
 class PanelModelError(Exception):
     pass
@@ -32,9 +43,8 @@ class PanelModelMixin(models.Model):
                 panel_object = self.lab_profile_object.panels[panel_name]
             except KeyError as e:
                 raise PanelModelError(
-                    "Undefined `panel` name or `panel group` name. "
-                    f"Got {panel_name}. See LabProfile and model Panel. Got {e}"
-                )
+                    UNDEFINED_PANEL_OR_GROUP_NAME.format(panel_name=panel_name, err=str(e))
+                ) from e
         return panel_object
 
     @property
@@ -42,10 +52,11 @@ class PanelModelMixin(models.Model):
         lab_profile_object = site_labs.get(self.panel.lab_profile_name)
         if not lab_profile_object:
             raise LabProfileError(
-                f"Undefined lab profile name detected from panel {self.panel}. "
-                f"Expected one of {site_labs.lab_profiles}. "
-                f"Got '{self.panel.lab_profile_name}'. "
-                "See stored values in panel model."
+                UNDEFINED_LAP_PROFILE_NAME.format(
+                    panel_name=self.panel,
+                    lab_profiles=site_labs.lab_profiles,
+                    lab_profile_name=self.panel.lab_profile_name,
+                )
             )
         return lab_profile_object
 

edc_lab/model_mixins/requisition/crf_with_requisition_model_mixin.py

@@ -23,16 +23,14 @@ class CrfWithRequisitionModelMixin(models.Model):
     For example:
         from edc_lab.model_mixins import (
             CrfWithRequisitionModelMixin,
-            requisition_fk_options,
-            )
+            requisition_fk_options)
 
         class MyRequisition(CrfWithRequisitionModelMixin, etc):
             ...
             lab_panel = fbc_panel
             requisition = models.ForeignKey(
                 limit_choices_to={"panel__name": fbc_panel.name},
-                **requisition_fk_options,
-            )
+                **requisition_fk_options)
             ...
     """
 

edc_lab/model_mixins/requisition/requisition_model_mixin.py

@@ -72,12 +72,12 @@ class RequisitionModelMixin(
 
     reason_not_drawn_other = OtherCharField()
 
-    protocol_number = models.CharField(max_length=10, null=True, editable=False)
+    protocol_number = models.CharField(max_length=10, default="", editable=False)
 
-    clinician_initials = InitialsField(null=True, blank=True)
+    clinician_initials = InitialsField(default="", blank=True)
 
     specimen_type = models.CharField(
-        verbose_name="Specimen type", max_length=25, null=True, blank=True
+        verbose_name="Specimen type", max_length=25, default="", blank=True
     )
 
     item_type = models.CharField(
@@ -132,7 +132,7 @@ class RequisitionModelMixin(
     def natural_key(self):
         return (self.requisition_identifier,)
 
-    natural_key.dependencies = [settings.SUBJECT_VISIT_MODEL, "sites.Site"]
+    natural_key.dependencies = (settings.SUBJECT_VISIT_MODEL, "sites.Site")
 
     def get_search_slug_fields(self):
         fields = super().get_search_slug_fields()
@@ -148,13 +148,12 @@ class RequisitionModelMixin(
 
     class Meta(NonUniqueSubjectIdentifierFieldMixin.Meta):
         abstract = True
-        constraints = [
+        constraints = (
             UniqueConstraint(
                 fields=["panel", "subject_visit"],
                 name="%(app_label)s_%(class)s_panel_uniq",
-            )
-        ]
-
+            ),
+        )
         indexes = (
             *NonUniqueSubjectIdentifierFieldMixin.Meta.indexes,
             models.Index(fields=["subject_visit", "site", "panel"]),

edc_lab/model_mixins/requisition/requisition_verify_model_mixin.py

@@ -4,7 +4,7 @@ from edc_constants.choices import YES_NO
 
 
 class RequisitionVerifyModelMixin(models.Model):
-    clinic_verified = models.CharField(max_length=15, choices=YES_NO, null=True)
+    clinic_verified = models.CharField(max_length=15, choices=YES_NO, default="")
 
     clinic_verified_datetime = models.DateTimeField(null=True)
 

edc_lab/model_mixins/result/result_item_model_mixin.py

@@ -7,15 +7,15 @@ from edc_sites.model_mixins import SiteModelMixin
 class ResultItemModelMixin(SiteModelMixin, models.Model):
     report_datetime = models.DateTimeField(null=True)
 
-    utestid = models.CharField(max_length=25, null=True)
+    utestid = models.CharField(max_length=25, default="")
 
-    value = models.CharField(max_length=25, null=True)
+    value = models.CharField(max_length=25, default="")
 
-    quantifier = models.CharField(max_length=25, null=True)
+    quantifier = models.CharField(max_length=25, default="")
 
     value_datetime = models.DateTimeField(null=True)
 
-    reference = models.CharField(max_length=25, null=True)
+    reference = models.CharField(max_length=25, default="")
 
     pending_datetime = models.DateTimeField(default=timezone.now)
 

edc_lab/model_mixins/shipping/manifest_model_mixin.py

@@ -3,7 +3,6 @@ from django.utils import timezone
 
 from edc_constants.constants import CLOSED, OPEN, OTHER
 from edc_sites.model_mixins import SiteModelMixin
-from edc_utils import get_utcnow
 
 from ...constants import STORAGE, TESTING
 from ...identifiers import ManifestIdentifier
@@ -20,7 +19,7 @@ class ManifestModelMixin(SiteModelMixin, models.Model):
 
     manifest_datetime = models.DateTimeField(default=timezone.now)
 
-    export_datetime = models.DateTimeField(blank=True)
+    export_datetime = models.DateTimeField(blank=True, null=True)
 
     export_references = models.TextField(blank=True, default="")
 
@@ -34,7 +33,7 @@ class ManifestModelMixin(SiteModelMixin, models.Model):
 
     category = models.CharField(max_length=25, default=TESTING, choices=MANIFEST_CATEGORY)
 
-    category_other = models.CharField(max_length=25, null=True, blank=True)
+    category_other = models.CharField(max_length=25, default="", blank=True)
 
     comment = models.TextField(verbose_name="Comment", blank=True, default="")
 
@@ -49,7 +48,7 @@ class ManifestModelMixin(SiteModelMixin, models.Model):
             identifier = ManifestIdentifier()
             self.manifest_identifier = identifier.identifier
         if self.shipped and not self.export_datetime:
-            self.export_datetime = get_utcnow()
+            self.export_datetime = timezone.now()
         elif not self.shipped:
             self.export_datetime = None
             self.printed = False
@@ -58,7 +57,7 @@ class ManifestModelMixin(SiteModelMixin, models.Model):
     def natural_key(self):
         return (self.manifest_identifier,)
 
-    natural_key.dependencies = ["sites.Site"]
+    natural_key.dependencies = ("sites.Site",)
 
     @property
     def human_readable_identifier(self):

edc_lab/model_mixins/shipping/verify_model_mixin.py

@@ -1,7 +1,7 @@
 from django.db import models
+from django.utils import timezone
 
 from edc_constants.constants import OPEN
-from edc_utils import get_utcnow
 
 from ...constants import VERIFIED
 
@@ -27,7 +27,7 @@ class VerifyBoxModelMixin(VerifyModelMixin, models.Model):
             if self.is_verified:
                 self.verified = 1
                 self.status = VERIFIED
-                self.verified_datetime = get_utcnow()
+                self.verified_datetime = timezone.now()
             else:
                 self.verified = 0
                 self.verified_datetime = None
@@ -41,12 +41,10 @@ class VerifyBoxModelMixin(VerifyModelMixin, models.Model):
 
     @property
     def is_verified(self):
-        if (
+        return not (
             self.boxitem_set.all().count() == 0
             or self.boxitem_set.filter(verified=False).exists()
-        ):
-            return False
-        return True
+        )
 
     class Meta:
         abstract = True

edc_lab/models/box.py

@@ -39,7 +39,7 @@ class BoxManager(SearchSlugManager, models.Manager):
 
 
 class Box(SearchSlugModelMixin, VerifyBoxModelMixin, SiteModelMixin, BaseUuidModel):
-    search_slug_fields = ["box_identifier", "human_readable_identifier", "name"]
+    search_slug_fields = ("box_identifier", "human_readable_identifier", "name")
 
     box_identifier = models.CharField(max_length=25, editable=False, unique=True)
 

edc_lab/models/box_item.py

@@ -28,16 +28,16 @@ class BoxItem(SearchSlugModelMixin, VerifyModelMixin, BaseUuidModel):
 
     identifier = models.CharField(max_length=25)
 
-    comment = models.CharField(max_length=25, null=True, blank=True)
+    comment = models.CharField(max_length=25, default="", blank=True)
 
     objects = BoxItemManager()
 
     history = HistoricalRecords()
 
     def natural_key(self):
-        return (self.position, self.identifier) + self.box.natural_key()
+        return self.position, self.identifier, *self.box.natural_key()
 
-    natural_key.dependencies = ["edc_lab.box", "edc_lab.boxtype", "sites.Site"]
+    natural_key.dependencies = ("edc_lab.box", "edc_lab.boxtype", "sites.Site")
 
     @property
     def human_readable_identifier(self):
@@ -49,12 +49,11 @@ class BoxItem(SearchSlugModelMixin, VerifyModelMixin, BaseUuidModel):
         return self.identifier
 
     def get_slugs(self):
-        slugs = [self.identifier, self.human_readable_identifier]
-        return slugs
+        return self.identifier, self.human_readable_identifier
 
     class Meta(BaseUuidModel.Meta):
         verbose_name = "Box Item"
-        constraints = [
+        constraints = (
             UniqueConstraint(
                 fields=["box", "position"], name="%(app_label)s_%(class)s_box_pos_uniq"
             ),
@@ -62,4 +61,4 @@ class BoxItem(SearchSlugModelMixin, VerifyModelMixin, BaseUuidModel):
                 fields=["box", "identifier"],
                 name="%(app_label)s_%(class)s_box_ide_uniq",
             ),
-        ]
+        )

edc_lab/models/manifest/manifest.py

@@ -41,7 +41,7 @@ class Manifest(ManifestModelMixin, PdfReportModelMixin, SearchSlugModelMixin, Ba
     def natural_key(self):
         return (self.manifest_identifier,)
 
-    natural_key.dependencies = ["edc_lab.shipper", "edc_lab.consignee"]
+    natural_key.dependencies = ("edc_lab.shipper", "edc_lab.consignee")
 
     def __str__(self):
         return "{} created on {} by {}".format(

edc_lab/models/manifest/manifest_item.py

@@ -23,14 +23,14 @@ class ManifestItem(SiteModelMixin, SearchSlugModelMixin, VerifyModelMixin, BaseU
 
     identifier = models.CharField(max_length=25)
 
-    comment = models.CharField(max_length=25, null=True, blank=True)
+    comment = models.CharField(max_length=25, default="", blank=True)
 
     objects = ManifestItemManager()
 
     def natural_key(self):
-        return (self.identifier,) + self.manifest.natural_key()
+        return self.identifier, *self.manifest.natural_key()
 
-    natural_key.dependencies = ["edc_lab.manifest", "sites.Site"]
+    natural_key.dependencies = ("edc_lab.manifest", "sites.Site")
 
     @property
     def human_readable_identifier(self):
@@ -39,9 +39,9 @@ class ManifestItem(SiteModelMixin, SearchSlugModelMixin, VerifyModelMixin, BaseU
 
     class Meta(BaseUuidModel.Meta):
         verbose_name = "Manifest Item"
-        constraints = [
+        constraints = (
             UniqueConstraint(
                 fields=["manifest", "identifier"],
                 name="%(app_label)s_%(class)s_manifest_uniq",
-            )
-        ]
+            ),
+        )

edc_lab/models/manifest/shipper.py

@@ -1,7 +1,6 @@
 from django.db import models
 
-from edc_model import models as edc_models
-from edc_model.models import BaseUuidModel
+from edc_model.models import AddressMixin, BaseUuidModel, HistoricalRecords
 
 
 class ShipperManager(models.Manager):
@@ -9,12 +8,12 @@ class ShipperManager(models.Manager):
         return self.get(name=name)
 
 
-class Shipper(edc_models.AddressMixin, BaseUuidModel):
+class Shipper(AddressMixin, BaseUuidModel):
     name = models.CharField(unique=True, max_length=50)
 
     objects = ShipperManager()
 
-    history = edc_models.HistoricalRecords()
+    history = HistoricalRecords()
 
     def natural_key(self):
         return (self.name,)

edc_lab/models/order.py

@@ -1,11 +1,11 @@
 from django.db import models
 from django.db.models.deletion import PROTECT
+from django.utils import timezone
 
 from edc_model.models import BaseUuidModel, HistoricalRecords
 from edc_model.validators import datetime_not_future
 from edc_sites.managers import CurrentSiteManager
 from edc_sites.model_mixins import SiteModelMixin
-from edc_utils import get_utcnow
 
 from .aliquot import Aliquot
 
@@ -25,7 +25,9 @@ class Order(SiteModelMixin, BaseUuidModel):
 
     order_identifier = models.CharField(max_length=25, editable=False, unique=True)
 
-    order_datetime = models.DateTimeField(default=get_utcnow, validators=[datetime_not_future])
+    order_datetime = models.DateTimeField(
+        default=timezone.now, validators=[datetime_not_future]
+    )
 
     panel_name = models.CharField(max_length=25)
 
@@ -36,9 +38,9 @@ class Order(SiteModelMixin, BaseUuidModel):
     history = HistoricalRecords()
 
     def natural_key(self):
-        return (self.report_datetime,) + self.aliquot.natural_key()
+        return self.report_datetime, *self.aliquot.natural_key()
 
-    natural_key.dependencies = ["edc_lab.aliquot", "sites.Site"]
+    natural_key.dependencies = ("edc_lab.aliquot", "sites.Site")
 
     class Meta(BaseUuidModel.Meta):
         verbose_name = "Order"

edc_lab/models/panel.py

@@ -24,14 +24,14 @@ class Panel(BaseUuidModel):
         return self.display_name or self.name
 
     def natural_key(self):
-        return (self.name, self.lab_profile_name)
+        return self.name, self.lab_profile_name
 
     class Meta(BaseUuidModel.Meta):
         verbose_name = "Panel"
         verbose_name_plural = "Panels"
-        constraints = [
+        constraints = (
             UniqueConstraint(
                 fields=["name", "lab_profile_name"],
                 name="%(app_label)s_%(class)s_name_uniq",
-            )
-        ]
+            ),
+        )

edc_lab/models/result.py

@@ -27,9 +27,9 @@ class Result(ResultModelMixin, BaseUuidModel):
     history = HistoricalRecords()
 
     def natural_key(self):
-        return (self.report_datetime, self.order.order_identifier)
+        return self.report_datetime, self.order.order_identifier
 
-    natural_key.dependencies = ["edc_lab.order", "edc_lab.panel", "sites.Site"]
+    natural_key.dependencies = ("edc_lab.order", "edc_lab.panel", "sites.Site")
 
     class Meta(BaseUuidModel.Meta):
         verbose_name = "Result"

edc_lab/models/result_item.py

@@ -28,9 +28,9 @@ class ResultItem(ResultItemModelMixin, BaseUuidModel):
     history = HistoricalRecords()
 
     def natural_key(self):
-        return (self.report_datetime,) + self.result.natural_key()
+        return self.report_datetime, *self.result.natural_key()
 
-    natural_key.dependencies = ["edc_lab.result", "sites.Site"]
+    natural_key.dependencies = ("edc_lab.result", "sites.Site")
 
     class Meta(BaseUuidModel.Meta):
         verbose_name = "Result Item"

edc_lab_dashboard/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_lab_dashboard/migrations/0005_alter_edcpermissions_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_lab_dashboard", "0004_alter_edcpermissions_revision"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edcpermissions",
+            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="edcpermissions",
+            name="locale_modified",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale modified",
+            ),
+        ),
+    ]

edc_lab_dashboard/views/action_views/receive_view.py

@@ -1,12 +1,12 @@
 from django.apps import apps as django_apps
 from django.contrib import messages
+from django.utils import timezone
 
 from edc_constants.constants import YES
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_lab import Specimen
 from edc_lab.labels import AliquotLabel
 from edc_lab.site_labs import site_labs
-from edc_utils import get_utcnow
 
 from ...view_mixins import ProcessRequisitionViewMixin
 from .action_view import ActionView
@@ -38,7 +38,7 @@ class ReceiveView(EdcViewMixin, ProcessRequisitionViewMixin, ActionView):
             updated += (
                 model_cls.objects.filter(pk__in=self.selected_items, is_drawn=YES)
                 .exclude(received=True)
-                .update(received=True, received_datetime=get_utcnow())
+                .update(received=True, received_datetime=timezone.now())
             )
         if updated:
             message = f"{updated} requisitions received."

edc_lab_dashboard/views/action_views/verify_box_item_view.py

@@ -1,8 +1,8 @@
 from django.contrib import messages
+from django.utils import timezone
 
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_lab import SHIPPED
-from edc_utils import get_utcnow
 
 from ...view_mixins import BoxViewMixin
 from .action_view import ActionView
@@ -48,7 +48,7 @@ class VerifyBoxItemView(EdcViewMixin, BoxViewMixin, ActionView):
                 if self.box_item:
                     if self.box_item == box_item_in_position:
                         box_item_in_position.verified = 1
-                        box_item_in_position.verified_datetime = get_utcnow()
+                        box_item_in_position.verified_datetime = timezone.now()
                         self.next_position()
                         self.redirect_querystring.pop("alert")
                     else:

edc_lab_results/model_mixins/blood_result_model_mixin.py

@@ -16,12 +16,12 @@ class BloodResultsFieldsModelMixin(models.Model):
         choices=YES_NO,
         max_length=25,
         help_text=(
-            "Abnormal results present at baseline or continuing from " "baseline not included."
+            "Abnormal results present at baseline or continuing from baseline not included."
         ),
     )
 
     results_reportable = models.CharField(
-        verbose_name=("If any results are abnormal, are results within grade 3 or above?"),
+        verbose_name="If any results are abnormal, are results within grade 3 or above?",
         max_length=25,
         choices=YES_NO_NA,
         help_text=(
@@ -30,13 +30,13 @@ class BloodResultsFieldsModelMixin(models.Model):
         ),
     )
 
-    summary = models.TextField(null=True, blank=True)
+    summary = models.TextField(default="", blank=True)
 
-    reportable_summary = models.TextField(null=True, blank=True)
+    reportable_summary = models.TextField(default="", blank=True)
 
-    abnormal_summary = models.TextField(null=True, blank=True)
+    abnormal_summary = models.TextField(default="", blank=True)
 
-    errors = models.TextField(null=True, blank=True)
+    errors = models.TextField(default="", blank=True)
 
     missing_count = models.IntegerField(
         default=0,
@@ -45,7 +45,7 @@ class BloodResultsFieldsModelMixin(models.Model):
     )
 
     missing = models.TextField(
-        null=True,
+        default="",
         editable=False,
         help_text="calculated string of field names that have been left blank",
     )