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

edc_pharmacy/models/stock/receive_item.py

@@ -1,10 +1,10 @@
 from decimal import Decimal
 
 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
 
 from ...exceptions import InvalidContainer, ReceiveError, ReceiveItemError
 from .container import Container
@@ -26,7 +26,7 @@ class ReceiveItem(BaseUuidModel):
         help_text="A sequential unique identifier set by the EDC",
     )
 
-    receive_item_datetime = models.DateTimeField(default=get_utcnow)
+    receive_item_datetime = models.DateTimeField(default=timezone.now)
 
     receive = models.ForeignKey(Receive, on_delete=models.PROTECT, null=True, blank=False)
 
@@ -49,7 +49,7 @@ class ReceiveItem(BaseUuidModel):
     )
 
     name = models.CharField(
-        max_length=200, null=True, blank=True, help_text="Leave blank to use default"
+        max_length=200, default="", blank=True, help_text="Leave blank to use default"
     )
 
     qty = models.DecimalField(
@@ -93,7 +93,7 @@ class ReceiveItem(BaseUuidModel):
             raise ReceiveItemError("OrderItem may not be null.")
         if not self.lot:
             raise ReceiveItemError("Lot may not be null.")
-        if self.container.qty > Decimal(1.0):
+        if self.container.qty > Decimal("1.0"):
             self.unit_qty = self.qty * self.container.qty
         else:
             self.unit_qty = self.qty

edc_pharmacy/models/stock/repack_request.py

@@ -2,10 +2,10 @@ from decimal import Decimal
 
 from django.core.validators import MinValueValidator
 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
 
 from ...exceptions import RepackRequestError
 from ...utils import get_related_or_none
@@ -34,7 +34,7 @@ class RepackRequest(BaseUuidModel):
         help_text="A sequential unique identifier set by the EDC",
     )
 
-    repack_datetime = models.DateTimeField(default=get_utcnow)
+    repack_datetime = models.DateTimeField(default=timezone.now)
 
     from_stock = models.ForeignKey(
         "edc_pharmacy.stock",

edc_pharmacy/models/stock/stock.py

@@ -5,10 +5,10 @@ from decimal import Decimal
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.db.models import PROTECT
+from django.utils import timezone
 from sequences import get_next_value
 
 from edc_model.models import BaseUuidModel, HistoricalRecords
-from edc_utils import get_utcnow
 
 from ...choices import STOCK_STATUS
 from ...constants import ALLOCATED, AVAILABLE, ZERO_ITEM
@@ -48,7 +48,7 @@ class Stock(BaseUuidModel):
     )
 
     stock_datetime = models.DateTimeField(
-        default=get_utcnow, help_text="date stock record created"
+        default=timezone.now, help_text="date stock record created"
     )
 
     receive_item = models.ForeignKey(
@@ -75,7 +75,7 @@ class Stock(BaseUuidModel):
     )
     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)
 
     allocation = models.OneToOneField(
         Allocation,
@@ -100,7 +100,7 @@ class Stock(BaseUuidModel):
         blank=False,
         decimal_places=2,
         max_digits=20,
-        default=Decimal(0.0),
+        default=Decimal("0.0"),
         help_text="Difference of qty_in and qty_out",
     )
 
@@ -109,7 +109,7 @@ class Stock(BaseUuidModel):
         blank=False,
         decimal_places=2,
         max_digits=20,
-        default=Decimal(0.0),
+        default=Decimal("0.0"),
         validators=[MinValueValidator(0), MaxValueValidator(1)],
         help_text="Container qty, e.g. 1 bucket, 1 bottle, etc",
     )
@@ -117,7 +117,7 @@ class Stock(BaseUuidModel):
     qty_out = models.DecimalField(
         decimal_places=2,
         max_digits=20,
-        default=Decimal(0.0),
+        default=Decimal("0.0"),
         validators=[MinValueValidator(0), MaxValueValidator(1)],
         help_text="Container qty, e.g. 1 bucket, 1 bottle, etc",
     )
@@ -125,7 +125,7 @@ class Stock(BaseUuidModel):
     unit_qty_in = models.DecimalField(
         decimal_places=2,
         max_digits=20,
-        default=Decimal(0.0),
+        default=Decimal("0.0"),
         validators=[MinValueValidator(0)],
         help_text="Number of units in this container, e.g. 128 tablets. See post-save signal",
     )
@@ -133,22 +133,18 @@ class Stock(BaseUuidModel):
     unit_qty_out = models.DecimalField(
         decimal_places=2,
         max_digits=20,
-        default=Decimal(0.0),
+        default=Decimal("0.0"),
         validators=[MinValueValidator(0)],
         help_text="Number of units from this container, e.g. 128 tablets",
     )
 
     status = models.CharField(max_length=25, choices=STOCK_STATUS, default=AVAILABLE)
 
-    description = models.CharField(max_length=100, null=True, blank=True)
-
-    # transferred = models.BooleanField(default=False)
-
-    # confirmed_at_site = models.BooleanField(default=False)
+    description = models.CharField(max_length=100, default="", blank=True)
 
     stored_at_site = models.BooleanField(default=False)
 
-    subject_identifier = models.CharField(max_length=50, null=True, blank=True)
+    subject_identifier = models.CharField(max_length=50, default="", blank=True)
 
     objects = StockManager()
 
@@ -173,13 +169,11 @@ class Stock(BaseUuidModel):
         super().save(*args, **kwargs)
 
     def update_transferred(self) -> bool:
-        if (
+        return (
             self.allocation
             and self.allocation.stock_request_item.stock_request.location == self.location
             and self.container.may_request_as
-        ):
-            return True
-        return False
+        )
 
     def verify_assignment_or_raise(
         self, stock: models.ForeignKey[Stock] | None = None

edc_pharmacy/models/stock/stock_adjustment.py

@@ -3,9 +3,9 @@ from decimal import Decimal
 from django.core.validators import MinValueValidator
 from django.db import models
 from django.db.models import Sum
+from django.utils import timezone
 
 from edc_model.models import BaseUuidModel, HistoricalRecords
-from edc_utils import get_utcnow
 
 from .stock import Stock
 
@@ -22,19 +22,19 @@ class StockAdjustment(BaseUuidModel):
         null=True,
     )
 
-    adjustment_datetime = models.DateTimeField(default=get_utcnow)
+    adjustment_datetime = models.DateTimeField(default=timezone.now)
 
     unit_qty_in_old = models.DecimalField(
         decimal_places=2,
         max_digits=20,
-        default=Decimal(0.0),
+        default=Decimal("0.0"),
         validators=[MinValueValidator(0)],
     )
 
     unit_qty_in_new = models.DecimalField(
         decimal_places=2,
         max_digits=20,
-        default=Decimal(0.0),
+        default=Decimal("0.0"),
         validators=[MinValueValidator(0)],
     )
 

edc_pharmacy/models/stock/stock_request.py

@@ -1,10 +1,10 @@
 from django.db import models
+from django.utils import timezone
 from sequences import get_next_value
 
 from edc_constants.constants import CANCELLED, CLOSED, OPEN
 from edc_model.models import BaseUuidModel, HistoricalRecords
 from edc_registration.models import RegisteredSubject
-from edc_utils import get_utcnow
 
 from ...exceptions import InvalidContainer, StockRequestError
 from ..medication import Formulation
@@ -31,7 +31,7 @@ class StockRequest(BaseUuidModel):
         help_text="A sequential unique identifier set by the EDC",
     )
 
-    request_datetime = models.DateTimeField(default=get_utcnow)
+    request_datetime = models.DateTimeField(default=timezone.now)
 
     start_datetime = models.DateTimeField(
         default=None,

edc_pharmacy/models/stock/stock_request_item.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 edc_visit_schedule.model_mixins import VisitCodeFieldsModelMixin
 
 from ...exceptions import StockRequestItemError
@@ -28,7 +28,7 @@ class StockRequestItem(VisitCodeFieldsModelMixin, BaseUuidModel):
         help_text="A sequential unique identifier set by the EDC",
     )
 
-    request_item_datetime = models.DateTimeField(default=get_utcnow)
+    request_item_datetime = models.DateTimeField(default=timezone.now)
 
     stock_request = models.ForeignKey(
         StockRequest,

edc_pharmacy/models/stock/stock_transfer.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
 
 from ...exceptions import StockTransferError
 from .location import Location
@@ -25,7 +25,7 @@ class StockTransfer(BaseUuidModel):
         help_text="A sequential unique identifier set by the EDC",
     )
 
