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

edc_adverse_event/model_mixins/death_report/simple_death_report_model_mixin.py

@@ -1,4 +1,5 @@
 from django.db import models
+from django.utils import timezone
 
 from edc_action_item.managers import (
     ActionIdentifierModelManager,
@@ -9,7 +10,6 @@ from edc_identifier.model_mixins import UniqueSubjectIdentifierFieldMixin
 from edc_model.validators import date_not_future, datetime_not_future
 from edc_protocol.validators import datetime_not_before_study_start
 from edc_sites.model_mixins import SiteModelMixin
-from edc_utils import get_utcnow
 
 from ...constants import DEATH_REPORT_ACTION
 
@@ -27,7 +27,7 @@ class SimpleDeathReportModelMixin(
     report_datetime = models.DateTimeField(
         verbose_name="Report Date",
         validators=[datetime_not_before_study_start, datetime_not_future],
-        default=get_utcnow,
+        default=timezone.now,
     )
 
     death_datetime = models.DateTimeField(

edc_adverse_event/model_mixins/hospitaization/hospitalization_model_mixin.py

@@ -1,22 +1,23 @@
 from django.db import models
+from django.utils import timezone
 
 from edc_constants.choices import YES_NO, YES_NO_UNKNOWN
 from edc_constants.constants import NOT_APPLICABLE
 from edc_identifier.model_mixins import NonUniqueSubjectIdentifierFieldMixin
 from edc_model import models as edc_models
 from edc_model.validators import date_not_future, datetime_not_future
+from edc_model_fields.fields import IsDateEstimatedField
 from edc_protocol.validators import (
     date_not_before_study_start,
     datetime_not_before_study_start,
 )
-from edc_utils import get_utcnow
 
 
 class HospitalizationModelMixin(NonUniqueSubjectIdentifierFieldMixin, models.Model):
     report_datetime = models.DateTimeField(
         verbose_name="Report Date",
         validators=[datetime_not_before_study_start, datetime_not_future],
-        default=get_utcnow,
+        default=timezone.now,
     )
 
     have_details = models.CharField(
@@ -30,7 +31,7 @@ class HospitalizationModelMixin(NonUniqueSubjectIdentifierFieldMixin, models.Mod
         validators=[date_not_future, date_not_before_study_start],
     )
 
-    admitted_date_estimated = edc_models.IsDateEstimatedField(
+    admitted_date_estimated = IsDateEstimatedField(
         verbose_name="Is this date estimated?",
     )
 

edc_adverse_event/modeladmin_mixins/death_report_admin_mixin.py

@@ -4,6 +4,7 @@ from django.contrib import admin
 from django.contrib.admin import display
 from django.template.loader import render_to_string
 from django.urls import NoReverseMatch, reverse
+from django.utils import timezone
 from django_audit_fields.admin import audit_fieldset_tuple
 
 from edc_action_item.fieldsets import action_fieldset_tuple
@@ -12,7 +13,6 @@ from edc_constants.constants import CANCELLED, OTHER
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.list_filters import ReportDateListFilter
 from edc_pdf_reports.admin import PdfButtonModelAdminMixin, print_selected_to_pdf_action
-from edc_utils import get_utcnow
 
 from ..utils import get_adverse_event_app_label
 from .list_filters import CauseOfDeathListFilter, DeathDateListFilter
@@ -111,14 +111,14 @@ class DeathReportModelAdminMixin(
     def report_datetime_with_ago(self, obj=None):
         return render_to_string(
             "edc_adverse_event/datetime_with_ago.html",
-            dict(utc_date=get_utcnow().date, report_datetime=obj.report_datetime),
+            dict(utc_date=timezone.now().date, report_datetime=obj.report_datetime),
         )
 
     @display(description="Death date", ordering="death_datetime")
     def death_datetime_with_ago(self, obj=None):
         return render_to_string(
             "edc_adverse_event/datetime_with_ago.html",
-            dict(utc_date=get_utcnow().date, report_datetime=obj.death_datetime),
+            dict(utc_date=timezone.now().date, report_datetime=obj.death_datetime),
         )
 
     @display(description="Action item", ordering="action_identifier")

edc_adverse_event/models/signals.py

@@ -2,17 +2,17 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.db import transaction
 from django.db.models.signals import m2m_changed, post_delete, post_save
 from django.dispatch.dispatcher import receiver
+from django.utils import timezone
 
 from edc_constants.constants import NO, YES
 from edc_notification.models import Notification
-from edc_utils import get_utcnow
 
 from ..constants import AE_TMG_ACTION, DEATH_REPORT_TMG_ACTION, TMG
 from ..utils import get_ae_model
 
 
 @receiver(m2m_changed, weak=False, dispatch_uid="update_ae_notifications_for_tmg_group")
-def update_ae_notifications_for_tmg_group(action, instance, **kwargs):  # noqa: ARG001
+def update_ae_notifications_for_tmg_group(action, instance, **kwargs):
     if getattr(instance, "userprofile", None):
         try:
             tmg_ae_notification = Notification.objects.get(name=AE_TMG_ACTION)
@@ -29,7 +29,7 @@ def update_ae_notifications_for_tmg_group(action, instance, **kwargs):  # noqa:
 
 
 @receiver(post_save, weak=False, dispatch_uid="update_ae_initial_for_susar")
-def update_ae_initial_for_susar(sender, instance, raw, update_fields, **kwargs):  # noqa: ARG001
+def update_ae_initial_for_susar(sender, instance, raw, update_fields, **kwargs):
     if not raw and not update_fields:
         try:
             ae_susar_model_cls = get_ae_model("AeSusar")
@@ -55,7 +55,7 @@ def update_ae_initial_for_susar(sender, instance, raw, update_fields, **kwargs):
     weak=False,
     dispatch_uid="update_ae_initial_susar_reported",
 )
-def update_ae_initial_susar_reported(sender, instance, raw, update_fields, **kwargs):  # noqa: ARG001
+def update_ae_initial_susar_reported(sender, instance, raw, update_fields, **kwargs):
     if not raw and not update_fields:
         try:
             ae_initial_model_cls = get_ae_model("AeInitial")
@@ -72,12 +72,12 @@ def update_ae_initial_susar_reported(sender, instance, raw, update_fields, **kwa
                             ae_susar_model_cls.objects.get(ae_initial=instance)
                     except ObjectDoesNotExist:
                         ae_susar_model_cls.objects.create(
-                            ae_initial=instance, submitted_datetime=get_utcnow()
+                            ae_initial=instance, submitted_datetime=timezone.now()
                         )
 
 
 @receiver(post_delete, weak=False, dispatch_uid="post_delete_ae_susar")
-def post_delete_ae_susar(instance, **kwargs):  # noqa: ARG001
+def post_delete_ae_susar(instance, **kwargs):
     try:
         ae_susar_model_cls = get_ae_model("AeSusar")
     except LookupError:
@@ -93,7 +93,7 @@ def post_delete_ae_susar(instance, **kwargs):  # noqa: ARG001
 
 
 @receiver(m2m_changed, weak=False, dispatch_uid="update_death_notifications_for_tmg_group")
-def update_death_notifications_for_tmg_group(action, instance, **kwargs):  # noqa: ARG001
+def update_death_notifications_for_tmg_group(action, instance, **kwargs):
     if getattr(instance, "userprofile", None):
         try:
             tmg_death_notification = Notification.objects.get(name=DEATH_REPORT_TMG_ACTION)

edc_adverse_event/templatetags/edc_adverse_event_extras.py

@@ -10,6 +10,7 @@ from django.conf import settings
 from django.contrib.messages import ERROR
 from django.core.exceptions import ObjectDoesNotExist
 from django.template.loader import select_template
+from django.utils import timezone
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext as _
@@ -17,7 +18,7 @@ from django.utils.translation import gettext as _
 from edc_action_item.utils import get_reference_obj
 from edc_constants.constants import CLOSED, OPEN, OTHER, YES
 from edc_model_admin.utils import add_to_messages_once
-from edc_utils import escape_braces, get_utcnow
+from edc_utils import escape_braces
 
 from ..constants import (
     AE_TMG_ACTION,
@@ -81,7 +82,7 @@ def select_description_template(model):
 
 @register.inclusion_tag(select_description_template("aeinitial"), takes_context=True)
 def format_ae_description(context, ae_initial, wrap_length):
-    context["utc_date"] = get_utcnow().date()
+    context["utc_date"] = timezone.now().date()
     context["SHORT_DATE_FORMAT"] = settings.SHORT_DATE_FORMAT
     context["OTHER"] = OTHER
     context["YES"] = YES
@@ -103,7 +104,7 @@ def format_ae_description(context, ae_initial, wrap_length):
 @register.inclusion_tag(select_description_template("aefollowup"), takes_context=True)
 def format_ae_followup_description(context, ae_followup, wrap_length):
     context["AE_WITHDRAWN"] = AE_WITHDRAWN
-    context["utc_date"] = get_utcnow().date()
+    context["utc_date"] = timezone.now().date()
     context["SHORT_DATE_FORMAT"] = settings.SHORT_DATE_FORMAT
     context["OTHER"] = OTHER
     context["YES"] = YES
@@ -131,7 +132,7 @@ def format_ae_followup_description(context, ae_followup, wrap_length):
 
 @register.inclusion_tag(select_description_template("aesusar"), takes_context=True)
 def format_ae_susar_description(context, ae_susar, wrap_length):
-    context["utc_date"] = get_utcnow().date()
+    context["utc_date"] = timezone.now().date()
     context["SHORT_DATE_FORMAT"] = settings.SHORT_DATE_FORMAT
     context["OTHER"] = OTHER
     context["YES"] = YES

edc_adverse_event/view_mixins/ae/ae_listboard_view_mixin.py

@@ -4,6 +4,7 @@ from typing import TYPE_CHECKING, Any
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.template.loader import render_to_string
+from django.utils import timezone
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
@@ -12,7 +13,6 @@ from edc_dashboard.view_mixins import EdcViewMixin
 from edc_listboard.view_mixins import ListboardFilterViewMixin, SearchFormViewMixin
 from edc_listboard.views import ListboardView as BaseListboardView
 from edc_navbar import NavbarViewMixin
-from edc_utils import get_utcnow
 
 from ...constants import AE_INITIAL_ACTION
 from ...pdf_reports import AePdfReport
@@ -43,9 +43,7 @@ class AeListboardViewMixin(
 
     listboard_instructions = format_html(
         "{}",
-        mark_safe(
-            render_to_string("edc_adverse_event/ae/ae_listboard_instructions.html")
-        ),  # nosec B703 B308,
+        mark_safe(render_to_string("edc_adverse_event/ae/ae_listboard_instructions.html")),  # nosec B703 B308,
     )
     navbar_selected_item = "ae_home"
     ordering = "-report_datetime"
@@ -78,7 +76,7 @@ class AeListboardViewMixin(
     def get_context_data(self, **kwargs) -> dict[str, Any]:
         kwargs.update(
             AE_INITIAL_ACTION=AE_INITIAL_ACTION,
-            utc_date=get_utcnow().date(),
+            utc_date=timezone.now().date(),
             **self.add_url_to_context(
                 new_key="ae_home_url",
                 existing_key=self.home_url,

edc_adverse_event/view_mixins/ae/death_report_listboard_view_mixin.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 
 from django.core.exceptions import ObjectDoesNotExist
+from django.utils import timezone
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
@@ -11,7 +12,6 @@ from edc_dashboard.view_mixins import EdcViewMixin
 from edc_listboard.view_mixins import ListboardFilterViewMixin, SearchFormViewMixin
 from edc_listboard.views import ListboardView as BaseListboardView
 from edc_navbar import NavbarViewMixin
-from edc_utils import get_utcnow
 
 from ...constants import DEATH_REPORT_ACTION
 from ...pdf_reports import DeathPdfReport
@@ -40,25 +40,23 @@ class DeathReportListboardViewMixin(
     listboard_view_permission_codename = "edc_adverse_event.view_ae_listboard"
     listboard_instructions = format_html(
         "{}",
-        mark_safe(
-            "edc_adverse_event/ae/death_report_listboard_instructions.html"
-        ),  # nosec B703 B308
+        mark_safe("edc_adverse_event/ae/death_report_listboard_instructions.html"),  # nosec B703 B308
     )
 
     navbar_selected_item = "ae_home"
     ordering = "-report_datetime"
     paginate_by = 25
     search_form_url = "death_report_listboard_url"
-    action_type_names = [DEATH_REPORT_ACTION]
+    action_type_names = (DEATH_REPORT_ACTION,)
 
-    search_fields = [
+    search_fields = (
         "subject_identifier",
         "action_identifier",
         "parent_action_item__action_identifier",
         "related_action_item__action_identifier",
         "user_created",
         "user_modified",
-    ]
+    )
 
     def get(self, request, *args, **kwargs):
         if request.GET.get("pdf"):
@@ -71,7 +69,7 @@ class DeathReportListboardViewMixin(
     def get_context_data(self, **kwargs) -> dict[str, Any]:
         kwargs.update(
             DEATH_REPORT_ACTION=DEATH_REPORT_ACTION,
-            utc_date=get_utcnow().date(),
+            utc_date=timezone.now().date(),
             **self.add_url_to_context(
                 new_key="ae_home_url",
                 existing_key=self.home_url,

edc_adverse_event/view_mixins/tmg/tmg_ae_listboard_view_mixin.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 
 from django.db.models import Min
+from django.utils import timezone
 
 from edc_constants.constants import CLOSED, NEW, OPEN
 from edc_dashboard.view_mixins import EdcViewMixin
@@ -10,7 +11,6 @@ from edc_listboard.view_mixins import ListboardFilterViewMixin, SearchFormViewMi
 from edc_listboard.views import ListboardView as BaseListboardView
 from edc_navbar import NavbarViewMixin
 from edc_navbar.get_default_navbar import get_default_navbar
-from edc_utils import get_utcnow
 
 from ...constants import (
     AE_TMG_ACTION,
@@ -69,7 +69,7 @@ class TmgAeListboardViewMixin(
     def get_context_data(self, **kwargs) -> dict[str, Any]:
         kwargs.update(
             AE_TMG_ACTION=AE_TMG_ACTION,
-            utc_date=get_utcnow().date(),
+            utc_date=timezone.now().date(),
             subject_identifier=self.kwargs.get("subject_identifier"),
         )
         return super().get_context_data(**kwargs)

edc_adverse_event/views/tmg/summary_listboard_view.py

@@ -2,11 +2,12 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
+from django.utils import timezone
+
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_listboard.view_mixins import ListboardFilterViewMixin, SearchFormViewMixin
 from edc_listboard.views import ListboardView as BaseListboardView
 from edc_navbar import NavbarViewMixin
-from edc_utils import get_utcnow
 
 from ...constants import (
     AE_FOLLOWUP_ACTION,
@@ -57,7 +58,7 @@ class SummaryListboardView(
     ]
 
     def get_context_data(self, **kwargs) -> dict[str, Any]:
-        kwargs.update(AE_TMG_ACTION=AE_TMG_ACTION, utc_date=get_utcnow().date())
+        kwargs.update(AE_TMG_ACTION=AE_TMG_ACTION, utc_date=timezone.now().date())
         return super().get_context_data(**kwargs)
 
     def get_queryset_filter_options(self, request, *args, **kwargs) -> tuple[Q, dict]:

edc_appointment/admin/appointment_admin.py

@@ -7,6 +7,7 @@ from django.contrib import admin
 from django.db.models import DurationField, ExpressionWrapper, F
 from django.template.loader import render_to_string
 from django.urls import reverse
+from django.utils import timezone
 from django.utils.html import format_html
 from django.utils.translation import gettext as _
 from django_audit_fields.admin import audit_fieldset_tuple
@@ -19,7 +20,6 @@ from edc_document_status.modeladmin_mixins import DocumentStatusModelAdminMixin
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
 from edc_sites.admin import SiteModelAdminMixin
-from edc_utils import get_utcnow
 from edc_visit_schedule.admin import ScheduleStatusListFilter
 from edc_visit_schedule.exceptions import OnScheduleError
 from edc_visit_schedule.fieldsets import (
@@ -290,7 +290,7 @@ class AppointmentAdmin(
 
     def get_queryset(self, request):
         qs = super().get_queryset(request)
-        now = get_utcnow().replace(second=59, hour=23, minute=59)
+        now = timezone.now().replace(second=59, hour=23, minute=59)
         return qs.annotate(
             appt_timepoint_delta=ExpressionWrapper(
                 (F("appt_datetime") - F("timepoint_datetime")),

edc_appointment/admin/list_filters.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from dateutil.relativedelta import relativedelta
 from django.contrib.admin import SimpleListFilter
 from django.db.models import QuerySet
+from django.utils import timezone
 from django.utils.translation import gettext as _
 
 from edc_appointment.choices import APPT_STATUS
@@ -18,7 +19,6 @@ from edc_appointment.constants import (
     LT_30_DAYS,
 )
 from edc_model_admin.list_filters import FutureDateListFilter
-from edc_utils import get_utcnow
 
 
 class AppointmentListFilter(FutureDateListFilter):
@@ -62,7 +62,7 @@ class AppointmentOverdueListFilter(SimpleListFilter):
         )
 
     def queryset(self, request, queryset) -> QuerySet | None:
-        now = get_utcnow().replace(second=59, hour=23, minute=59)
+        now = timezone.now().replace(second=59, hour=23, minute=59)
         qs = None
         if self.value() == LT_30_DAYS:
             qs = queryset.filter(

edc_appointment/form_validators/appointment_form_validator.py

@@ -6,6 +6,7 @@ from typing import TYPE_CHECKING, Any
 from django.apps import apps as django_apps
 from django.conf import settings
 from django.urls import reverse
+from django.utils import timezone
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
@@ -16,7 +17,7 @@ from edc_form_validators import INVALID_ERROR
 from edc_form_validators.form_validator import FormValidator
 from edc_metadata.metadata_helper import MetadataHelperMixin
 from edc_sites.form_validator_mixin import SiteFormValidatorMixin
-from edc_utils import formatted_datetime, get_utcnow, to_utc
+from edc_utils import formatted_datetime, to_utc
 from edc_utils.date import to_local
 from edc_visit_schedule.site_visit_schedules import site_visit_schedules
 from edc_visit_schedule.subject_schedule import NotOnScheduleError
@@ -136,19 +137,23 @@ class AppointmentFormValidator(
             self.instance, "id", None
         ):
             previous_appt = get_previous_appointment(self.instance, include_interim=True)
-            if previous_appt and previous_appt.appt_status not in [
-                CANCELLED_APPT,
-                SKIPPED_APPT,
-            ]:
-                if not previous_appt.related_visit:
-                    self.raise_validation_error(
-                        message=(
-                            "A previous appointment requires a visit report. "
-                            f"Update appointment {previous_appt.visit_code}."
-                            f"{previous_appt.visit_code_sequence} first."
-                        ),
-                        error_code=INVALID_PREVIOUS_VISIT_MISSING,
-                    )
+            if (
+                previous_appt
+                and previous_appt.appt_status
+                not in [
+                    CANCELLED_APPT,
+                    SKIPPED_APPT,
+                ]
+                and not previous_appt.related_visit
+            ):
+                self.raise_validation_error(
+                    message=(
+                        "A previous appointment requires a visit report. "
+                        f"Update appointment {previous_appt.visit_code}."
+                        f"{previous_appt.visit_code_sequence} first."
+                    ),
+                    error_code=INVALID_PREVIOUS_VISIT_MISSING,
+                )
         return True
 
     def validate_appt_sequence(self: Any) -> bool:
@@ -158,33 +163,45 @@ class AppointmentFormValidator(
         Check if previous appointment appt_status is NEW_APPT
 
         """
-        if self.cleaned_data.get("appt_status") in [
-            IN_PROGRESS_APPT,
-            INCOMPLETE_APPT,
-            COMPLETE_APPT,
-        ]:
-            if self.instance.previous:
-                if obj := (
-                    self.appointment_model_cls.objects.filter(
-                        subject_identifier=self.subject_identifier,
-                        visit_schedule_name=self.instance.visit_schedule_name,
-                        schedule_name=self.instance.schedule_name,
-                        appt_status=NEW_APPT,
-                        appt_datetime__lt=self.instance.appt_datetime,
-                    )
-                    .order_by("timepoint", "visit_code_sequence")
-                    .first()
-                ):
-                    self.raise_validation_error(
-                        {
-                            "__all__": _(
-                                "A previous appointment requires updating. "
-                                f"Update appointment {obj.visit_code}."
-                                f"{obj.visit_code_sequence} first."
-                            )
-                        },
-                        INVALID_PREVIOUS_APPOINTMENT_NOT_UPDATED,
+        if (
+            self.cleaned_data.get("appt_status")
+            in [
+                IN_PROGRESS_APPT,
+                INCOMPLETE_APPT,
+                COMPLETE_APPT,
+            ]
+            and self.instance.previous
+        ) and (
+            obj := (
+                self.appointment_model_cls.objects.filter(
+                    subject_identifier=self.subject_identifier,
+                    visit_schedule_name=self.instance.visit_schedule_name,
+                    schedule_name=self.instance.schedule_name,
+                    appt_status=NEW_APPT,
+                    appt_datetime__lt=self.instance.appt_datetime,
+                )
+                .order_by("timepoint", "visit_code_sequence")
+                .first()
+            )
+        ):
+            errmsg = (
+                "A previous appointment requires updating. "
+                "Update appointment %(visit_code)s."
+                "%(visit_code_sequence)s first."
+            )
+
+            self.raise_validation_error(
+                {
+                    "__all__": _(
+                        errmsg
+                        % dict(
+                            visit_code=obj.visit_code,
+                            visit_code_sequence=obj.visit_code_sequence,
+                        )
                     )
+                },
+                INVALID_PREVIOUS_APPOINTMENT_NOT_UPDATED,
+            )
         return True
 
     def validate_timepoint(self: Any):
@@ -202,12 +219,15 @@ class AppointmentFormValidator(
     def validate_not_future_appt_datetime(self: Any) -> None:
         appt_datetime = self.cleaned_data.get("appt_datetime")
         appt_status = self.cleaned_data.get("appt_status")
-        if appt_datetime and appt_status != NEW_APPT:
-            if to_utc(appt_datetime) > get_utcnow():
-                self.raise_validation_error(
-                    {"appt_datetime": "Cannot be a future date/time."},
-                    INVALID_APPT_DATE,
-                )
+        if (
+            appt_datetime
+            and appt_status != NEW_APPT
+            and to_utc(appt_datetime) > timezone.now()
+        ):
+            self.raise_validation_error(
+                {"appt_datetime": "Cannot be a future date/time."},
+                INVALID_APPT_DATE,
+            )
 
     def validate_appt_datetime_not_before_consent_datetime(self: Any) -> None:
         if (
@@ -291,42 +311,46 @@ class AppointmentFormValidator(
     def validate_appt_datetime_not_before_previous_appt_datetime(self):
         appt_datetime = self.cleaned_data.get("appt_datetime")
         appt_status = self.cleaned_data.get("appt_status")
-        if appt_datetime and appt_status and appt_status != NEW_APPT:
-            if self.instance.relative_previous:
-                if to_utc(appt_datetime) < self.instance.relative_previous.appt_datetime:
-                    formatted_date = formatted_datetime(
-                        self.instance.relative_previous.appt_datetime
-                    )
-                    self.raise_validation_error(
-                        {
-                            "appt_datetime": (
-                                "Cannot be before previous appointment. Previous appointment "
-                                f"is {self.instance.relative_previous.visit_label} "
-                                f"on {formatted_date}."
-                            )
-                        },
-                        INVALID_APPT_DATE,
+        if (
+            appt_datetime
+            and appt_status
+            and appt_status != NEW_APPT
+            and self.instance.relative_previous
+            and to_utc(appt_datetime) < self.instance.relative_previous.appt_datetime
+        ):
+            formatted_date = formatted_datetime(self.instance.relative_previous.appt_datetime)
+            self.raise_validation_error(
+                {
+                    "appt_datetime": (
+                        "Cannot be before previous appointment. Previous appointment "
+                        f"is {self.instance.relative_previous.visit_label} "
+                        f"on {formatted_date}."
                     )
+                },
+                INVALID_APPT_DATE,
+            )
 
     def validate_appt_datetime_not_after_next_appt_datetime(self) -> None:
         appt_datetime = self.cleaned_data.get("appt_datetime")
         appt_status = self.cleaned_data.get("appt_status")
-        if appt_datetime and appt_status and appt_status != NEW_APPT:
-            if self.instance.relative_next:
-                if to_utc(appt_datetime) > self.instance.relative_next.appt_datetime:
-                    formatted_date = formatted_datetime(
-                        self.instance.relative_next.appt_datetime
-                    )
-                    self.raise_validation_error(
-                        {
-                            "appt_datetime": (
-                                "Cannot be after next appointment. Next appointment is "
-                                f"{self.instance.relative_next.visit_label} "
-                                f"on {formatted_date}."
-                            )
-                        },
-                        INVALID_APPT_DATE,
+        if (
+            appt_datetime
+            and appt_status
+            and appt_status != NEW_APPT
+            and self.instance.relative_next
+            and to_utc(appt_datetime) > self.instance.relative_next.appt_datetime
+        ):
+            formatted_date = formatted_datetime(self.instance.relative_next.appt_datetime)
+            self.raise_validation_error(
+                {
+                    "appt_datetime": (
+                        "Cannot be after next appointment. Next appointment is "
+                        f"{self.instance.relative_next.visit_label} "
+                        f"on {formatted_date}."
                     )
+                },
+                INVALID_APPT_DATE,
+            )
 
     def validate_appt_incomplete_and_visit_report(self: Any) -> None:
         """Require a visit report, at least, if wanting to set appt_status
@@ -502,12 +526,14 @@ class AppointmentFormValidator(
 
         Is this still used?
         """
-        if self.cleaned_data.get("facility_name"):
-            if self.cleaned_data.get("facility_name") not in get_facilities():
-                self.raise_validation_error(
-                    {"__all__": f"Facility '{self.facility_name}' does not exist."},
-                    INVALID_ERROR,
-                )
+        if (
+            self.cleaned_data.get("facility_name")
+            and self.cleaned_data.get("facility_name") not in get_facilities()
+        ):
+            self.raise_validation_error(
+                {"__all__": f"Facility '{self.facility_name}' does not exist."},
+                INVALID_ERROR,
+            )
 
     def validate_appt_type(self):
         self.not_applicable_if(SKIPPED_APPT, field="appt_status", field_applicable="appt_type")