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

edc_pharmacy/migrations/0090_alter_allocation_allocation_datetime_and_more.py

@@ -0,0 +1,227 @@
+# 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_pharmacy", "0089_alter_allocation_allocated_by_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="allocation",
+            name="allocation_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="confirmation",
+            name="confirmed_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="confirmationatsite",
+            name="transfer_confirmation_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="confirmationatsiteitem",
+            name="transfer_confirmation_item_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="dispense",
+            name="dispense_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="dispenseitem",
+            name="dispense_item_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicalallocation",
+            name="allocation_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicalconfirmation",
+            name="confirmed_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicalconfirmationatsite",
+            name="transfer_confirmation_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicalconfirmationatsiteitem",
+            name="transfer_confirmation_item_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicaldispense",
+            name="dispense_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicaldispenseitem",
+            name="dispense_item_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicalreceive",
+            name="receive_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicalreceiveitem",
+            name="receive_item_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicalrepackrequest",
+            name="repack_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicalrx",
+            name="report_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicalrx",
+            name="rx_date",
+            field=models.DateField(
+                default=django.utils.timezone.now, verbose_name="Date RX written"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalstock",
+            name="stock_datetime",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now, help_text="date stock record created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalstockadjustment",
+            name="adjustment_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicalstockrequest",
+            name="request_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicalstockrequestitem",
+            name="request_item_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicalstocktransfer",
+            name="transfer_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicalstocktransferitem",
+            name="transfer_item_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicalstoragebin",
+            name="bin_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicalstoragebinitem",
+            name="item_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicalsupplier",
+            name="supplier_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="receive",
+            name="receive_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="receiveitem",
+            name="receive_item_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="repackrequest",
+            name="repack_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="rx",
+            name="report_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="rx",
+            name="rx_date",
+            field=models.DateField(
+                default=django.utils.timezone.now, verbose_name="Date RX written"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="stock",
+            name="stock_datetime",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now, help_text="date stock record created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="stockadjustment",
+            name="adjustment_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="stockavailability",
+            name="created",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="stockrequest",
+            name="request_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="stockrequestitem",
+            name="request_item_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="stocktransfer",
+            name="transfer_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="stocktransferitem",
+            name="transfer_item_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="storagebin",
+            name="bin_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="storagebinitem",
+            name="item_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="supplier",
+            name="supplier_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+    ]

edc_pharmacy/model_mixins/study_medication_refill_model_mixin.py

@@ -53,7 +53,7 @@ class StudyMedicationRefillModelMixin(models.Model):
 
     stock_codes = models.TextField(
         max_length=30,
-        null=True,
+        default="",
         blank=True,
         validators=[
             RegexValidator(
@@ -65,7 +65,7 @@ class StudyMedicationRefillModelMixin(models.Model):
         help_text="Enter the medication bottle barcode or barcodes. Type one code per line",
     )
 
-    special_instructions = models.TextField(null=True, blank=True)
+    special_instructions = models.TextField(blank=True, default="")
 
     class Meta:
         verbose_name = "Study Medication"

edc_pharmacy/models/medication/formulation.py

@@ -61,18 +61,17 @@ class Formulation(BaseUuidModel):
     def save(self, *args, **kwargs):
         self.description = self.get_description()
         if not self.imp:
-            self.imp_description = None
+            self.imp_description = ""
         else:
             self.imp_description = (
                 self.imp_description if self.imp_description else self.description
             )
         super().save(*args, **kwargs)
 
-    def get_description(self):
+    def get_description(self) -> str:
         return (
             f"{self.medication} {round_half_away_from_zero(self.strength, 0)}"
             f"{self.get_units_display()} "
-            # f"{self.get_formulation_type_display()} "
             f"{self.get_route_display()}"
         )
 
@@ -80,7 +79,6 @@ class Formulation(BaseUuidModel):
         return (
             f"{self.medication} {round_half_away_from_zero(self.strength, 0)}"
             f"{self.get_units_display()} "
-            # f"{self.get_formulation_type_display()} "
         )
 
     def get_description_with_assignment(self, assignment: Assignment) -> str:
@@ -103,9 +101,9 @@ class Formulation(BaseUuidModel):
     class Meta(BaseUuidModel.Meta):
         verbose_name = "Formulation"
         verbose_name_plural = "Formulations"
-        constraints = [
+        constraints = (
             UniqueConstraint(
                 fields=["medication", "strength", "units", "formulation_type"],
                 name="%(app_label)s_%(class)s_med_stren_uniq",
-            )
-        ]
+            ),
+        )

edc_pharmacy/models/medication/medication.py

@@ -37,9 +37,9 @@ class Medication(BaseUuidModel):
     class Meta(BaseUuidModel.Meta):
         verbose_name = "Medication"
         verbose_name_plural = "Medications"
-        constraints = [
+        constraints = (
             UniqueConstraint(
                 fields=["name", "display_name"],
                 name="%(app_label)s_%(class)s_name_uniq",
-            )
-        ]
+            ),
+        )

edc_pharmacy/models/model_mixins.py

@@ -2,31 +2,30 @@ from django.db import models
 
 
 class AddressModelMixin(models.Model):
+    address_one = models.CharField(max_length=255, default="", blank=True)
 
-    address_one = models.CharField(max_length=255, null=True, blank=True)
+    address_two = models.CharField(max_length=255, default="", blank=True)
 
-    address_two = models.CharField(max_length=255, null=True, blank=True)
+    city = models.CharField(max_length=255, default="", blank=True)
 
-    city = models.CharField(max_length=255, null=True, blank=True)
+    postal_code = models.CharField(max_length=255, default="", blank=True)
 
-    postal_code = models.CharField(max_length=255, null=True, blank=True)
+    state = models.CharField(max_length=255, default="", blank=True)
 
-    state = models.CharField(max_length=255, null=True, blank=True)
-
-    country = models.CharField(max_length=255, null=True, blank=True)
+    country = models.CharField(max_length=255, default="", blank=True)
 
     class Meta:
         abstract = True
 
 
 class ContactModelMixin(models.Model):
-    email = models.EmailField(null=True, blank=True)
+    email = models.EmailField(default="", blank=True)
 
-    email_alternative = models.EmailField(null=True, blank=True)
+    email_alternative = models.EmailField(default="", blank=True)
 
-    telephone = models.CharField(max_length=15, null=True, blank=True)
+    telephone = models.CharField(max_length=15, default="", blank=True)
 
-    telephone_alternative = models.CharField(max_length=15, null=True, blank=True)
+    telephone_alternative = models.CharField(max_length=15, default="", blank=True)
 
     class Meta:
         abstract = True

edc_pharmacy/models/prescription/rx.py

@@ -3,6 +3,7 @@ from uuid import uuid4
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
 from django.db.models import PROTECT, Index
+from django.utils import timezone
 
 from edc_action_item.models import ActionModelMixin
 from edc_constants.constants import NEW
@@ -12,7 +13,7 @@ from edc_randomization.site_randomizers import site_randomizers
 from edc_registration.models import RegisteredSubject
 from edc_sites.managers import CurrentSiteManager
 from edc_sites.model_mixins import SiteModelMixin
-from edc_utils import formatted_age, get_utcnow
+from edc_utils import formatted_age
 
 from ...choices import PRESCRIPTION_STATUS
 from ...constants import PRESCRIPTION_ACTION
@@ -54,9 +55,9 @@ class Rx(
         blank=False,
     )
 
-    report_datetime = models.DateTimeField(default=get_utcnow)
+    report_datetime = models.DateTimeField(default=timezone.now)
 
-    rx_date = models.DateField(verbose_name="Date RX written", default=get_utcnow)
+    rx_date = models.DateField(verbose_name="Date RX written", default=timezone.now)
 
     rx_expiration_date = models.DateField(
         verbose_name="Date RX expires",
@@ -75,17 +76,17 @@ class Rx(
         help_text="Number of times this prescription may be refilled",
     )
 
-    rando_sid = models.CharField(max_length=25, null=True, blank=True)
+    rando_sid = models.CharField(max_length=25, default="", blank=True)
 
-    randomizer_name = models.CharField(max_length=25, null=True, blank=True)
+    randomizer_name = models.CharField(max_length=25, default="", blank=True)
 
     weight_in_kgs = models.DecimalField(max_digits=6, decimal_places=1, null=True, blank=True)
 
-    clinician_initials = models.CharField(max_length=3, null=True)
+    clinician_initials = models.CharField(max_length=3, default="")
 
     notes = models.TextField(
         max_length=250,
-        null=True,
+        default="",
         blank=True,
         help_text="Private notes for pharmacist only",
     )
@@ -112,18 +113,18 @@ class Rx(
                     .objects.get(subject_identifier=self.subject_identifier)
                     .sid
                 )
-            except ObjectDoesNotExist:
+            except ObjectDoesNotExist as e:
                 raise PrescriptionError(
                     "Unable to create prescription. Subject has not been "
                     f"randomized (randomizer={self.randomizer_name}"
-                )
+                ) from e
         super().save(*args, **kwargs)
 
     def description(self):
         return (
             f"{','.join([o.display_name for o in self.medications.all()])} "
             f"{self.registered_subject.subject_identifier} {self.registered_subject.initials} "
-            f"{formatted_age(born=self.registered_subject.dob, reference_dt=get_utcnow())} "
+            f"{formatted_age(born=self.registered_subject.dob, reference_dt=timezone.now())} "
             f"{self.registered_subject.gender} "
             f"Written: {self.rx_date}"
         )
@@ -134,11 +135,11 @@ class Rx(
             obj = randomizer.model_cls().objects.get(
                 subject_identifier=self.subject_identifier
             )
-        except ObjectDoesNotExist:
+        except ObjectDoesNotExist as e:
             raise PrescriptionError(
                 "Unable to create prescription. Subject has not been "
                 f"randomized (randomizer={self.randomizer_name}"
-            )
+            ) from e
         return Assignment.objects.get(name=obj.assignment)
 
     class Meta(BaseUuidModel.Meta):

edc_pharmacy/models/prescription/rx_refill.py

@@ -57,7 +57,6 @@ class RxRefill(
 
     refill_start_datetime = models.DateTimeField(
         verbose_name="Refill start date/time",
-        # default=get_utcnow,
         help_text="Starting date for this refill",
     )
 

edc_pharmacy/models/stock/allocation.py

@@ -1,10 +1,10 @@
 from django.db import models
+from django.utils import timezone
 from sequences import get_next_value
 
 from edc_model.models import BaseUuidModel, HistoricalRecords
 from edc_randomization.site_randomizers import site_randomizers
 from edc_registration.models import RegisteredSubject
-from edc_utils import get_utcnow
 
 from ...exceptions import AllocationError
 from .. import Assignment, Rx
@@ -28,7 +28,7 @@ class Allocation(BaseUuidModel):
         help_text="A sequential unique identifier set by the EDC",
     )
 
-    allocation_datetime = models.DateTimeField(default=get_utcnow)
+    allocation_datetime = models.DateTimeField(default=timezone.now)
 
     registered_subject = models.ForeignKey(
         RegisteredSubject,
@@ -48,7 +48,7 @@ class Allocation(BaseUuidModel):
         blank=False,
     )
 
-    allocated_by = models.CharField(max_length=50, null=True, blank=True)
+    allocated_by = models.CharField(max_length=50, default="", blank=True)
 
     objects = Manager()
 

edc_pharmacy/models/stock/confirmation.py

@@ -1,8 +1,8 @@
 from django.db import models
+from django.utils import timezone
 from sequences import get_next_value
 
 from edc_model.models import BaseUuidModel, HistoricalRecords
-from edc_utils import get_utcnow
 
 
 class Manager(models.Manager):
@@ -32,9 +32,9 @@ class Confirmation(BaseUuidModel):
         null=True,
     )
 
-    confirmed_datetime = models.DateTimeField(default=get_utcnow)
+    confirmed_datetime = models.DateTimeField(default=timezone.now)
 
-    confirmed_by = models.CharField(max_length=100, null=True, blank=True)
+    confirmed_by = models.CharField(max_length=100, default="", blank=True)
 
     objects = Manager()
 

edc_pharmacy/models/stock/confirmation_at_site.py

@@ -1,9 +1,9 @@
 from django.db import models
+from django.utils import timezone
 from sequences import get_next_value
 
 from edc_model.models import BaseUuidModel, HistoricalRecords
 from edc_sites.model_mixins import SiteModelMixin
-from edc_utils import get_utcnow
 
 from ...exceptions import StockTransferConfirmationError
 from .location import Location
@@ -19,10 +19,11 @@ class ConfirmationAtSite(SiteModelMixin, BaseUuidModel):
         max_length=36,
         unique=True,
         blank=True,
+        null=True,
         help_text="A sequential unique identifier set by the EDC",
     )
 
