clinicedc 2.0.1__py3-none-any.whl → 2.0.2__py3-none-any.whl

edc_adverse_event/model_mixins/death_report/simple_death_report_model_mixin.py

@@ -58,7 +58,5 @@ class SimpleDeathReportModelMixin(
         verbose_name = "Death Report"
         verbose_name_plural = "Death Reports"
         indexes = ActionModelMixin.Meta.indexes + [
-            models.Index(
-                fields=["subject_identifier", "action_identifier", "site", "id"]
-            )
+            models.Index(fields=["subject_identifier", "action_identifier", "site", "id"])
         ]

edc_adverse_event/modeladmin_mixins/ae_tmg_admin_mixin.py

@@ -107,9 +107,7 @@ class AeTmgModelAdminMixin(
         initial = super().get_changeform_initial_data(request)
         ae_initial_model_cls = get_ae_model("aeinitial")
         try:
-            ae_initial = ae_initial_model_cls.objects.get(
-                pk=request.GET.get("ae_initial")
-            )
+            ae_initial = ae_initial_model_cls.objects.get(pk=request.GET.get("ae_initial"))
         except ObjectDoesNotExist:
             pass
         else:

edc_adverse_event/modeladmin_mixins/death_report_admin_mixin.py

@@ -104,9 +104,7 @@ class DeathReportModelAdminMixin(
         if cause_of_death == OTHER:
             cause_of_death = f"Other: {obj.cause_of_death_other}"
         else:
-            cause_of_death = getattr(
-                obj.cause_of_death, "display_name", obj.cause_of_death
-            )
+            cause_of_death = getattr(obj.cause_of_death, "display_name", obj.cause_of_death)
         return cause_of_death
 
     @display(description="Report date", ordering="report_datetime")
@@ -127,15 +125,11 @@ class DeathReportModelAdminMixin(
     def action_item_column(self, obj):
         return self.get_action_item_column(obj.action_item, as_button=False)
 
-    @display(
-        description="Parent action", ordering="parent_action_item__action_identifier"
-    )
+    @display(description="Parent action", ordering="parent_action_item__action_identifier")
     def parent_action_item_column(self, obj):
         return self.get_action_item_column(obj.parent_action_item, as_button=True)
 
-    @display(
-        description="Related action", ordering="related_action_item__action_identifier"
-    )
+    @display(description="Related action", ordering="related_action_item__action_identifier")
     def related_action_item_column(self, obj):
         return self.get_action_item_column(obj.related_action_item, as_button=True)
 
@@ -145,7 +139,9 @@ class DeathReportModelAdminMixin(
             verbose_name = action_item.reference_model_cls._meta.verbose_name
             app_label = action_item.reference_model_cls._meta.app_label
             model_name = action_item.reference_model_cls._meta.model_name
-            url_name = f"{get_adverse_event_app_label()}_admin:{app_label}_{model_name}_changelist"
+            url_name = (
+                f"{get_adverse_event_app_label()}_admin:{app_label}_{model_name}_changelist"
+            )
             url = reverse(url_name)
             return render_to_string(
                 "edc_adverse_event/action_item_column.html",

edc_adverse_event/modelform_mixins/ae_tmg_modelform_mixin.py

@@ -23,9 +23,7 @@ class AeTmgModelFormMixin(AeModelFormMixin):
         widgets = {
             "subject_identifier": forms.TextInput(attrs={"readonly": "readonly"}),
             "action_identifier": forms.TextInput(attrs={"readonly": "readonly"}),
-            "ae_description": forms.Textarea(
-                attrs={"readonly": "readonly", "cols": "79"}
-            ),
+            "ae_description": forms.Textarea(attrs={"readonly": "readonly", "cols": "79"}),
             "ae_classification": forms.TextInput(attrs={"readonly": "readonly"}),
             "ae_classification_other": forms.TextInput(attrs={"readonly": "readonly"}),
         }

edc_adverse_event/models/signals.py

@@ -49,9 +49,7 @@ def update_ae_initial_for_susar(sender, instance, raw, update_fields, **kwargs):
                     if instance.ae_initial.susar_reported != YES:
                         instance.ae_initial.susar = YES
                         instance.ae_initial.susar_reported = YES
-                        instance.ae_initial.save(
-                            update_fields=["susar", "susar_reported"]
-                        )
+                        instance.ae_initial.save(update_fields=["susar", "susar_reported"])
                 elif instance.ae_initial.susar_reported != NO:
                     instance.ae_initial.susar = YES
                     instance.ae_initial.susar_reported = NO
@@ -100,9 +98,7 @@ def post_delete_ae_susar(instance, **kwargs):
             instance.ae_initial.save()
 
 
-@receiver(
-    m2m_changed, weak=False, dispatch_uid="update_death_notifications_for_tmg_group"
-)
+@receiver(m2m_changed, weak=False, dispatch_uid="update_death_notifications_for_tmg_group")
 def update_death_notifications_for_tmg_group(
     action, instance, reverse, model, pk_set, using, **kwargs
 ):
@@ -112,9 +108,7 @@ def update_death_notifications_for_tmg_group(
         pass
     else:
         try:
-            tmg_death_notification = Notification.objects.get(
-                name=DEATH_REPORT_TMG_ACTION
-            )
+            tmg_death_notification = Notification.objects.get(name=DEATH_REPORT_TMG_ACTION)
         except ObjectDoesNotExist:
             pass
         else:

edc_adverse_event/pdf_reports/ae_pdf_report.py

@@ -89,9 +89,7 @@ class AePdfReport(CrfPdfReport):
         susar_reported = ""
         if self.model_obj.susar == YES:
             susar_reported = (
-                ": reported"
-                if self.model_obj.susar_reported == YES
-                else ": not reported"
+                ": reported" if self.model_obj.susar_reported == YES else ": not reported"
             )
         susar_text = f"{self.model_obj.get_susar_display()}{susar_reported}"
 
@@ -176,9 +174,7 @@ class AePdfReport(CrfPdfReport):
         t1 = Table([["Section 2: Follow-up Reports"]], (18 * cm))
         self.set_table_style(t1, bg_cmd=self.bg_cmd)
         total = self.model_obj.ae_follow_ups.count()
-        row_text = (
-            f"There {p.plural_verb('is', total)} {p.no('follow-up report', total)}."
-        )
+        row_text = f"There {p.plural_verb('is', total)} {p.no('follow-up report', total)}."
         t2 = Table([[row_text]], (18 * cm))
         self.set_table_style(t2)
         story.append(KeepTogether([t1, t2]))
@@ -203,9 +199,7 @@ class AePdfReport(CrfPdfReport):
             ],
             (3 * cm, 3 * cm, 3 * cm, 9 * cm),
         )
-        self.set_table_style(
-            t, bg_cmd=("BACKGROUND", (0, 0), (3, -1), colors.lightgrey)
-        )
+        self.set_table_style(t, bg_cmd=("BACKGROUND", (0, 0), (3, -1), colors.lightgrey))
         story.append(t)
 
         followups = self.model_obj.ae_follow_ups.order_by("-created")
@@ -213,9 +207,7 @@ class AePdfReport(CrfPdfReport):
         for followup in followups:
             qs = followup.history.filter(id=followup.id).order_by("-history_date")
             for obj in qs:
-                username = (
-                    obj.user_created if obj.history_type == "+" else obj.user_modified
-                )
+                username = obj.user_created if obj.history_type == "+" else obj.user_modified
                 t = Table(
                     [
                         [
@@ -225,9 +217,7 @@ class AePdfReport(CrfPdfReport):
                             ),
                             Paragraph(username, s),
                             Paragraph(obj.modified.strftime("%Y-%m-%d %H:%M"), s),
-                            Paragraph(
-                                fill(self.history_change_message(obj), width=60), s
-                            ),
+                            Paragraph(fill(self.history_change_message(obj), width=60), s),
                         ]
                     ],
                     (3 * cm, 3 * cm, 3 * cm, 9 * cm),
@@ -241,9 +231,7 @@ class AePdfReport(CrfPdfReport):
             .order_by("-history_date")
         )
         for obj in qs:
-            username = (
-                obj.user_created if obj.history_type == "+" else obj.user_modified
-            )
+            username = obj.user_created if obj.history_type == "+" else obj.user_modified
             t = Table(
                 [
                     [

edc_adverse_event/pdf_reports/death_pdf_report.py

@@ -127,9 +127,7 @@ class DeathPdfReport(CrfPdfReport):
             ],
             (3 * cm, 3 * cm, 3 * cm, 9 * cm),
         )
-        self.set_table_style(
-            t, bg_cmd=("BACKGROUND", (0, 0), (3, -1), colors.lightgrey)
-        )
+        self.set_table_style(t, bg_cmd=("BACKGROUND", (0, 0), (3, -1), colors.lightgrey))
         story.append(t)
 
         qs = (
@@ -138,9 +136,7 @@ class DeathPdfReport(CrfPdfReport):
             .order_by("-history_date")
         )
         for obj in qs:
-            username = (
-                obj.user_created if obj.history_type == "+" else obj.user_modified
-            )
+            username = obj.user_created if obj.history_type == "+" else obj.user_modified
             t = Table(
                 [
                     [
@@ -157,9 +153,7 @@ class DeathPdfReport(CrfPdfReport):
 
     @property
     def cause_of_death(self):
-        return getattr(
-            self.model_obj.cause_of_death, "name", self.model_obj.cause_of_death
-        )
+        return getattr(self.model_obj.cause_of_death, "name", self.model_obj.cause_of_death)
 
     @property
     def cause_of_death_other(self):

edc_adverse_event/templatetags/edc_adverse_event_extras.py

@@ -44,9 +44,7 @@ if TYPE_CHECKING:
 
     class DeathReportTmgModel(DeathReportTmgModelMixin, BaseUuidModel): ...  # noqa
 
-    class DeathReportTmgSecondModel(
-        DeathReportTmgModelMixin, BaseUuidModel
-    ): ...  # noqa
+    class DeathReportTmgSecondModel(DeathReportTmgModelMixin, BaseUuidModel): ...  # noqa
 
     class AeInitialModel(AeInitialModelMixin, BaseUuidModel): ...  # noqa
 
@@ -119,9 +117,7 @@ def format_ae_followup_description(context, ae_followup, wrap_length):
         context["sae_reason"] = format_html(
             "{}",
             mark_safe(
-                wrapx(
-                    escape_braces(ae_followup.ae_initial.sae_reason.name), wrap_length
-                )
+                wrapx(escape_braces(ae_followup.ae_initial.sae_reason.name), wrap_length)
             ),  # nosec B703, B308
         )
     except AttributeError:
@@ -198,9 +194,7 @@ def ae_tmg_queryset(subject_identifier: str = None) -> QuerySet[DeathReportTmgMo
 def death_report_tmg_queryset(
     subject_identifier: str = None,
 ) -> QuerySet[DeathReportTmgModel]:
-    return get_ae_model("deathreporttmg").objects.filter(
-        subject_identifier=subject_identifier
-    )
+    return get_ae_model("deathreporttmg").objects.filter(subject_identifier=subject_identifier)
 
 
 @register.simple_tag
@@ -216,9 +210,7 @@ def death_report_tmg2_queryset(
 def death_report_queryset(
     subject_identifier: str = None,
 ) -> QuerySet[DeathReportTmgSecondModel]:
-    return get_ae_model("deathreport").objects.filter(
-        subject_identifier=subject_identifier
-    )
+    return get_ae_model("deathreport").objects.filter(subject_identifier=subject_identifier)
 
 
 @register.simple_tag
@@ -306,9 +298,7 @@ def render_tmg_panel(
         else:
             panel_color = "success"
         # panel_label
-        display_name = action_item.display_name.replace("Submit", "").replace(
-            "pending", ""
-        )
+        display_name = action_item.display_name.replace("Submit", "").replace("pending", "")
         identifier = action_item.identifier or "New"
         panel_label = _(f"{display_name} {identifier}")
         return dict(

edc_adverse_event/utils.py

@@ -39,9 +39,7 @@ def validate_ae_initial_outcome_date(form_obj):
                 convert_php_dateformat(settings.SHORT_DATE_FORMAT)
             )
             raise forms.ValidationError(
-                {
-                    "outcome_date": f"May not be before the AE start date {formatted_dte}."
-                }
+                {"outcome_date": f"May not be before the AE start date {formatted_dte}."}
             )
 
 
@@ -73,9 +71,7 @@ def get_hospitalization_model_app_label() -> str:
 
 def get_ae_model(
     model_name,
-) -> (
-    Type[DeathReportModelMixin] | Type[AeInitialModelMixin] | Type[AeFollowupModelMixin]
-):
+) -> Type[DeathReportModelMixin] | Type[AeInitialModelMixin] | Type[AeFollowupModelMixin]:
     return django_apps.get_model(f"{get_adverse_event_app_label()}.{model_name}")
 
 

edc_adverse_event/view_mixins/ae/ae_listboard_view_mixin.py

@@ -87,9 +87,7 @@ class AeListboardViewMixin(
         return super().get_context_data(**kwargs)
 
     def get_queryset_filter_options(self, request, *args, **kwargs) -> tuple[Q, dict]:
-        q_object, options = super().get_queryset_filter_options(
-            request, *args, **kwargs
-        )
+        q_object, options = super().get_queryset_filter_options(request, *args, **kwargs)
         options.update(
             action_type__name__in=self.action_type_names,
             status__in=[NEW, OPEN, CLOSED],

edc_adverse_event/view_mixins/ae/death_report_listboard_view_mixin.py

@@ -80,9 +80,7 @@ class DeathReportListboardViewMixin(
         return super().get_context_data(**kwargs)
 
     def get_queryset_filter_options(self, request, *args, **kwargs) -> tuple[Q, dict]:
-        q_object, options = super().get_queryset_filter_options(
-            request, *args, **kwargs
-        )
+        q_object, options = super().get_queryset_filter_options(request, *args, **kwargs)
         options.update(
             action_type__name__in=self.action_type_names,
             status__in=[NEW, OPEN, CLOSED],

edc_adverse_event/view_mixins/tmg/tmg_ae_listboard_view_mixin.py

@@ -87,9 +87,7 @@ class TmgAeListboardViewMixin(
         ]
 
     def get_queryset_filter_options(self, request, *args, **kwargs) -> tuple[Q, dict]:
-        q_object, options = super().get_queryset_filter_options(
-            request, *args, **kwargs
-        )
+        q_object, options = super().get_queryset_filter_options(request, *args, **kwargs)
         options.update(
             action_type__name__in=self.action_type_names,
             status__in=[NEW, OPEN, CLOSED],
@@ -108,8 +106,6 @@ class StatusTmgAeListboardView(TmgAeListboardViewMixin):
         return super().get_context_data(**kwargs)
 
     def get_queryset_filter_options(self, request, *args, **kwargs) -> tuple[Q, dict]:
-        q_object, options = super().get_queryset_filter_options(
-            request, *args, **kwargs
-        )
+        q_object, options = super().get_queryset_filter_options(request, *args, **kwargs)
         options.update({"status": self.status})
         return q_object, options

edc_adverse_event/view_utils/tmg_button.py

@@ -28,9 +28,7 @@ if TYPE_CHECKING:
 
 @dataclass
 class TmgButton(ModelButton):
-    model_obj: (
-        DeathReportTmgModel | DeathReportModel | AeFollowupModel | AeInitialModel
-    ) = None
+    model_obj: DeathReportTmgModel | DeathReportModel | AeFollowupModel | AeInitialModel = None
     next_url_name: str | None = field(default="open_tmg_ae_listboard_url")
     only_user_created_may_access: bool | None = None
     forloop_counter: int | None = None
@@ -73,9 +71,7 @@ class TmgButton(ModelButton):
             and self.only_user_created_may_access
             and self.model_obj.user_created != self.user.username
         ):
-            title = _("May only be edited by %(user)s") % {
-                "user": self.model_obj.user_created
-            }
+            title = _("May only be edited by %(user)s") % {"user": self.model_obj.user_created}
             if self.model_obj.site.id != self.request.site.id:
                 title = _("%(title)s when logged into site %(site)s") % {
                     "title": title,

edc_adverse_event/views/home_view.py

@@ -37,8 +37,6 @@ class AeHomeView(UrlRequestContextMixin, EdcViewMixin, NavbarViewMixin, Template
             ae_initial_changelist_url=ae_initial_changelist_url,
             death_report_changelist_url=death_report_changelist_url,
             death_report_listboard_url=death_report_listboard_url,
-            **self.add_url_to_context(
-                new_key="ae_home_url", existing_key=self.url_name
-            ),
+            **self.add_url_to_context(new_key="ae_home_url", existing_key=self.url_name),
         )
         return super().get_context_data(**kwargs)

edc_adverse_event/views/tmg/death_listboard_view.py

@@ -50,9 +50,7 @@ class DeathListboardView(
         return super().get_context_data(**kwargs)
 
     def get_queryset_filter_options(self, request, *args, **kwargs) -> tuple[Q, dict]:
-        q_object, options = super().get_queryset_filter_options(
-            request, *args, **kwargs
-        )
+        q_object, options = super().get_queryset_filter_options(request, *args, **kwargs)
         if self.search_term and re.match("^[A-Z]+$", self.search_term):
             q_object |= Q(first_name__exact=self.search_term)
         if kwargs.get("subject_identifier"):

edc_adverse_event/views/tmg/home_view.py

@@ -33,18 +33,14 @@ class TmgHomeView(EdcViewMixin, NavbarViewMixin, TemplateView):
         )
         # summarize new and open for notice
         qs = (
-            ActionItem.objects.filter(
-                action_type__name=AE_TMG_ACTION, status__in=[NEW, OPEN]
-            )
+            ActionItem.objects.filter(action_type__name=AE_TMG_ACTION, status__in=[NEW, OPEN])
             .exclude(site__name=get_current_site(request=self.request).name)
             .values("status", "site__name")
             .annotate(items=Count("status"))
         )
         notices = []
         for item in qs.order_by("status", "site__name"):
-            notices.append(
-                [item.get("site__name"), item.get("status"), item.get("items")]
-            )
+            notices.append([item.get("site__name"), item.get("status"), item.get("items")])
         new_count = ActionItem.objects.filter(
             action_type__name=AE_TMG_ACTION,
             site__name=get_current_site(request=self.request).name,

edc_adverse_event/views/tmg/summary_listboard_view.py

@@ -61,8 +61,6 @@ class SummaryListboardView(
         return super().get_context_data(**kwargs)
 
     def get_queryset_filter_options(self, request, *args, **kwargs) -> tuple[Q, dict]:
-        q_object, options = super().get_queryset_filter_options(
-            request, *args, **kwargs
-        )
+        q_object, options = super().get_queryset_filter_options(request, *args, **kwargs)
         options.update({"action_type__name__in": self.action_type_names})
         return q_object, options

edc_appointment/admin/appointment_admin.py

@@ -304,8 +304,6 @@ class AppointmentAdmin(
     def get_view_only_site_ids_for_user(self, request) -> list[int]:
         if request.user.userprofile.roles.filter(name=DATA_MANAGER_ROLE).exists():
             return [
-                s.id
-                for s in request.user.userprofile.sites.all()
-                if s.id != request.site.id
+                s.id for s in request.user.userprofile.sites.all() if s.id != request.site.id
             ]
         return super().get_view_only_site_ids_for_user(request)

edc_appointment/admin/list_filters.py

@@ -35,9 +35,7 @@ class AppointmentStatusListFilter(SimpleListFilter):
     field_name = "appt_status"
 
     def lookups(self, request, model_admin) -> tuple:
-        return APPT_STATUS + (
-            (ATTENDED_APPT, "Attended (In progress, incomplete, done)"),
-        )
+        return APPT_STATUS + ((ATTENDED_APPT, "Attended (In progress, incomplete, done)"),)
 
     def queryset(self, request, queryset):
         qs = None

edc_appointment/admin_site.py

@@ -2,6 +2,4 @@ from edc_model_admin.admin_site import EdcAdminSite
 
 from .apps import AppConfig
 
-edc_appointment_admin = EdcAdminSite(
-    name="edc_appointment_admin", app_label=AppConfig.name
-)
+edc_appointment_admin = EdcAdminSite(name="edc_appointment_admin", app_label=AppConfig.name)

edc_appointment/analytics/dataframes/get_appointment_df.py

@@ -17,9 +17,7 @@ def get_appointment_df(
     normalize = True if normalize is None else normalize
     localize = True if localize is None else localize
     appointment_model_cls = get_appointment_model_cls()
-    appointment_type_model_cls = django_apps.get_model(
-        "edc_appointment.appointmenttype"
-    )
+    appointment_type_model_cls = django_apps.get_model("edc_appointment.appointmenttype")
     opts = {}
     if site_id:
         opts = {"site_id": site_id}
@@ -28,9 +26,7 @@ def get_appointment_df(
             appointment_model_cls.objects.values(*values).filter(**opts), verbose=False
         )
     else:
-        df_appt = read_frame(
-            appointment_model_cls.objects.filter(**opts), verbose=False
-        )
+        df_appt = read_frame(appointment_model_cls.objects.filter(**opts), verbose=False)
     df_appt = convert_dates_from_model(
         df_appt, appointment_model_cls, normalize=normalize, localize=localize
     )

edc_appointment/appointment_reason_updater.py

@@ -173,8 +173,7 @@ class AppointmentReasonUpdater(MetadataHelperMixin):
         """
         return (
             self.get_crf_metadata_by(KEYED).count() == 1
-            and self.get_crf_metadata_by(KEYED)[0].model
-            == get_subject_visit_missed_model()
+            and self.get_crf_metadata_by(KEYED)[0].model == get_subject_visit_missed_model()
         )
 
     def delete_subject_visit_missed_if_exists(self) -> None:
@@ -187,9 +186,7 @@ class AppointmentReasonUpdater(MetadataHelperMixin):
         """Returns a subject visit reason given the appt reason"""
         if appt_reason == SCHEDULED_APPT:
             visit_reason = SCHEDULED
-        elif (
-            appt_reason == UNSCHEDULED_APPT and self.appointment.visit_code_sequence > 0
-        ):
+        elif appt_reason == UNSCHEDULED_APPT and self.appointment.visit_code_sequence > 0:
             visit_reason = UNSCHEDULED
         else:
             raise AppointmentReasonUpdaterError(

edc_appointment/appointment_status_updater.py

@@ -30,10 +30,7 @@ class AppointmentStatusUpdater:
                 raise AppointmentStatusUpdaterError(
                     "Appointment instance must exist. Got `id` is None"
                 )
-            if (
-                change_to_in_progress
-                and self.appointment.appt_status != IN_PROGRESS_APPT
-            ):
+            if change_to_in_progress and self.appointment.appt_status != IN_PROGRESS_APPT:
                 self.appointment.appt_status = IN_PROGRESS_APPT
                 self.appointment.save_base(update_fields=["appt_status"])
             if clear_others_in_progress:

edc_appointment/constants.py

@@ -19,9 +19,7 @@ INVALID_PREVIOUS_APPOINTMENT_NOT_UPDATED = "previous_appointment_not_updated"
 INVALID_PREVIOUS_VISIT_MISSING = "previous_visit_missing"
 INVALID_MISSED_APPT_NOT_ALLOWED = "invalid_missed_appt_not_allowed"
 INVALID_APPT_STATUS_AT_BASELINE = "invalid_appt_status_at_baseline"
-INVALID_SKIPPED_APPT_NOT_ALLOWED_AT_BASELINE = (
-    "invalid_skipped_appt_not_allowed_at_baseline"
-)
+INVALID_SKIPPED_APPT_NOT_ALLOWED_AT_BASELINE = "invalid_skipped_appt_not_allowed_at_baseline"
 INVALID_APPT_TIMING = "invalid_appt_timing"
 INVALID_APPT_TIMING_CRFS_EXIST = "invalid_appt_timing_crfs_exist"
 INVALID_APPT_TIMING_REQUISITIONS_EXIST = "invalid_appt_timing_requisitions_exist"

edc_appointment/creators/appointment_creator.py

@@ -86,8 +86,7 @@ class AppointmentCreator:
         try:
             if is_naive(timepoint_datetime):
                 raise ValueError(
-                    f"Naive datetime not allowed. {repr(self)}. "
-                    f"Got {timepoint_datetime}"
+                    f"Naive datetime not allowed. {repr(self)}. " f"Got {timepoint_datetime}"
                 )
             else:
                 self.timepoint_datetime = timepoint_datetime
@@ -100,16 +99,13 @@ class AppointmentCreator:
         # to timepoint_datetime still apply.
         if suggested_datetime and is_naive(suggested_datetime):
             raise ValueError(
-                f"Naive datetime not allowed. {repr(self)}. "
-                f"Got {suggested_datetime}"
+                f"Naive datetime not allowed. {repr(self)}. " f"Got {suggested_datetime}"
             )
         else:
             self.suggested_datetime = suggested_datetime or self.timepoint_datetime
         self.facility = facility or visit.facility
         if not self.facility:
-            raise AppointmentCreatorError(
-                f"facility_name not defined. See {repr(visit)}"
-            )
+            raise AppointmentCreatorError(f"facility_name not defined. See {repr(visit)}")
         self.get_appointment()
 
     def __repr__(self):
@@ -129,9 +125,7 @@ class AppointmentCreator:
         """Returns a newly created or updated appointment model instance."""
         if not self._appointment:
             try:
-                self._appointment = self.appointment_model_cls.objects.get(
-                    **self.options
-                )
+                self._appointment = self.appointment_model_cls.objects.get(**self.options)
             except ObjectDoesNotExist:
                 self._appointment = self._create()
             else:

edc_appointment/creators/unscheduled_appointment_creator.py

@@ -77,9 +77,7 @@ class UnscheduledAppointmentCreator:
                 "suggested visit code sequence cannot be less than 1"
             )
         self.facility = facility
-        self.visit_schedule = site_visit_schedules.get_visit_schedule(
-            visit_schedule_name
-        )
+        self.visit_schedule = site_visit_schedules.get_visit_schedule(visit_schedule_name)
         self.schedule = self.visit_schedule.schedules.get(schedule_name)
         self.appointment_model_cls = self.schedule.appointment_model_cls
         self.visit = self.visit_schedule.schedules.get(self.schedule_name).visits.get(
@@ -264,10 +262,8 @@ class UnscheduledAppointmentCreator:
         if (
             self.calling_appointment
             and self.calling_appointment.next
-            and self.calling_appointment.next.appt_status
-            in [INCOMPLETE_APPT, COMPLETE_APPT]
-            and self.suggested_appt_datetime
-            < self.calling_appointment.next.appt_datetime
+            and self.calling_appointment.next.appt_status in [INCOMPLETE_APPT, COMPLETE_APPT]
+            and self.suggested_appt_datetime < self.calling_appointment.next.appt_datetime
         ):
             value = True
         return value

edc_appointment/creators/utils.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from datetime import datetime
 from typing import TYPE_CHECKING
 
+from dateutil.relativedelta import relativedelta
 from django.db import transaction
 
 from ..constants import INCOMPLETE_APPT, NEW_APPT
@@ -31,6 +32,9 @@ def create_unscheduled_appointment(
 
     """
     unscheduled_appointment = None
+    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,

edc_appointment/form_validator_mixins/next_appointment_crf_form_validator_mixin.py

@@ -48,9 +48,7 @@ class NextAppointmentCrfFormValidatorMixin(FormValidator):
             field_required="health_facility",
         )
 
-        if self.cleaned_data.get("appt_date") and self.cleaned_data.get(
-            "visitschedule"
-        ):
+        if self.cleaned_data.get("appt_date") and self.cleaned_data.get("visitschedule"):
             self.validate_with_appointment_form_validator()
             self.validate_date_is_on_clinic_day()
 
@@ -105,9 +103,7 @@ class NextAppointmentCrfFormValidatorMixin(FormValidator):
             and instance.appt_datetime.date() != self.cleaned_data.get("appt_date")
         ):
             self.raise_validation_error(
-                {
-                    "appt_date": "May not be changed. Next appointment has already started"
-                },
+                {"appt_date": "May not be changed. Next appointment has already started"},
                 INVALID_ERROR,
             )
 
@@ -159,10 +155,7 @@ class NextAppointmentCrfFormValidatorMixin(FormValidator):
     def health_facility(self) -> HealthFacility | None:
         if not self._health_facility:
             if self.cleaned_data.get("health_facility"):
-                if (
-                    self.cleaned_data.get("health_facility").site
-                    != self.related_visit.site
-                ):
+                if self.cleaned_data.get("health_facility").site != self.related_visit.site:
                     raise self.raise_validation_error(
                         {"health_facility": "Invalid for this site"}, INVALID_ERROR
                     )