-    transfer_datetime = models.DateTimeField(default=get_utcnow)
+    transfer_datetime = models.DateTimeField(default=timezone.now)
 
     from_location = models.ForeignKey(
         Location,
@@ -82,7 +82,7 @@ class StockTransfer(BaseUuidModel):
 
     @property
     def export_datetime(self):
-        return get_utcnow()
+        return timezone.now()
 
     @property
     def site(self):

edc_pharmacy/models/stock/stock_transfer_item.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
 
 from ...exceptions import StockTransferError
 from .stock import Stock
@@ -26,7 +26,7 @@ class StockTransferItem(BaseUuidModel):
         help_text="A sequential unique identifier set by the EDC",
     )
 
-    transfer_item_datetime = models.DateTimeField(default=get_utcnow)
+    transfer_item_datetime = models.DateTimeField(default=timezone.now)
 
     stock_transfer = models.ForeignKey(StockTransfer, on_delete=models.PROTECT)
 

edc_pharmacy/models/stock/storage_bin.py

@@ -3,17 +3,16 @@ from __future__ import annotations
 from django.core.validators import MinValueValidator
 from django.db import models
 from django.db.models import PROTECT
+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 .location import Location
 
 
 class StorageBin(SiteModelMixin, BaseUuidModel):
-
     bin_identifier = models.CharField(
         max_length=36,
         unique=True,
@@ -22,7 +21,7 @@ class StorageBin(SiteModelMixin, BaseUuidModel):
         help_text="A sequential unique identifier set by the EDC",
     )
 
-    bin_datetime = models.DateTimeField(default=get_utcnow)
+    bin_datetime = models.DateTimeField(default=timezone.now)
 
     name = models.CharField(
         max_length=10,
@@ -38,7 +37,7 @@ class StorageBin(SiteModelMixin, BaseUuidModel):
 
     in_use = models.BooleanField(default=True)
 
-    description = models.CharField(max_length=100, null=True, blank=True)
+    description = models.CharField(max_length=100, default="", blank=True)
 
     history = HistoricalRecords()
 

edc_pharmacy/models/stock/storage_bin_item.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
 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 .storage_bin import StorageBin
 
@@ -31,7 +31,7 @@ class StorageBinItem(SiteModelMixin, BaseUuidModel):
         },
     )
 
-    item_datetime = models.DateTimeField(default=get_utcnow)
+    item_datetime = models.DateTimeField(default=timezone.now)
 
     history = HistoricalRecords()
 

edc_pharmacy/models/stock/supplier.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
 
 from ..model_mixins import AddressModelMixin, ContactModelMixin
 
@@ -12,14 +12,13 @@ class Manager(models.Manager):
 
 
 class Supplier(AddressModelMixin, ContactModelMixin, BaseUuidModel):
-
     supplier_identifier = models.CharField(max_length=36, unique=True, null=True, blank=True)
 
     name = models.CharField(max_length=255, unique=True)
 
-    contact = models.CharField(max_length=255, null=True, blank=True)
+    contact = models.CharField(max_length=255, default="", blank=True)
 
-    supplier_datetime = models.DateTimeField(default=get_utcnow)
+    supplier_datetime = models.DateTimeField(default=timezone.now)
 
     objects = Manager()
 

edc_pharmacy/models/storage/box.py

@@ -1,9 +1,9 @@
 from uuid import uuid4
 
 from django.db import models
+from django.utils import timezone
 
 from edc_model.models import BaseUuidModel
-from edc_utils import get_utcnow
 
 from .shelf import Shelf
 
@@ -11,7 +11,7 @@ from .shelf import Shelf
 class Box(BaseUuidModel):
     box_identifier = models.CharField(max_length=36, default=uuid4, unique=True)
 
-    box_datetime = models.DateTimeField(default=get_utcnow)
+    box_datetime = models.DateTimeField(default=timezone.now)
 
     name = models.CharField(max_length=25, unique=True)
 

edc_pharmacy/models/storage/items/container_model_mixin.py

@@ -1,17 +1,16 @@
 from uuid import uuid4
 
 from django.db import models
+from django.utils import timezone
 
-from edc_utils import get_utcnow
-
+from ...stock import ContainerType
 from ..box import Box
-from ..container_type import ContainerType
 
 
 class ContainerModelMixin(models.Model):
     container_identifier = models.CharField(max_length=36, default=uuid4, unique=True)
 
-    container_datetime = models.DateTimeField(default=get_utcnow)
+    container_datetime = models.DateTimeField(default=timezone.now)
 
     name = models.CharField(max_length=25, unique=True)
 

edc_pharmacy/models/storage/items/pill_bottle_model_mixin.py