-    transfer_confirmation_datetime = models.DateTimeField(default=get_utcnow)
+    transfer_confirmation_datetime = models.DateTimeField(default=timezone.now)
 
     stock_transfer = models.OneToOneField(StockTransfer, on_delete=models.PROTECT)
 

edc_pharmacy/models/stock/confirmation_at_site_item.py

@@ -1,9 +1,9 @@
 from django.db import models
+from django.utils import timezone
 from sequences import get_next_value
 
 from edc_model.models import BaseUuidModel, HistoricalRecords
 from edc_sites.model_mixins import SiteModelMixin
-from edc_utils import get_utcnow
 
 from ...exceptions import ConfirmAtSiteError
 from .confirmation_at_site import ConfirmationAtSite
@@ -15,7 +15,6 @@ class Manager(models.Manager):
 
 
 class ConfirmationAtSiteItem(SiteModelMixin, BaseUuidModel):
-
     confirmation_at_site = models.ForeignKey(ConfirmationAtSite, on_delete=models.PROTECT)
 
     transfer_confirmation_item_identifier = models.CharField(
@@ -26,13 +25,13 @@ class ConfirmationAtSiteItem(SiteModelMixin, BaseUuidModel):
         help_text="A sequential unique identifier set by the EDC",
     )
 
-    transfer_confirmation_item_datetime = models.DateTimeField(default=get_utcnow)
+    transfer_confirmation_item_datetime = models.DateTimeField(default=timezone.now)
 
     stock = models.OneToOneField(Stock, on_delete=models.PROTECT)
 
     confirmed_datetime = models.DateTimeField(null=True, blank=True)
 
-    confirmed_by = models.CharField(max_length=150, null=True, blank=True)
+    confirmed_by = models.CharField(max_length=150, default="", blank=True)
 
     objects = Manager()
 

edc_pharmacy/models/stock/dispense.py

@@ -1,9 +1,9 @@
 from django.db import models
+from django.utils import timezone
 from sequences import get_next_value
 
 from edc_model.models import BaseUuidModel, HistoricalRecords
 from edc_sites.model_mixins import SiteModelMixin
-from edc_utils import get_utcnow
 
 from ..prescription import Rx
 from .location import Location
@@ -14,7 +14,6 @@ class Manager(models.Manager):
 
 
 class Dispense(SiteModelMixin, BaseUuidModel):
-
     dispense_identifier = models.CharField(
         max_length=36,
         unique=True,
@@ -23,9 +22,9 @@ class Dispense(SiteModelMixin, BaseUuidModel):
         help_text="A sequential unique identifier set by the EDC",
     )
 
-    dispense_datetime = models.DateTimeField(default=get_utcnow)
+    dispense_datetime = models.DateTimeField(default=timezone.now)
 
-    dispensed_by = models.CharField(max_length=100, null=True, blank=True)
+    dispensed_by = models.CharField(max_length=100, default="", blank=True)
 
     rx = models.ForeignKey(Rx, on_delete=models.PROTECT, null=True, blank=False)
 
