clinicedc 2.0.34__py3-none-any.whl → 2.0.36__py3-none-any.whl

edc_pharmacy/forms/stock/stock_form.py

@@ -4,16 +4,15 @@ from ...models import Stock
 
 
 class StockForm(forms.ModelForm):
-
     class Meta:
         model = Stock
         fields = "__all__"
-        help_text = {
+        help_text = {  # noqa: RUF012
             "stock_identifier": "(read-only)",
             "receive_item": "(read-only)",
             "container": "(read-only)",
         }
-        widgets = {
+        widgets = {  # noqa: RUF012
             "stock_identifier": forms.TextInput(attrs={"readonly": "readonly"}),
             "receive_item": forms.TextInput(attrs={"readonly": "readonly"}),
             "container": forms.TextInput(attrs={"readonly": "readonly"}),

edc_pharmacy/forms/stock/stock_request_form.py

@@ -62,13 +62,15 @@ class StockRequestForm(forms.ModelForm):
 
         if not self.instance.id and cleaned_data.get("cancel") == "CANCEL":
             raise forms.ValidationError("Leave this blank")
-        if cleaned_data.get("cancel") == "CANCEL":
-            if Allocation.objects.filter(
+        if (
+            cleaned_data.get("cancel") == "CANCEL"
+            and Allocation.objects.filter(
                 stock_request_item__stock_request=self.instance
-            ).exists():
-                raise forms.ValidationError(
-                    "May not be cancelled. Stock has been allocated for this request"
-                )
+            ).exists()
+        ):
+            raise forms.ValidationError(
+                "May not be cancelled. Stock has been allocated for this request"
+            )
         return cleaned_data
 
     @staticmethod
@@ -112,7 +114,7 @@ class StockRequestForm(forms.ModelForm):
     class Meta:
         model = StockRequest
         fields = "__all__"
-        help_text = {"request_identifier": "(read-only)"}
-        widgets = {
+        help_text = {"request_identifier": "(read-only)"}  # noqa: RUF012
+        widgets = {  # noqa: RUF012
             "request_identifier": forms.TextInput(attrs={"readonly": "readonly"}),
         }

edc_pharmacy/forms/stock/stock_request_item_form.py

@@ -7,7 +7,6 @@ from ...models import StockRequestItem
 
 
 class StockRequestItemForm(forms.ModelForm):
-
     def clean(self):
         cleaned_data = super().clean()
         try:
@@ -16,14 +15,16 @@ class StockRequestItemForm(forms.ModelForm):
                 consent_datetime__isnull=False,
                 randomization_datetime__isnull=False,
             )
-        except ObjectDoesNotExist:
-            raise forms.ValidationError({"subject_identifier": "Subject does not exist"})
+        except ObjectDoesNotExist as e:
+            raise forms.ValidationError(
+                {"subject_identifier": "Subject does not exist"}
+            ) from e
         return cleaned_data
 
     class Meta:
         model = StockRequestItem
         fields = "__all__"
-        help_text = {"request_item_identifier": "(read-only)"}
-        widgets = {
+        help_text = {"request_item_identifier": "(read-only)"}  # noqa: RUF012
+        widgets = {  # noqa: RUF012
             "request_item_identifier": forms.TextInput(attrs={"readonly": "readonly"}),
         }

edc_pharmacy/forms/stock/stock_transfer_form.py

@@ -4,29 +4,31 @@ from ...models import StockTransfer, StockTransferItem
 
 
 class StockTransferForm(forms.ModelForm):
-
     def clean(self):
         cleaned_data = super().clean()
         items_qs = StockTransferItem.objects.filter(stock_transfer__pk=self.instance.pk)
-        if cleaned_data.get("to_location") and items_qs.count() > 0:
-            if (
+        if (
+            cleaned_data.get("to_location")
+            and items_qs.count() > 0
+            and (
                 items_qs[0].stock.allocation.registered_subject.site
                 != cleaned_data.get("to_location").site
-            ):
-                raise forms.ValidationError(
-                    {
-                        "to_location": (
-                            "Invalid location. Does not match the intended location of "
-                            "existing stock items for this transfer."
-                        )
-                    }
-                )
+            )
+        ):
+            raise forms.ValidationError(
+                {
+                    "to_location": (
+                        "Invalid location. Does not match the intended location of "
+                        "existing stock items for this transfer."
+                    )
+                }
+            )
         return cleaned_data
 
     class Meta:
         model = StockTransfer
         fields = "__all__"
-        help_text = {"transfer_identifier": "(read-only)"}
-        widgets = {
+        help_text = {"transfer_identifier": "(read-only)"}  # noqa: RUF012
+        widgets = {  # noqa: RUF012
             "transfer_identifier": forms.TextInput(attrs={"readonly": "readonly"}),
         }

edc_pharmacy/forms/stock/supplier_form.py

@@ -7,7 +7,7 @@ class SupplierForm(forms.ModelForm):
     class Meta:
         model = Supplier
         fields = "__all__"
-        help_text = {"supplier_identifier": "(read-only)"}
-        widgets = {
+        help_text = {"supplier_identifier": "(read-only)"}  # noqa: RUF012
+        widgets = {  # noqa: RUF012
             "supplier_identifier": forms.TextInput(attrs={"readonly": "readonly"}),
         }

edc_pharmacy/labels/label_data.py

@@ -3,12 +3,11 @@ import string
 
 
 class LabelData:
-
     def __init__(self):
-        self.gender = random.choice(["M", "F"])  # nosec B311
+        self.gender = random.choice(["M", "F"])  # nosec B311  # noqa: S311
         self.subject_identifier = "999-99-9999-9"  # nosec B311
         self.reference = "".join(
-            random.choices(string.ascii_letters.upper() + "23456789", k=6)  # nosec B311
+            random.choices(string.ascii_letters.upper() + "23456789", k=6)  # nosec B311  # noqa: S311
         )
         self.sid = "12345"
         self.site_name = "AMANA"

edc_pharmacy/model_mixins/study_medication_crf_model_mixin.py

@@ -7,7 +7,7 @@ from django.core.exceptions import ObjectDoesNotExist
 
 from edc_appointment.utils import get_next_appointment
 from edc_constants.constants import YES
-from edc_utils import formatted_datetime
+from edc_utils.text import formatted_datetime
 from edc_visit_tracking.utils import get_next_related_visit
 
 from ..exceptions import NextStudyMedicationError, StudyMedicationError

edc_pharmacy/models/medication/dosage_guideline.py

@@ -83,9 +83,9 @@ class DosageGuideline(BaseUuidModel):
     class Meta(BaseUuidModel.Meta):
         verbose_name = "Dosage Guideline"
         verbose_name_plural = "Dosage Guidelines"
-        constraints = [
+        constraints = (
             UniqueConstraint(
                 fields=["medication", "dose", "dose_units", "dose_per_kg"],
                 name="%(app_label)s_%(class)s_med_dose_uniq",
-            )
-        ]
+            ),
+        )

edc_pharmacy/models/model_mixins.py

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

edc_pharmacy/models/prescription/rx.py

@@ -13,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
+from edc_utils.age import formatted_age
 
 from ...choices import PRESCRIPTION_STATUS
 from ...constants import PRESCRIPTION_ACTION

edc_pharmacy/models/prescription/rx_refill.py

@@ -9,8 +9,8 @@ from django.db.models.deletion import PROTECT
 from edc_model.models import BaseUuidModel, HistoricalRecords
 from edc_sites.managers import CurrentSiteManager
 from edc_sites.model_mixins import SiteModelMixin
-from edc_utils import convert_php_dateformat
 from edc_utils.round_up import round_half_away_from_zero
+from edc_utils.text import convert_php_dateformat
 
 from ...dosage_calculator import DosageCalculator
 from ...model_mixins import MedicationOrderModelMixin, PreviousNextModelMixin

edc_pharmacy/models/signals.py

@@ -278,6 +278,5 @@ def create_or_update_refills_on_post_save(
 def update_previous_refill_end_datetime_on_post_save(
     sender, instance, raw, created, update_fields, **kwargs
 ):
-    if not raw and not update_fields:
-        if isinstance(instance, (StudyMedicationCrfModelMixin,)):
-            update_previous_refill_end_datetime(instance)
+    if not raw and not update_fields and isinstance(instance, (StudyMedicationCrfModelMixin,)):
+        update_previous_refill_end_datetime(instance)

edc_pharmacy/models/storage/utils.py

@@ -48,10 +48,10 @@ def repackage(
 
 
 def repackage_for_subject(
-    rando_sid: str = None,
-    subject_identifier: str = None,
-    randomizer_name=None,
-    source_container=None,
+    rando_sid: str,
+    subject_identifier: str | None,
+    randomizer_name: str,
+    source_container,
     **kwargs,
 ):
     site_randomizers.get(randomizer_name)

edc_pharmacy/pdf_reports/manifest_pdf_report.py

@@ -22,13 +22,12 @@ class NumberedCanvas(BaseNumberedCanvas):
 
 
 class ManifestReport(Report):
-
     def __init__(self, stock_transfer: StockTransfer = None, **kwargs):
         self.stock_transfer = stock_transfer
         self.protocol_name = ResearchProtocolConfig().protocol_title
         super().__init__(**kwargs)
 
-    def draw_header(self, canvas, doc):
+    def draw_header(self, canvas, doc):  # noqa: ARG002
         width, height = A4
         canvas.setFontSize(6)
         text_width = stringWidth(self.protocol_name, "Helvetica", 6)
@@ -48,7 +47,7 @@ class ManifestReport(Report):
             "stock__allocation__registered_subject__subject_identifier"
         )
 
-    def get_report_story(self, document_template: SimpleDocTemplate = None, **kwargs):
+    def get_report_story(self, document_template: SimpleDocTemplate = None, **kwargs):  # noqa: ARG002
         story = []
 
         data = [
@@ -147,7 +146,6 @@ class ManifestReport(Report):
 
     @property
     def stock_transfer_items_as_table(self) -> Table:
-
         style = ParagraphStyle(
             name="line_data_medium",
             alignment=TA_CENTER,
@@ -267,8 +265,7 @@ class ManifestReport(Report):
                 Paragraph(_("Received count"), style=style),
             ],
         ]
-        table = Table(data, colWidths=(None, None, None, None), rowHeights=(10, 10))
-        return table
+        return Table(data, colWidths=(None, None, None, None), rowHeights=(10, 10))
 
     @property
     def comment_box_as_table(self) -> Table:

edc_pharmacy/pdf_reports/stock_pdf_report.py

@@ -16,13 +16,12 @@ from ..utils import get_related_or_none
 
 
 class StockReport(Report):
-
     def __init__(self, queryset: QuerySet[Stock] = None, **kwargs):
         self.queryset = queryset.order_by("from_stock__code", "code")
         self.protocol_name = ResearchProtocolConfig().protocol_title
         super().__init__(**kwargs)
 
-    def draw_header(self, canvas, doc):
+    def draw_header(self, canvas, doc):  # noqa: ARG002
         width, height = self.page.get("pagesize")
         canvas.setFontSize(6)
         text_width = stringWidth(self.protocol_name, "Helvetica", 6)
@@ -72,7 +71,6 @@ class StockReport(Report):
 
     @property
     def stock_items_as_table(self) -> Table:
-
         style = ParagraphStyle(
             name="line_data_medium",
             alignment=TA_CENTER,

edc_pharmacy/refill/refill_creator.py

@@ -4,13 +4,12 @@ from datetime import datetime
 from decimal import Decimal
 from typing import TYPE_CHECKING
 from uuid import uuid4
-from zoneinfo import ZoneInfo
 
 from dateutil.relativedelta import relativedelta
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 
-from edc_utils import convert_php_dateformat
+from edc_utils.text import convert_php_dateformat
 
 from ..exceptions import (
     PrescriptionError,
@@ -43,9 +42,9 @@ class RefillCreator:
         self._next_rx_refill = None
         self._prev_rx_refill = None
         self.refill_identifier = refill_identifier
-        self.refill_end_datetime = refill_end_datetime.astimezone(ZoneInfo("UTC"))
+        self.refill_end_datetime = refill_end_datetime
         self.subject_identifier = subject_identifier
-        self.refill_start_datetime = refill_start_datetime.astimezone(ZoneInfo("UTC"))
+        self.refill_start_datetime = refill_start_datetime
         self.formulation = formulation
         self.dosage_guideline = dosage_guideline
         self.roundup_divisible_by = roundup_divisible_by or 0

edc_protocol/validators.py

@@ -1,10 +1,10 @@
 from datetime import datetime
 from zoneinfo import ZoneInfo
 
+from django.conf import settings
 from django.core.exceptions import ValidationError
-from django.utils import timezone
 
-from edc_utils import formatted_datetime
+from edc_utils.text import formatted_datetime
 
 from .research_protocol_config import ResearchProtocolConfig
 
@@ -12,14 +12,11 @@ from .research_protocol_config import ResearchProtocolConfig
 def date_not_before_study_start(value):
     if value:
         protocol_config = ResearchProtocolConfig()
-        value_utc = datetime(*[*value.timetuple()][0:6], tzinfo=ZoneInfo("UTC"))
-        if value_utc < protocol_config.study_open_datetime:
-            opened = formatted_datetime(
-                timezone.localtime(protocol_config.study_open_datetime)
-            )
-            got = formatted_datetime(timezone.localtime(value_utc))
+        dte = datetime(*[*value.timetuple()][0:6], tzinfo=ZoneInfo(settings.TIME_ZONE))
+        if dte < protocol_config.study_open_datetime:
+            opened = formatted_datetime(protocol_config.study_open_datetime)
             raise ValidationError(
-                f"Invalid date. Study opened on {opened}. Got {got}. "
+                f"Invalid date. Study opened on {opened}. Got {formatted_datetime(dte)}. "
                 f"See edc_protocol.AppConfig."
             )
 
@@ -27,13 +24,10 @@ def date_not_before_study_start(value):
 def datetime_not_before_study_start(value_datetime):
     if value_datetime:
         protocol_config = ResearchProtocolConfig()
-        value_utc = value_datetime.astimezone(ZoneInfo("UTC"))
-        if value_utc < protocol_config.study_open_datetime:
-            opened = formatted_datetime(
-                timezone.localtime(protocol_config.study_open_datetime)
-            )
-            got = formatted_datetime(timezone.localtime(value_utc))
+        dte = value_datetime
+        if dte < protocol_config.study_open_datetime:
+            opened = formatted_datetime(protocol_config.study_open_datetime)
             raise ValidationError(
-                f"Invalid date/time. Study opened on {opened}. Got {got}."
+                f"Invalid date/time. Study opened on {opened}. Got {formatted_datetime(dte)}."
                 f"See edc_protocol.AppConfig."
             )

edc_reportable/forms/reportables_form_validator_mixin.py

@@ -58,7 +58,7 @@ class ReportablesFormValidatorMixin:
         try:
             reference_range_evaluator.validate_reportable_fields()
         except NotEvaluated as e:
-            self.raise_validation_error({"__all__": str(e)}, INVALID_ERROR)
+            self.raise_validation_error({"__all__": str(e)}, INVALID_ERROR, exc=e)
         reference_range_evaluator.validate_results_abnormal_field()
         self.applicable_if(
             YES, field="results_abnormal", field_applicable="results_reportable"

edc_screening/form_validator_mixins.py

@@ -43,10 +43,11 @@ class SubjectScreeningFormValidatorMixin:
                 self._subject_screening = self.subject_screening_model_cls.objects.get(
                     screening_identifier=self.screening_identifier
                 )
-            except ObjectDoesNotExist:
+            except ObjectDoesNotExist as e:
                 self.raise_validation_error(
                     'Complete the "Subject Screening" form before proceeding.',
                     error_code="missing_subject_screening",
+                    exc=e,
                 )
         return self._subject_screening
 

edc_transfer/form_validators.py

@@ -6,7 +6,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from edc_constants.constants import DWTA, OTHER
 from edc_form_validators import FormValidator
 from edc_prn.modelform_mixins import PrnFormValidatorMixin
-from edc_utils import convert_php_dateformat
+from edc_utils.text import convert_php_dateformat
 
 from .constants import TRANSFERRED
 

edc_transfer/model_mixins.py

@@ -8,7 +8,7 @@ from edc_constants.choices import YES_NO, YES_NO_UNSURE
 from edc_identifier.model_mixins import UniqueSubjectIdentifierFieldMixin
 from edc_model import models as edc_models
 from edc_sites.model_mixins import SiteModelMixin
-from edc_utils import convert_php_dateformat
+from edc_utils.text import convert_php_dateformat
 
 from .choices import TRANSFER_INITIATORS
 from .constants import SUBJECT_TRANSFER_ACTION

edc_utils/age.py

@@ -8,6 +8,8 @@ from dateutil.relativedelta import relativedelta
 from django.conf import settings
 from django.utils import timezone
 
+from edc_utils.text import formatted_datetime
+
 
 class AgeValueError(Exception):
     pass
@@ -35,23 +37,23 @@ def get_dob(age_in_years: int, now: date | datetime | None = None) -> date:
 def age(born: date | datetime, reference_dt: date | datetime) -> relativedelta:
     """Returns a relative delta.
 
-    Convert dates or datetimes to UTC datetimes.
+    Convert dates to datetimes in local timezone.
     """
-    if born is None:
+    if born is None or reference_dt is None:
         raise AgeValueError("DOB cannot be None")
-    try:
-        born_utc = born.astimezone(ZoneInfo("UTC"))
-    except AttributeError:
-        born_utc = datetime(*[*born.timetuple()][0:6], tzinfo=ZoneInfo("UTC"))
-    try:
-        reference_dt_utc = reference_dt.astimezone(ZoneInfo("UTC"))
-    except AttributeError:
-        reference_dt_utc = datetime(*[*reference_dt.timetuple()][0:6], tzinfo=ZoneInfo("UTC"))
-    rdelta = relativedelta(reference_dt_utc, born_utc)
-    if born_utc > reference_dt_utc:
+    if reference_dt is None:
+        raise AgeValueError("Reference cannot be None")
+    if not hasattr(born, "date"):
+        born = datetime(*[*born.timetuple()][0:6], tzinfo=ZoneInfo(settings.TIME_ZONE))
+    if not hasattr(reference_dt, "date"):
+        reference_dt = datetime(
+            *[*reference_dt.timetuple()][0:6], tzinfo=ZoneInfo(settings.TIME_ZONE)
+        )
+    rdelta = relativedelta(reference_dt, born)
+    if born > reference_dt:
         raise AgeValueError(
-            f"Reference date {reference_dt} {reference_dt.tzinfo!s} "
-            f"precedes DOB {born} {timezone}. Got {rdelta}"
+            f"Reference date {formatted_datetime(reference_dt)} precedes DOB "
+            f"{formatted_datetime(born)}. Got {rdelta}"
         )
     return rdelta
 
@@ -63,7 +65,7 @@ def formatted_age(
 ) -> str:
     age_as_str = "?"
     if born:
-        tz = tz or getattr(settings, "TIME_ZONE", "UTC")
+        tz = tz or settings.TIME_ZONE
         born = datetime(*[*born.timetuple()][0:6], tzinfo=ZoneInfo(tz))
         reference_dt = reference_dt or timezone.now()
         age_delta = age(born, reference_dt or timezone.now())

edc_utils/date.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from datetime import date, datetime
 from zoneinfo import ZoneInfo
 
-from django.conf import settings
+from django.utils import timezone
 
 
 class EdcDatetimeError(Exception):
@@ -11,21 +11,21 @@ class EdcDatetimeError(Exception):
 
 
 def get_utcnow() -> datetime:
-    return datetime.now().astimezone(ZoneInfo("UTC"))
+    return timezone.localtime(None, timezone=ZoneInfo("UTC"))
 
 
 def get_utcnow_as_date() -> date:
-    return datetime.now().astimezone(ZoneInfo("UTC")).date()
+    return timezone.localtime(None, timezone=ZoneInfo("UTC")).date()
 
 
-def to_utc(dt: datetime) -> datetime:
+def to_utc(dte: datetime) -> datetime:
     """Returns UTC datetime from any aware datetime."""
-    return dt.astimezone(ZoneInfo("UTC"))
+    return timezone.localtime(dte, timezone=ZoneInfo("UTC"))
 
 
-def to_local(dt: datetime) -> datetime:
+def to_local(dte: datetime) -> datetime:
     """Returns local datetime from any aware datetime."""
-    return dt.astimezone(ZoneInfo(settings.TIME_ZONE))
+    return timezone.localtime(dte)
 
 
 def floor_secs(dte) -> datetime:

edc_utils/text.py

@@ -4,6 +4,7 @@ from datetime import datetime
 from zoneinfo import ZoneInfo
 
 from django.conf import settings
+from django.utils import timezone
 
 safe_allowed_chars = "ABCDEFGHKMNPRTUVWXYZ2346789"
 
@@ -63,9 +64,9 @@ def convert_from_camel(name):
 
 
 def formatted_datetime(
-    aware_datetime: datetime | None,
+    dt: datetime | None,
     php_dateformat: str | None = None,
-    tz: str | None = None,
+    tz: ZoneInfo | None = None,
     format_as_date: bool | None = None,
 ):
     """Returns a formatted datetime string, localized by default.
@@ -73,14 +74,14 @@ def formatted_datetime(
     format_as_date: does not affect the calculation, just the formatted output.
     """
     formatted = ""
-    if aware_datetime:
-        local = aware_datetime.astimezone(tz or ZoneInfo(settings.TIME_ZONE))
+    if dt:
+        localized_dt = timezone.localtime(dt, timezone=tz)
         if format_as_date:
             php_dateformat = php_dateformat or settings.SHORT_DATE_FORMAT
-            formatted = local.date().strftime(convert_php_dateformat(php_dateformat))
+            formatted = localized_dt.date().strftime(convert_php_dateformat(php_dateformat))
         else:
             php_dateformat = php_dateformat or settings.SHORT_DATETIME_FORMAT
-            formatted = local.strftime(convert_php_dateformat(php_dateformat))
+            formatted = localized_dt.strftime(convert_php_dateformat(php_dateformat))
     return formatted
 
 

edc_visit_schedule/exceptions.py

@@ -46,10 +46,18 @@ class ScheduledVisitWindowError(Exception):
     pass
 
 
+class UnScheduledVisitError(Exception):
+    pass
+
+
 class UnScheduledVisitWindowError(Exception):
     pass
 
 
+class MissedVisitError(Exception):
+    pass
+
+
 class SiteVisitScheduleError(Exception):
     pass
 

edc_visit_schedule/model_mixins/off_schedule_model_mixin.py

@@ -13,7 +13,7 @@ from edc_identifier.model_mixins import UniqueSubjectIdentifierFieldMixin
 from edc_model.validators import datetime_not_future
 from edc_protocol.validators import datetime_not_before_study_start
 from edc_sites.managers import CurrentSiteManager as BaseCurrentSiteManager
-from edc_utils import convert_php_dateformat
+from edc_utils.text import convert_php_dateformat
 
 from ..site_visit_schedules import site_visit_schedules
 

edc_visit_schedule/model_mixins/on_schedule_model_mixin.py

@@ -12,7 +12,7 @@ from edc_identifier.model_mixins import UniqueSubjectIdentifierFieldMixin
 from edc_model.models import HistoricalRecords
 from edc_model.validators import datetime_not_future
 from edc_protocol.validators import datetime_not_before_study_start
-from edc_utils import convert_php_dateformat
+from edc_utils.text import convert_php_dateformat
 
 from ..site_visit_schedules import site_visit_schedules
 

edc_visit_schedule/modelform_mixins/off_schedule_modelform_mixin.py

@@ -4,8 +4,6 @@ from datetime import datetime
 
 from django import forms
 
-from edc_utils import to_utc
-
 from ..subject_schedule import InvalidOffscheduleDate
 from .visit_schedule_non_crf_modelform_mixin import VisitScheduleNonCrfModelFormMixin
 
@@ -42,7 +40,7 @@ class OffScheduleModelFormMixin(VisitScheduleNonCrfModelFormMixin):
     @property
     def offschedule_datetime(self) -> datetime | None:
         if self.offschedule_datetime_field_attr in self.cleaned_data:
-            return to_utc(self.cleaned_data.get(self.offschedule_datetime_field_attr))
+            return self.cleaned_data.get(self.offschedule_datetime_field_attr)
         return getattr(self.instance, self.offschedule_datetime_field_attr)
 
     @property