@@ -2,7 +2,8 @@ from django.db import models
 
 from edc_model.models import BaseUuidModel
 
-from ...medication import Formulation, Lot
+from ...medication import Formulation
+from ...stock import Lot
 from .container_model_mixin import ContainerModelMixin
 
 
@@ -11,7 +12,6 @@ class PillBottleError(Exception):
 
 
 class PillBottleModelMixin(ContainerModelMixin, BaseUuidModel):
-
     formulation = models.ForeignKey(Formulation, on_delete=models.PROTECT, blank=True)
 
     lot = models.ForeignKey(Lot, on_delete=models.PROTECT)

edc_pharmacy/models/storage/items/subject_pill_bottle.py

@@ -7,7 +7,7 @@ from .pill_bottle_model_mixin import PillBottleModelMixin
 class SubjectPillBottle(PillBottleModelMixin):
     rando_sid = models.CharField(max_length=25)
 
-    subject_identifier = models.CharField(max_length=50, null=True)
+    subject_identifier = models.CharField(max_length=50, default="")
 
     source_container = models.ForeignKey(
         PillBottle, on_delete=models.PROTECT, blank=True, null=True

edc_pharmacy/models/storage/room.py

@@ -1,9 +1,9 @@
 from uuid import uuid4
 
 from django.db import models
+from django.utils import timezone
 
 from edc_model.models import BaseUuidModel
-from edc_utils import get_utcnow
 
 from ..stock import Location
 
@@ -11,7 +11,7 @@ from ..stock import Location
 class Room(BaseUuidModel):
     room_identifier = models.CharField(max_length=36, default=uuid4, unique=True)
 
-    room_datetime = models.DateTimeField(default=get_utcnow)
+    room_datetime = models.DateTimeField(default=timezone.now)
 
     name = models.CharField(max_length=25, unique=True)
 

edc_pharmacy/models/storage/shelf.py

@@ -1,9 +1,9 @@
 from uuid import uuid4
 
 from django.db import models
+from django.utils import timezone
 
 from edc_model.models import BaseUuidModel
-from edc_utils import get_utcnow
 
 from .room import Room
 
@@ -11,7 +11,7 @@ from .room import Room
 class Shelf(BaseUuidModel):
     shelf_identifier = models.CharField(max_length=36, default=uuid4, unique=True)
 
-    shelf_datetime = models.DateTimeField(default=get_utcnow)
+    shelf_datetime = models.DateTimeField(default=timezone.now)
 
     name = models.CharField(max_length=25, unique=True)
 

edc_pharmacy/models/storage/utils.py

@@ -23,7 +23,7 @@ def get_shelf(item):
 
 def repackage(
     new_container_model_cls=None,
-    unit_qty: int = None,
+    unit_qty: int | None = None,
     source_container=None,
     box=None,
     **kwargs,

edc_pharmacy/utils/allocate_stock.py

@@ -6,8 +6,7 @@ from typing import TYPE_CHECKING
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import transaction
-
-from edc_utils import get_utcnow
+from django.utils import timezone
 
 from ..exceptions import AllocationError
 
@@ -69,7 +68,7 @@ def allocate_stock(
                 allocation = allocation_model_cls.objects.create(
                     stock_request_item=stock_request_item,
                     registered_subject=rs_obj,
-                    allocation_datetime=get_utcnow(),
+                    allocation_datetime=timezone.now(),
                     allocated_by=allocated_by,
                     user_created=user_created,
                     created=created,

edc_pharmacy/utils/confirm_stock.py

@@ -4,8 +4,7 @@ from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
-
-from edc_utils import get_utcnow
+from django.utils import timezone
 
 if TYPE_CHECKING:
     from ..models import Confirmation, Receive, RepackRequest, Stock
@@ -47,7 +46,7 @@ def confirm_stock(
             except ObjectDoesNotExist:
                 confirmation_model_cls.objects.create(
                     stock=stock,
-                    confirmed_datetime=get_utcnow(),
+                    confirmed_datetime=timezone.now(),
                     confirmed_by=confirmed_by or user_created,
                 )
                 confirmed.append(stock.code)

edc_pharmacy/utils/confirm_stock_at_site.py

@@ -6,8 +6,7 @@ from django.apps import apps as django_apps
 from django.contrib import messages
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.handlers.wsgi import WSGIRequest
-
-from edc_utils import get_utcnow
+from django.utils import timezone
 
 from ..exceptions import ConfirmAtSiteError
 
@@ -76,10 +75,10 @@ def confirm_stock_at_site(
                 obj = confirmation_at_site_item_model_cls(
                     confirmation_at_site=confirmation_at_site,
                     stock=stock,
-                    confirmed_datetime=get_utcnow(),
+                    confirmed_datetime=timezone.now(),
                     confirmed_by=confirmed_by,
                     user_created=confirmed_by,
-                    created=get_utcnow(),
+                    created=timezone.now(),
                 )
                 try:
                     obj.save()

edc_pharmacy/utils/dispense.py

@@ -7,8 +7,7 @@ from django.contrib import messages
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.handlers.wsgi import WSGIRequest
 from django.db.models import QuerySet
-
-from edc_utils import get_utcnow
+from django.utils import timezone
 
 if TYPE_CHECKING:
     from ..models import Dispense, DispenseItem, Location, Stock
@@ -33,7 +32,7 @@ def dispense(
             messages.add_message(
                 request,
                 messages.ERROR,
-                (f"Stock not allocated to subject. Got {stock.code}. Dispensing cancelled."),
+                f"Stock not allocated to subject. Got {stock.code}. Dispensing cancelled.",
             )
             assignment_mismatch = True
             break
@@ -50,7 +49,7 @@ def dispense(
                     dispense=dispense_obj,
                     stock=stock,
                     user_created=request.user.username,
-                    created=get_utcnow(),
+                    created=timezone.now(),
                 )
             else:
                 messages.add_message(

edc_pharmacy/utils/process_repack_request.py

@@ -4,8 +4,7 @@ from uuid import UUID
 
 from celery import shared_task
 from django.apps import apps as django_apps
-
-from edc_utils import get_utcnow
+from django.utils import timezone
 
 from ..exceptions import InsufficientStockError, RepackError
 
@@ -29,7 +28,7 @@ def process_repack_request(repack_request_id: UUID | None = None, username: str
     if not getattr(repack_request.from_stock, "confirmation", None):
         raise RepackError("Source stock item not confirmed")
     stock_model_cls = repack_request.from_stock.__class__
-    for index in range(0, int(number_to_process)):
+    for _ in range(0, int(number_to_process)):
         try:
             stock_model_cls.objects.create(
                 receive_item=None,
@@ -42,7 +41,7 @@ def process_repack_request(repack_request_id: UUID | None = None, username: str
                 repack_request=repack_request,
                 lot=repack_request.from_stock.lot,
                 user_created=username,
-                created=get_utcnow(),
+                created=timezone.now(),
             )
         except InsufficientStockError:
             break
@@ -50,7 +49,7 @@ def process_repack_request(repack_request_id: UUID | None = None, username: str
         repack_request=repack_request
     ).count()
     repack_request.user_modified = username
-    repack_request.modified = get_utcnow()
+    repack_request.modified = timezone.now()
     repack_request.save(
         update_fields=[
             "requested_qty",

edc_pharmacy/utils/stock_request/bulk_create_stock_request_items.py

@@ -6,10 +6,9 @@ from typing import TYPE_CHECKING
 import pandas as pd
 from celery import shared_task
 from django.apps import apps as django_apps
+from django.utils import timezone
 from sequences import get_next_value
 
-from edc_utils import get_utcnow
-
 if TYPE_CHECKING:
     from uuid import UUID
 
@@ -29,7 +28,7 @@ def bulk_create_stock_request_items(
 
     stock_request = stock_request_model_cls.objects.get(pk=stock_request_pk)
     df_nostock = pd.DataFrame(nostock_as_dict)
-    now = get_utcnow()
+    now = timezone.now()
     data = []
     for i, row in df_nostock[df_nostock.stock_qty == 0].iterrows():
         registered_subject = registered_subject_model_cls.objects.get(

edc_pharmacy/utils/transfer_stock.py

@@ -6,8 +6,7 @@ from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.handlers.wsgi import WSGIRequest
 from django.db import transaction
-
-from edc_utils import get_utcnow
+from django.utils import timezone
 
 if TYPE_CHECKING:
     from ..models import StockTransfer
@@ -35,7 +34,7 @@ def transfer_stock(
                     stock=stock,
                     stock_transfer=stock_transfer,
                     user_created=request.user.username,
-                    created=get_utcnow(),
+                    created=timezone.now(),
                 )
                 stock.location = stock_transfer.to_location
                 stock.save()