@@ -36,8 +35,8 @@ class Dispense(SiteModelMixin, BaseUuidModel):
 
     to_subject = models.BooleanField(default=False)
     to_subject_datetime = models.DateTimeField(null=True, blank=True)
-    crf_label_lower = models.CharField(max_length=100, null=True, blank=True)
-    crf_field_name = models.CharField(max_length=100, null=True, blank=True)
+    crf_label_lower = models.CharField(max_length=100, default="", blank=True)
+    crf_field_name = models.CharField(max_length=100, default="", blank=True)
     crf_id = models.UUIDField(null=True, blank=True)
 
     objects = Manager()

edc_pharmacy/models/stock/dispense_item.py

@@ -1,9 +1,9 @@
+import django.utils.timezone
 from django.db import models
 from sequences import get_next_value
 
 from edc_model.models import BaseUuidModel, HistoricalRecords
 from edc_sites.model_mixins import SiteModelMixin
-from edc_utils import get_utcnow
 from edc_visit_schedule.model_mixins import VisitCodeFieldsModelMixin
 
 from .dispense import Dispense
@@ -25,7 +25,7 @@ class DispenseItem(SiteModelMixin, VisitCodeFieldsModelMixin, BaseUuidModel):
         help_text="A sequential unique identifier set by the EDC",
     )
 
-    dispense_item_datetime = models.DateTimeField(default=get_utcnow)
+    dispense_item_datetime = models.DateTimeField(default=django.utils.timezone.now)
 
     dispense = models.ForeignKey(
         Dispense,

edc_pharmacy/models/stock/location.py

@@ -11,7 +11,6 @@ class Manager(models.Manager):
 
 
 class Location(ListModelMixin, BaseUuidModel):
-
     display_name = models.CharField(
         verbose_name="Name",
         max_length=250,
@@ -23,14 +22,14 @@ class Location(ListModelMixin, BaseUuidModel):
 
     site = models.ForeignKey(Site, on_delete=models.PROTECT, null=True, blank=True)
 
-    contact_name = models.CharField(max_length=150, null=True, blank=True)
+    contact_name = models.CharField(max_length=150, default="", blank=True)
     contact_tel = models.CharField(
         max_length=150,
         validators=[RegexValidator("[0-9]{1,15}")],
-        null=True,
+        default="",
         blank=True,
     )
-    contact_email = models.EmailField(max_length=150, null=True, blank=True)
+    contact_email = models.EmailField(max_length=150, default="", blank=True)
 
     objects = Manager()
 

edc_pharmacy/models/stock/lot.py

@@ -14,8 +14,7 @@ class Manager(models.Manager):
 
 
 class Lot(BaseUuidModel):
-
-    lot_identifier = models.CharField(
+    lot_identifier = models.CharField(  # noqa: DJ001
         max_length=25,
         unique=True,
         null=True,
@@ -35,15 +34,15 @@ class Lot(BaseUuidModel):
 
     expiration_date = models.DateField()
 
-    manufactured_by = models.CharField(max_length=50, null=True, blank=True)
+    manufactured_by = models.CharField(max_length=50, default="", blank=True)
 
-    country_of_origin = models.CharField(max_length=50, null=True, blank=True)
+    country_of_origin = models.CharField(max_length=50, default="", blank=True)
 
-    storage_conditions = models.CharField(max_length=50, null=True, blank=True)
+    storage_conditions = models.CharField(max_length=50, default="", blank=True)
 
-    reference = models.CharField(max_length=50, null=True, blank=True)
+    reference = models.CharField(max_length=50, default="", blank=True)
 
-    comment = models.CharField(max_length=250, null=True, blank=True)
+    comment = models.CharField(max_length=250, default="", blank=True)
 
     objects = Manager()