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

{clinicedc-2.0.34.dist-info → clinicedc-2.0.35.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.8.22
+Generator: uv 0.8.23
 Root-Is-Purelib: true
 Tag: py3-none-any

edc_action_item/templatetags/action_item_extras.py

@@ -6,8 +6,8 @@ from django import template
 
 from edc_auth.utils import get_user
 from edc_constants.constants import CANCELLED, CLOSED, HIGH_PRIORITY, NEW, OPEN
-from edc_utils import formatted_date
 from edc_utils.date import to_local
+from edc_utils.text import formatted_date
 
 from ..models import ActionItem
 from ..site_action_items import site_action_items

edc_adverse_event/form_validator_mixins/death_report_form_validator.py

@@ -9,7 +9,7 @@ from django.conf import settings
 
 from edc_constants.constants import CLOSED, OTHER
 from edc_form_validators.base_form_validator import INVALID_ERROR
-from edc_utils import convert_php_dateformat
+from edc_utils.text import convert_php_dateformat
 
 if TYPE_CHECKING:
     from datetime import date

edc_adverse_event/form_validator_mixins/requires_death_report_form_validator_mixin.py

@@ -9,7 +9,7 @@ from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 
 from edc_constants.constants import DEAD
-from edc_utils import convert_php_dateformat
+from edc_utils.text import convert_php_dateformat
 
 from ..constants import DEATH_REPORT_NOT_FOUND
 from ..utils import get_ae_model
@@ -46,9 +46,11 @@ class BaseRequiresDeathReportFormValidatorMixin:
             return self.death_report_model_cls.objects.get(
                 subject_identifier=self.subject_identifier
             )
-        except ObjectDoesNotExist:
+        except ObjectDoesNotExist as e:
             verbose_name = self.death_report_model_cls._meta.verbose_name
-            self.raise_validation_error(f"`{verbose_name}` not found.", DEATH_REPORT_NOT_FOUND)
+            self.raise_validation_error(
+                f"`{verbose_name}` not found.", DEATH_REPORT_NOT_FOUND, exc=e
+            )
 
     @property
     def death_report_date(self) -> date:

edc_adverse_event/form_validators/death_report_tmg.py

@@ -25,8 +25,8 @@ class DeathReportTmgFormValidator(
             obj = get_ae_model("deathreport").objects.get(
                 subject_identifier=self.cleaned_data.get("subject_identifier")
             )
-        except ObjectDoesNotExist:
-            self.raise_validation_error("Death report not found.", INVALID_ERROR)
+        except ObjectDoesNotExist as e:
+            self.raise_validation_error("Death report not found.", INVALID_ERROR, exc=e)
         death_date = getattr(obj, obj.death_date_field)
         try:
             death_date = death_date.date()

edc_adverse_event/modeladmin_mixins/ae_tmg_admin_mixin.py

@@ -9,7 +9,7 @@ from edc_action_item.fieldsets import action_fieldset_tuple
 from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
 from edc_constants.constants import NOT_APPLICABLE, OTHER
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
-from edc_utils import convert_php_dateformat
+from edc_utils.text import convert_php_dateformat
 
 from ..forms import AeTmgForm
 from ..models import AeClassification

edc_adverse_event/modeladmin_mixins/utils.py

@@ -8,7 +8,7 @@ from django.conf import settings
 from django.urls import reverse
 
 from edc_model.models import BaseUuidModel
-from edc_utils import convert_php_dateformat
+from edc_utils.text import convert_php_dateformat
 
 if TYPE_CHECKING:
     from django.contrib import admin

edc_adverse_event/utils.py

@@ -11,7 +11,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.utils.translation import gettext as _
 
 from edc_model_admin.utils import add_to_messages_once
-from edc_utils import convert_php_dateformat
+from edc_utils.text import convert_php_dateformat
 
 from .constants import TMG_ROLE
 

edc_appointment/admin/appointment_admin.py

@@ -54,7 +54,7 @@ class AppointmentAdmin(
 ):
     show_cancel = True
     form = AppointmentForm
-    actions = [appointment_mark_as_done, appointment_mark_as_new]
+    actions = (appointment_mark_as_done, appointment_mark_as_new)
     date_hierarchy = "appt_datetime"
     list_display = (
         "appointment_subject",
@@ -129,7 +129,7 @@ class AppointmentAdmin(
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "appt_type": admin.VERTICAL,
         "appt_status": admin.VERTICAL,
         "appt_reason": admin.VERTICAL,
@@ -140,22 +140,22 @@ class AppointmentAdmin(
 
     def get_readonly_fields(self, request, obj=None) -> tuple:
         readonly_fields = super().get_readonly_fields(request, obj=obj)
-        return (
-            readonly_fields
-            + visit_schedule_fields
-            + (
+        return tuple(
+            {
+                *readonly_fields,
+                *visit_schedule_fields,
                 "subject_identifier",
                 "timepoint",
                 "timepoint_datetime",
                 "visit_code_sequence",
                 "facility_name",
-            )
+            }
         )
 
     def get_search_fields(self, request) -> tuple[str, ...]:
         search_fields = super().get_search_fields(request)
         if "subject_identifier" not in search_fields:
-            search_fields = ("subject_identifier",) + search_fields
+            search_fields = tuple({"subject_identifier", *search_fields})
         return search_fields
 
     def has_delete_permission(self, request, obj=None):
@@ -165,19 +165,19 @@ class AppointmentAdmin(
         See `edc_visit_schedule.off_schedule_or_raise()`
         """
         has_delete_permission = super().has_delete_permission(request, obj=obj)
-        if has_delete_permission and obj:
-            if obj.visit_code_sequence == 0 or (
-                obj.visit_code_sequence != 0 and obj.appt_status != NEW_APPT
-            ):
-                try:
-                    off_schedule_or_raise(
-                        subject_identifier=obj.subject_identifier,
-                        report_datetime=obj.appt_datetime,
-                        visit_schedule_name=obj.visit_schedule_name,
-                        schedule_name=obj.schedule_name,
-                    )
-                except OnScheduleError:
-                    has_delete_permission = False
+        if (has_delete_permission and obj) and (
+            (obj.visit_code_sequence == 0)
+            or (obj.visit_code_sequence != 0 and obj.appt_status != NEW_APPT)
+        ):
+            try:
+                off_schedule_or_raise(
+                    subject_identifier=obj.subject_identifier,
+                    report_datetime=obj.appt_datetime,
+                    visit_schedule_name=obj.visit_schedule_name,
+                    schedule_name=obj.schedule_name,
+                )
+            except OnScheduleError:
+                has_delete_permission = False
         return has_delete_permission
 
     @admin.display(description="Timing", ordering="appt_timing")
@@ -262,7 +262,7 @@ class AppointmentAdmin(
             )
         return AppointmentType.objects.all().order_by("display_index")
 
-    def get_appt_reason_choices(self, request) -> tuple[Any, ...]:
+    def get_appt_reason_choices(self, request) -> tuple[Any, ...]:  # noqa: ARG002
         """Return a choices tuple.
 
         Important: left side of the tuple MUST have the default
@@ -280,13 +280,13 @@ class AppointmentAdmin(
             return tuple([tpl for tpl in APPT_TIMING if tpl[0] != NOT_APPLICABLE])
         return APPT_TIMING
 
-    def allow_skipped_appointments(self, request) -> bool:
+    def allow_skipped_appointments(self, request) -> bool:  # noqa: ARG002
         """Returns True if settings.EDC_APPOINTMENT_ALLOW_SKIPPED_APPT_USING
         has value.
 
         Relates to use of `SKIPPED_APPT` feature.
         """
-        return True if get_allow_skipped_appt_using() else False
+        return bool(get_allow_skipped_appt_using())
 
     def get_queryset(self, request):
         qs = super().get_queryset(request)

edc_appointment/admin/list_filters.py

@@ -34,10 +34,10 @@ class AppointmentStatusListFilter(SimpleListFilter):
     parameter_name = "appt_status"
     field_name = "appt_status"
 
-    def lookups(self, request, model_admin) -> tuple:
-        return APPT_STATUS + ((ATTENDED_APPT, "Attended (In progress, incomplete, done)"),)
+    def lookups(self, request, model_admin) -> tuple[tuple[str, str], ...]:  # noqa: ARG002
+        return *APPT_STATUS, (ATTENDED_APPT, "Attended (In progress, incomplete, done)")
 
-    def queryset(self, request, queryset):
+    def queryset(self, request, queryset):  # noqa: ARG002
         qs = None
         if self.value() == ATTENDED_APPT:
             qs = queryset.filter(
@@ -52,7 +52,7 @@ class AppointmentOverdueListFilter(SimpleListFilter):
     title = "Overdue (days)"
     parameter_name = "overdue"
 
-    def lookups(self, request, model_admin) -> tuple:
+    def lookups(self, request, model_admin) -> tuple[tuple[str, str], ...]:  # noqa: ARG002
         return (
             (LT_30_DAYS, _("2-30 days")),
             (GTE_30_TO_60_DAYS, _("30-60 days")),
@@ -61,7 +61,7 @@ class AppointmentOverdueListFilter(SimpleListFilter):
             (GTE_180, _("180+ days")),
         )
 
-    def queryset(self, request, queryset) -> QuerySet | None:
+    def queryset(self, request, queryset) -> QuerySet | None:  # noqa: ARG002
         now = timezone.now().replace(second=59, hour=23, minute=59)
         qs = None
         if self.value() == LT_30_DAYS:

edc_appointment/appointment_reason_updater.py

@@ -48,9 +48,10 @@ class AppointmentReasonUpdater(MetadataHelperMixin):
 
     def __init__(
         self,
-        appointment: Appointment = None,
-        appt_timing: str = None,
-        appt_reason: str = None,
+        *,
+        appointment: Appointment,
+        appt_timing: str,
+        appt_reason: str,
         commit: bool | None = None,
     ):
         self._related_visit = None
@@ -72,7 +73,7 @@ class AppointmentReasonUpdater(MetadataHelperMixin):
                 appointment=appointment, appt_timing=self.appt_timing
             )
         except (AppointmentBaselineError, UnscheduledAppointmentError) as e:
-            raise AppointmentReasonUpdaterError(e)
+            raise AppointmentReasonUpdaterError(e) from e
 
         self.appt_reason = appt_reason or self.appointment.appt_reason
 
@@ -163,7 +164,7 @@ class AppointmentReasonUpdater(MetadataHelperMixin):
                 )
         elif self.requisition_metadata_keyed_exists:
             raise AppointmentReasonUpdaterRequisitionsExistsError(
-                "Invalid. Requisitions have already been entered " "for this timepoint."
+                "Invalid. Requisitions have already been entered for this timepoint."
             )
 
     @property

edc_appointment/appointment_status_updater.py

@@ -33,9 +33,9 @@ class AppointmentStatusUpdater:
             self.appointment.appt_status = IN_PROGRESS_APPT
             self.appointment.save_base(update_fields=["appt_status"])
         if clear_others_in_progress:
-            for appointment in self.appointment.__class__.objects.filter(
+            for appt in self.appointment.__class__.objects.filter(
                 visit_schedule_name=self.appointment.visit_schedule_name,
                 schedule_name=self.appointment.schedule_name,
                 appt_status=IN_PROGRESS_APPT,
             ).exclude(id=self.appointment.id):
-                update_appt_status(appointment, save=True)
+                update_appt_status(appt, save=True)

edc_appointment/context_processors.py

@@ -8,11 +8,10 @@ from edc_appointment.constants import (
 
 
 def constants(request) -> dict:
-    dct = dict(
+    return dict(
         COMPLETE_APPT=COMPLETE_APPT,
         INCOMPLETE_APPT=INCOMPLETE_APPT,
         IN_PROGRESS_APPT=IN_PROGRESS_APPT,
         MISSED_APPT=MISSED_APPT,
         NEW_APPT=NEW_APPT,
     )
-    return dct

edc_appointment/creators/appointment_creator.py

@@ -38,16 +38,17 @@ if TYPE_CHECKING:
 class AppointmentCreator:
     def __init__(
         self,
-        timepoint_datetime: datetime = None,
+        *,
+        subject_identifier: str,
+        visit: Visit,  # from edc_visit_schedule
+        visit_schedule_name: str,
+        schedule_name: str,
+        timepoint_datetime: datetime,
         timepoint: Decimal | None = None,
-        visit: Visit | None = None,  # from edc_visit_schedule
         visit_code_sequence: int | None = None,
         facility: Facility | None = None,
-        appointment_model: str = None,
+        appointment_model: str | None = None,
         taken_datetimes: list[datetime] | None = None,
-        subject_identifier: str = None,
-        visit_schedule_name: str = None,
-        schedule_name: str = None,
         default_appt_type: str | None = None,
         default_appt_reason: str | None = None,
         appt_status: str | None = None,
@@ -89,10 +90,10 @@ class AppointmentCreator:
                     f"Naive datetime not allowed. {self!r}. Got {timepoint_datetime}"
                 )
             self.timepoint_datetime = timepoint_datetime
-        except AttributeError:
+        except AttributeError as e:
             raise AppointmentCreatorError(
                 f"Expected 'timepoint_datetime'. Got None. {self!r}."
-            )
+            ) from e
         # suggested_datetime (defaults to timepoint_datetime)
         # If provided, the rules for window period/rdelta relative
         # to timepoint_datetime still apply.

edc_appointment/creators/unscheduled_appointment_creator.py

@@ -6,8 +6,7 @@ from typing import TYPE_CHECKING, Any
 from dateutil.relativedelta import relativedelta
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
 
-from edc_utils import formatted_datetime, to_utc
-from edc_utils.date import to_local
+from edc_utils import formatted_date, formatted_datetime, to_local
 from edc_visit_schedule.site_visit_schedules import site_visit_schedules
 from edc_visit_schedule.utils import get_lower_datetime
 
@@ -49,13 +48,14 @@ class UnscheduledAppointmentCreator:
 
     def __init__(
         self,
-        subject_identifier: str = None,
-        visit_schedule_name: str = None,
-        schedule_name: str = None,
-        visit_code: str = None,
-        suggested_visit_code_sequence: int = None,
+        *,
+        subject_identifier: str,
+        visit_schedule_name: str,
+        schedule_name: str,
+        visit_code: str,
+        suggested_visit_code_sequence: int | None = None,
         suggested_appt_datetime: datetime | None = None,
-        facility: Facility = None,
+        facility: Facility | None = None,
         request: Any | None = None,
     ):
         self._parent_appointment = None
@@ -125,7 +125,7 @@ class UnscheduledAppointmentCreator:
                 appt_status=IN_PROGRESS_APPT,
             )
         except MultipleObjectsReturned as e:
-            raise UnscheduledAppointmentError(e)
+            raise UnscheduledAppointmentError(e) from e
         except ObjectDoesNotExist:
             pass
         else:
@@ -154,7 +154,7 @@ class UnscheduledAppointmentCreator:
             msg = str(e).replace("Perhaps catch this in the form", "")
             raise UnscheduledAppointmentError(
                 f"Unable to create unscheduled appointment. {msg}"
-            )
+            ) from e
         self.appointment = appointment_creator.appointment
 
     def has_perm_or_raise(self, request) -> None:
@@ -170,25 +170,32 @@ class UnscheduledAppointmentCreator:
     def suggested_appt_datetime(self):
         return self._suggested_appt_datetime
 
+    def after_calling_appt_or_raise(self, suggested_dte: datetime):
+        """Raises if on same day or before otherwise returns True"""
+        suggested_dt = to_local(suggested_dte).date()
+        calling_dt = to_local(self.calling_appointment.appt_datetime).date()
+        if suggested_dt <= calling_dt:
+            suggested = formatted_date(suggested_dt)
+            calling = formatted_date(calling_dt)
+            raise CreateAppointmentError(
+                "Suggested appointment date must be after the calling appointment date. "
+                f"Got {suggested} not after {calling}."
+            )
+        return True
+
     @suggested_appt_datetime.setter
-    def suggested_appt_datetime(self, value: datetime | None):
-        if value:
-            if to_utc(value).date() <= self.calling_appointment.appt_datetime.date():
-                raise CreateAppointmentError(
-                    "Suggested date/time must be after the calling appointment date/time"
-                )
-            self._suggested_appt_datetime = value
+    def suggested_appt_datetime(self, suggested_dte: datetime | None):
+        if suggested_dte and self.after_calling_appt_or_raise(suggested_dte):
+            self._suggested_appt_datetime = suggested_dte
         else:
             self._suggested_appt_datetime = (
                 self.calling_appointment.appt_datetime + relativedelta(days=1)
             )
-        if self.parent_appointment.next and to_utc(
-            self.suggested_appt_datetime
-        ) >= get_lower_datetime(self.parent_appointment.next):
-            dt = formatted_datetime(to_local(self.suggested_appt_datetime))
-            next_dt = formatted_datetime(
-                to_local(get_lower_datetime(self.parent_appointment.next))
-            )
+        if self.parent_appointment.next and self.suggested_appt_datetime >= get_lower_datetime(
+            self.parent_appointment.next
+        ):
+            dt = formatted_datetime(self.suggested_appt_datetime)
+            next_dt = formatted_datetime(get_lower_datetime(self.parent_appointment.next))
             raise UnscheduledAppointmentError(
                 "Appointment date exceeds window period. Next appointment is "
                 f"{self.parent_appointment.next.visit_code} and lower window starts "

edc_appointment/creators/utils.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 from datetime import datetime
 from typing import TYPE_CHECKING
 
@@ -7,7 +8,6 @@ from dateutil.relativedelta import relativedelta
 from django.db import transaction
 
 from ..constants import INCOMPLETE_APPT, NEW_APPT
-from ..utils import get_appointment_by_datetime
 from .unscheduled_appointment_creator import (
     CreateAppointmentError,
     UnscheduledAppointmentCreator,
@@ -18,13 +18,14 @@ if TYPE_CHECKING:
 
 
 def create_next_appointment_as_interim(
-    next_appt_datetime: datetime = None, appointment: Appointment = None
+    appointment: Appointment, next_appt_datetime: datetime | None = None
 ) -> Appointment | None:
-    return create_unscheduled_appointment(next_appt_datetime, appointment)
+    return create_unscheduled_appointment(appointment, next_appt_datetime=next_appt_datetime)
 
 
 def create_unscheduled_appointment(
-    next_appt_datetime: datetime = None, appointment: Appointment = None
+    appointment: Appointment,
+    next_appt_datetime: datetime | None = None,
 ) -> Appointment | None:
     """Create and return an unscheduled appointment if
     `next_appt_datetime` is within the window period of
@@ -35,36 +36,33 @@ def create_unscheduled_appointment(
     next_appt_datetime = next_appt_datetime or appointment.appt_datetime + relativedelta(
         days=1
     )
-    next_appointment = get_appointment_by_datetime(
-        next_appt_datetime,
-        appointment.subject_identifier,
-        appointment.visit_schedule_name,
-        appointment.schedule_name,
-        raise_if_in_gap=False,
-    )
-    if appointment == next_appointment:
-        if (
-            appointment.relative_next
-            and appointment.relative_next.appt_status == NEW_APPT
-            and appointment.relative_next.visit_code_sequence > 0
-        ):
-            appointment.relative_next.delete()
-        appt_status = appointment.appt_status
-        appointment.appt_status = INCOMPLETE_APPT
-        appointment.save_base(update_fields=["appt_status"])
-        with transaction.atomic():
-            try:
-                unscheduled_appointment = UnscheduledAppointmentCreator(
-                    subject_identifier=appointment.subject_identifier,
-                    visit_schedule_name=appointment.visit_schedule_name,
-                    schedule_name=appointment.schedule_name,
-                    visit_code=appointment.visit_code,
-                    facility=appointment.facility,
-                    suggested_appt_datetime=next_appt_datetime,
-                    suggested_visit_code_sequence=appointment.visit_code_sequence + 1,
-                )
-            except CreateAppointmentError:
-                pass
-        appointment.appt_status = appt_status
-        appointment.save_base(update_fields=["appt_status"])
-    return unscheduled_appointment
+    # next_appointment = get_appointment_by_datetime(
+    #     next_appt_datetime,
+    #     appointment.subject_identifier,
+    #     appointment.visit_schedule_name,
+    #     appointment.schedule_name,
+    #     raise_if_in_gap=False,
+    # )
+    # if appointment == next_appointment:
+    if (
+        appointment.relative_next
+        and appointment.relative_next.appt_status == NEW_APPT
+        and appointment.relative_next.visit_code_sequence > 0
+    ):
+        appointment.relative_next.delete()
+    appt_status = appointment.appt_status
+    appointment.appt_status = INCOMPLETE_APPT
+    appointment.save_base(update_fields=["appt_status"])
+    with transaction.atomic(), contextlib.suppress(CreateAppointmentError):
+        unscheduled_appointment = UnscheduledAppointmentCreator(
+            subject_identifier=appointment.subject_identifier,
+            visit_schedule_name=appointment.visit_schedule_name,
+            schedule_name=appointment.schedule_name,
+            visit_code=appointment.visit_code,
+            facility=appointment.facility,
+            suggested_appt_datetime=next_appt_datetime,
+            suggested_visit_code_sequence=appointment.visit_code_sequence + 1,
+        )
+    appointment.appt_status = appt_status
+    appointment.save_base(update_fields=["appt_status"])
+    return getattr(unscheduled_appointment, "appointment", None)

edc_appointment/exceptions.py

@@ -30,7 +30,7 @@ class AppointmentDatetimeError(Exception):
     pass
 
 
-class UnknownVisitCode(Exception):
+class UnknownVisitCode(Exception):  # noqa: N818
     pass
 
 
@@ -38,7 +38,7 @@ class AppointmentWindowError(Exception):
     pass
 
 
-class AppointmentPermissionsRequired(Exception):
+class AppointmentPermissionsRequired(Exception):  # noqa: N818
     pass
 
 
@@ -46,7 +46,7 @@ class AppointmentMissingValuesError(Exception):
     pass
 
 
-class UnscheduledAppointmentNotAllowed(Exception):
+class UnscheduledAppointmentNotAllowed(Exception):  # noqa: N818
     pass
 
 

edc_appointment/form_runners.py

@@ -7,5 +7,5 @@ from edc_form_runners.form_runner import FormRunner
 @register()
 class AppointmentFormRunner(FormRunner):
     model_name = "edc_appointment.appointment"
-    extra_fieldnames = ["appt_datetime"]
-    exclude_formfields = ["appt_close_datetime"]
+    extra_fieldnames = ("appt_datetime",)
+    exclude_formfields = ("appt_close_datetime",)

edc_appointment/form_validator_mixins/next_appointment_crf_form_validator_mixin.py

@@ -82,7 +82,7 @@ class NextAppointmentCrfFormValidatorMixin(FormValidator):
                 visit_code=self.visit_code,
                 visit_code_sequence=0,
             )
-        except ObjectDoesNotExist:
+        except ObjectDoesNotExist as e:
             self.raise_validation_error(
                 {
                     self.visit_code_fld: (
@@ -91,6 +91,7 @@ class NextAppointmentCrfFormValidatorMixin(FormValidator):
                     )
                 },
                 INVALID_ERROR,
+                exc=e,
             )
         if instance == self.related_visit.appointment:
             self.raise_validation_error(
@@ -117,7 +118,7 @@ class NextAppointmentCrfFormValidatorMixin(FormValidator):
             appointment_validator.validate()
         except ValidationError as e:
             if e.message_dict.get("appt_datetime"):
-                raise ValidationError({"appt_date": e.message_dict["appt_datetime"]})
+                raise ValidationError({"appt_date": e.message_dict["appt_datetime"]}) from e
             raise
 
     @property
@@ -134,9 +135,8 @@ class NextAppointmentCrfFormValidatorMixin(FormValidator):
 
     @property
     def clinic_days(self) -> list[int]:
-        if not self._clinic_days:
-            if self.cleaned_data.get("health_facility"):
-                self._clinic_days = self.health_facility.clinic_days
+        if not self._clinic_days and self.cleaned_data.get("health_facility"):
+            self._clinic_days = self.health_facility.clinic_days
         return self._clinic_days
 
     def validate_date_is_on_clinic_day(self):

edc_appointment/form_validator_mixins/window_period_form_validator_mixin.py

@@ -38,7 +38,7 @@ class WindowPeriodFormValidatorMixin:
             and appointment.visit_code_sequence > 0
             and appointment.next
             and appointment.next.appt_status in [INCOMPLETE_APPT, COMPLETE_APPT]
-            and to_local(proposed_appt_datetime) < to_local(appointment.next.appt_datetime)
+            and proposed_appt_datetime < appointment.next.appt_datetime
         ):
             value = True
         return value
@@ -52,13 +52,11 @@ class WindowPeriodFormValidatorMixin:
         if proposed_appt_datetime:
             try:
                 appointment.schedule.datetime_in_window(
-                    timepoint_datetime=to_local(appointment.timepoint_datetime),
-                    dt=to_local(proposed_appt_datetime),
+                    timepoint_datetime=appointment.timepoint_datetime,
+                    dt=proposed_appt_datetime,
                     visit_code=appointment.visit_code,
                     visit_code_sequence=appointment.visit_code_sequence,
-                    baseline_timepoint_datetime=to_local(
-                        self.baseline_timepoint_datetime(appointment)
-                    ),
+                    baseline_timepoint_datetime=self.baseline_timepoint_datetime(appointment),
                 )
             except UnScheduledVisitWindowError:
                 if not self.ignore_window_period_for_unscheduled(
@@ -90,7 +88,9 @@ class WindowPeriodFormValidatorMixin:
                         UNSCHEDULED_WINDOW_ERROR,
                     )
             except ScheduledVisitWindowError as e:
-                self.raise_validation_error({form_field: (str(e))}, SCHEDULED_WINDOW_ERROR)
+                self.raise_validation_error(
+                    {form_field: (str(e))}, SCHEDULED_WINDOW_ERROR, exc=e
+                )
 
     @staticmethod
     def baseline_timepoint_datetime(appointment: Appointment) -> datetime: