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

edc_appointment/form_validator_mixins/window_period_form_validator_mixin.py

@@ -24,9 +24,7 @@ SCHEDULED_WINDOW_ERROR = "scheduled_window_error"
 
 
 class WindowPeriodFormValidatorMixin:
-    def validate_appt_datetime_in_window_period(
-        self, appointment: Appointment, *args
-    ) -> None:
+    def validate_appt_datetime_in_window_period(self, appointment: Appointment, *args) -> None:
         self.datetime_in_window_or_raise(appointment, *args)
 
     @staticmethod
@@ -59,9 +57,7 @@ class WindowPeriodFormValidatorMixin:
                     dt=proposed_appt_datetime,
                     visit_code=appointment.visit_code,
                     visit_code_sequence=appointment.visit_code_sequence,
-                    baseline_timepoint_datetime=self.baseline_timepoint_datetime(
-                        appointment
-                    ),
+                    baseline_timepoint_datetime=self.baseline_timepoint_datetime(appointment),
                 )
             except UnScheduledVisitWindowError:
                 if not self.ignore_window_period_for_unscheduled(
@@ -93,9 +89,7 @@ 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)
 
     @staticmethod
     def baseline_timepoint_datetime(appointment: Appointment) -> datetime:

edc_appointment/form_validators/appointment_form_validator.py

@@ -135,9 +135,7 @@ class AppointmentFormValidator(
         if self.cleaned_data.get("appt_status") == IN_PROGRESS_APPT and getattr(
             self.instance, "id", None
         ):
-            previous_appt = get_previous_appointment(
-                self.instance, include_interim=True
-            )
+            previous_appt = get_previous_appointment(self.instance, include_interim=True)
             if previous_appt and previous_appt.appt_status not in [
                 CANCELLED_APPT,
                 SKIPPED_APPT,
@@ -297,10 +295,7 @@ class AppointmentFormValidator(
         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
-                ):
+                if to_utc(appt_datetime) < self.instance.relative_previous.appt_datetime:
                     formatted_date = formatted_datetime(
                         self.instance.relative_previous.appt_datetime
                     )
@@ -352,16 +347,12 @@ class AppointmentFormValidator(
         appt_status = self.cleaned_data.get("appt_status")
         if self.instance.visit_code_sequence == 0 and appt_status == CANCELLED_APPT:
             self.raise_validation_error(
-                {
-                    "appt_status": "Invalid. A scheduled appointment may not be cancelled."
-                },
+                {"appt_status": "Invalid. A scheduled appointment may not be cancelled."},
                 INVALID_APPT_STATUS,
             )
         elif self.instance.visit_code_sequence != 0 and appt_status == SKIPPED_APPT:
             self.raise_validation_error(
-                {
-                    "appt_status": "Invalid. An unscheduled appointment may not be skipped."
-                },
+                {"appt_status": "Invalid. An unscheduled appointment may not be skipped."},
                 INVALID_APPT_STATUS,
             )
         elif is_baseline(self.instance) and appt_status == SKIPPED_APPT:
@@ -388,10 +379,7 @@ class AppointmentFormValidator(
 
     def validate_appt_inprogress_or_incomplete(self: Any) -> None:
         appt_status = self.cleaned_data.get("appt_status")
-        if (
-            appt_status in [CANCELLED_APPT, SKIPPED_APPT]
-            and self.crf_metadata_keyed_exists
-        ):
+        if appt_status in [CANCELLED_APPT, SKIPPED_APPT] and self.crf_metadata_keyed_exists:
             self.raise_validation_error(
                 {"appt_status": "Invalid. Some CRFs have already been keyed"},
                 INVALID_APPT_STATUS,
@@ -468,9 +456,7 @@ class AppointmentFormValidator(
                 )
             elif not self.requisition_metadata_required_exists:
                 self.raise_validation_error(
-                    {
-                        "appt_status": "Invalid. All required requisitions have been keyed"
-                    },
+                    {"appt_status": "Invalid. All required requisitions have been keyed"},
                     INVALID_APPT_STATUS,
                 )
             elif not self.required_additional_forms_exist:
@@ -509,9 +495,7 @@ class AppointmentFormValidator(
                 )
             elif is_baseline(self.instance):
                 self.raise_validation_error(
-                    {
-                        "appt_status": "Invalid. Appointment may not be skipped at baseline"
-                    },
+                    {"appt_status": "Invalid. Appointment may not be skipped at baseline"},
                     INVALID_APPT_STATUS_AT_BASELINE,
                 )
 
@@ -528,9 +512,7 @@ class AppointmentFormValidator(
                 )
 
     def validate_appt_type(self):
-        self.not_applicable_if(
-            SKIPPED_APPT, field="appt_status", field_applicable="appt_type"
-        )
+        self.not_applicable_if(SKIPPED_APPT, field="appt_status", field_applicable="appt_type")
 
     def validate_appt_status(self):
         pass
@@ -568,15 +550,9 @@ class AppointmentFormValidator(
                 {"appt_status": "Invalid. A scheduled appointment cannot be cancelled"},
                 INVALID_APPT_STATUS,
             )
-        elif (
-            appt_status
-            and self.instance.visit_code_sequence
-            and appt_status == SKIPPED_APPT
-        ):
+        elif appt_status and self.instance.visit_code_sequence and appt_status == SKIPPED_APPT:
             self.raise_validation_error(
-                {
-                    "appt_status": "Invalid. An unscheduled appointment cannot be skipped"
-                },
+                {"appt_status": "Invalid. An unscheduled appointment cannot be skipped"},
                 INVALID_APPT_STATUS,
             )
 
@@ -584,9 +560,7 @@ class AppointmentFormValidator(
         if (
             self.cleaned_data.get("appt_reason") == UNSCHEDULED_APPT
             and get_previous_appointment(self.instance, include_interim=True)
-            and get_previous_appointment(
-                self.instance, include_interim=True
-            ).appt_status
+            and get_previous_appointment(self.instance, include_interim=True).appt_status
             == MISSED_APPT
         ):
             self.raise_validation_error(

edc_appointment/form_validators/next_appointment_crf_form_validator.py

@@ -3,9 +3,7 @@ from edc_crf.crf_form_validator import CrfFormValidator
 from ..form_validator_mixins import NextAppointmentCrfFormValidatorMixin
 
 
-class NextAppointmentCrfFormValidator(
-    NextAppointmentCrfFormValidatorMixin, CrfFormValidator
-):
+class NextAppointmentCrfFormValidator(NextAppointmentCrfFormValidatorMixin, CrfFormValidator):
     def clean(self):
         self.validate_date_is_on_clinic_day()
         super().clean()

edc_appointment/form_validators/utils.py

@@ -39,9 +39,7 @@ def validate_appt_datetime_unique(
             "schedule_name": appointment.schedule_name,
             "appt_datetime__date": appt_datetime_utc.date(),
         }
-        other_appts = appointment.__class__.objects.filter(**opts).exclude(
-            id=appointment.id
-        )
+        other_appts = appointment.__class__.objects.filter(**opts).exclude(id=appointment.id)
         if other_appts.count() > 1:
             raise form_validator.raise_validation_error(
                 {form_field: "An appointment already exists for this date (M)"},

edc_appointment/managers.py

@@ -141,9 +141,7 @@ class AppointmentManager(models.Manager):
         try:
             last_appointment = [
                 obj
-                for obj in self.filter(**options).order_by(
-                    "timepoint", "visit_code_sequence"
-                )
+                for obj in self.filter(**options).order_by("timepoint", "visit_code_sequence")
             ][-1]
         except IndexError:
             last_appointment = None
@@ -248,9 +246,7 @@ class AppointmentManager(models.Manager):
         # delete future appointments until the first with a
         # visit report
         deleted = 0
-        appointments = self.filter(**options).order_by(
-            "timepoint", "visit_code_sequence"
-        )
+        appointments = self.filter(**options).order_by("timepoint", "visit_code_sequence")
         for appointment in appointments.reverse():
             try:
                 with transaction.atomic():

edc_appointment/migrations/0002_auto_20161126_1156.py

@@ -7,11 +7,12 @@ import django.db.models.deletion
 import django_audit_fields.fields.uuid_auto_field
 import django_extensions.db.fields
 import django_revision.revision_field
-import edc_model_fields.fields.hostname_modification_field
-import edc_model_fields.fields.userfield
 from django.conf import settings
 from django.db import migrations, models
 
+import edc_model_fields.fields.hostname_modification_field
+import edc_model_fields.fields.userfield
+
 
 class Migration(migrations.Migration):
     dependencies = [
@@ -236,9 +237,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "comment",
-                    models.CharField(
-                        blank=True, max_length=250, verbose_name="Comment"
-                    ),
+                    models.CharField(blank=True, max_length=250, verbose_name="Comment"),
                 ),
                 ("is_confirmed", models.BooleanField(default=False, editable=False)),
                 (
@@ -463,9 +462,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "comment",
-                    models.CharField(
-                        blank=True, max_length=250, verbose_name="Comment"
-                    ),
+                    models.CharField(blank=True, max_length=250, verbose_name="Comment"),
                 ),
                 ("is_confirmed", models.BooleanField(default=False, editable=False)),
                 (

edc_appointment/migrations/0003_auto_20161127_2226.py

@@ -2,45 +2,36 @@
 # Generated by Django 1.10.3 on 2016-11-27 22:26
 from __future__ import unicode_literals
 
-import edc_utils
 from django.db import migrations, models
 
+import edc_utils
+
 
 class Migration(migrations.Migration):
     dependencies = [("edc_appointment", "0002_auto_20161126_1156")]
 
     operations = [
         migrations.AlterModelOptions(name="appointment", options={}),
-        migrations.RemoveField(
-            model_name="historicalappointment", name="consent_version"
-        ),
+        migrations.RemoveField(model_name="historicalappointment", name="consent_version"),
         migrations.AlterField(
             model_name="appointment",
             name="created",
-            field=models.DateTimeField(
-                default=edc_utils.date.get_utcnow, editable=False
-            ),
+            field=models.DateTimeField(default=edc_utils.date.get_utcnow, editable=False),
         ),
         migrations.AlterField(
             model_name="appointment",
             name="modified",
-            field=models.DateTimeField(
-                default=edc_utils.date.get_utcnow, editable=False
-            ),
+            field=models.DateTimeField(default=edc_utils.date.get_utcnow, editable=False),
         ),
         migrations.AlterField(
             model_name="historicalappointment",
             name="created",
-            field=models.DateTimeField(
-                default=edc_utils.date.get_utcnow, editable=False
-            ),
+            field=models.DateTimeField(default=edc_utils.date.get_utcnow, editable=False),
         ),
         migrations.AlterField(
             model_name="historicalappointment",
             name="modified",
-            field=models.DateTimeField(
-                default=edc_utils.date.get_utcnow, editable=False
-            ),
+            field=models.DateTimeField(default=edc_utils.date.get_utcnow, editable=False),
         ),
         migrations.AlterUniqueTogether(name="appointment", unique_together=set([])),
         migrations.RemoveField(model_name="appointment", name="consent_version"),

edc_appointment/migrations/0006_auto_20170106_2118.py

@@ -2,10 +2,11 @@
 # Generated by Django 1.10.4 on 2017-01-06 19:18
 from __future__ import unicode_literals
 
+from django.db import migrations, models
+
 import edc_model_fields.fields.hostname_modification_field
 import edc_model_fields.fields.userfield
 import edc_utils
-from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

edc_appointment/migrations/0008_auto_20171115_1601.py

@@ -1,9 +1,10 @@
 # Generated by Django 2.0b1 on 2017-11-15 16:01
 
 import _socket
-import edc_model_fields.fields.userfield
 from django.db import migrations, models
 
+import edc_model_fields.fields.userfield
+
 
 class Migration(migrations.Migration):
     dependencies = [("edc_appointment", "0007_auto_20170302_2220")]
@@ -17,9 +18,7 @@ class Migration(migrations.Migration):
                 "verbose_name": "historical ",
             },
         ),
-        migrations.RemoveField(
-            model_name="historicalappointment", name="visit_instance"
-        ),
+        migrations.RemoveField(model_name="historicalappointment", name="visit_instance"),
         migrations.AddField(
             model_name="appointment",
             name="device_created",

edc_appointment/migrations/0014_auto_20180116_1411.py

@@ -1,9 +1,10 @@
 # Generated by Django 2.0.1 on 2018-01-16 12:11
 
 import django.db.models.deletion
-import edc_sites.models
 from django.db import migrations, models
 
+import edc_sites.models
+
 
 class Migration(migrations.Migration):
     dependencies = [

edc_appointment/migrations/0024_auto_20200911_0425.py

@@ -1,9 +1,9 @@
 # Generated by Django 3.0.9 on 2020-09-11 01:25
 
-import edc_sites.models
 from django.db import migrations
 
 import edc_appointment.managers
+import edc_sites.models
 
 
 class Migration(migrations.Migration):

edc_appointment/migrations/0034_appointmenttype_alter_appointment_appt_type_and_more.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.2 on 2023-01-24 15:14
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -25,9 +25,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "plural_name",
-                    models.CharField(
-                        max_length=250, null=True, verbose_name="Plural name"
-                    ),
+                    models.CharField(max_length=250, null=True, verbose_name="Plural name"),
                 ),
                 (
                     "display_name",

edc_appointment/migrations/0036_auto_20230124_1822.py

@@ -10,16 +10,12 @@ def update_new_appt_type(apps, schema_editor):
     historical_model_cls = apps.get_model("edc_appointment.historicalappointment")
     total = appointment_model_cls.objects.all().count()
     for appointment in tqdm(appointment_model_cls.objects.all(), total=total):
-        appt_type = appointment_type_model_cls.objects.get(
-            name=appointment.appt_type_old
-        )
+        appt_type = appointment_type_model_cls.objects.get(name=appointment.appt_type_old)
         appointment.appt_type = appt_type
         appointment.save(update_fields=["appt_type"])
 
     for appointment in tqdm(historical_model_cls.objects.all(), total=total):
-        appt_type = appointment_type_model_cls.objects.get(
-            name=appointment.appt_type_old
-        )
+        appt_type = appointment_type_model_cls.objects.get(name=appointment.appt_type_old)
         appointment.appt_type = appt_type
         appointment.save(update_fields=["appt_type"])
 

edc_appointment/migrations/0040_appointment_appt_type_other_and_more.py

@@ -1,6 +1,7 @@
 # Generated by Django 4.2.3 on 2023-08-16 15:25
 
 from django.db import migrations
+
 import edc_model_fields.fields.other_charfield
 
 

edc_appointment/migrations/0042_alter_appointment_device_created_and_more.py

@@ -1,8 +1,8 @@
 # Generated by Django 4.2.4 on 2023-08-23 01:13
 
 import _socket
-from django.db import migrations, models
 import django_audit_fields.fields.hostname_modification_field
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -14,16 +14,12 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="appointment",
             name="device_created",
-            field=models.CharField(
-                blank=True, max_length=10, verbose_name="Device created"
-            ),
+            field=models.CharField(blank=True, max_length=10, verbose_name="Device created"),
         ),
         migrations.AlterField(
             model_name="appointment",
             name="device_modified",
-            field=models.CharField(
-                blank=True, max_length=10, verbose_name="Device modified"
-            ),
+            field=models.CharField(blank=True, max_length=10, verbose_name="Device modified"),
         ),
         migrations.AlterField(
             model_name="appointment",
@@ -49,16 +45,12 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="historicalappointment",
             name="device_created",
-            field=models.CharField(
-                blank=True, max_length=10, verbose_name="Device created"
-            ),
+            field=models.CharField(blank=True, max_length=10, verbose_name="Device created"),
         ),
         migrations.AlterField(
             model_name="historicalappointment",
             name="device_modified",
-            field=models.CharField(
-                blank=True, max_length=10, verbose_name="Device modified"
-            ),
+            field=models.CharField(blank=True, max_length=10, verbose_name="Device modified"),
         ),
         migrations.AlterField(
             model_name="historicalappointment",

edc_appointment/migrations/0046_infosources.py

@@ -24,9 +24,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "plural_name",
-                    models.CharField(
-                        max_length=250, null=True, verbose_name="Plural name"
-                    ),
+                    models.CharField(max_length=250, null=True, verbose_name="Plural name"),
                 ),
                 (
                     "display_name",

edc_appointment/migrations/0047_alter_appointment_options_and_more.py

@@ -175,9 +175,7 @@ class Migration(migrations.Migration):
         ),
         migrations.AddIndex(
             model_name="appointment",
-            index=models.Index(
-                fields=["appt_status"], name="edc_appoint_appt_st_57c8d0_idx"
-            ),
+            index=models.Index(fields=["appt_status"], name="edc_appoint_appt_st_57c8d0_idx"),
         ),
         migrations.AddIndex(
             model_name="appointment",

edc_appointment/model_mixins/appointment_methods_model_mixin.py

@@ -31,11 +31,7 @@ class AppointmentMethodsModelMixin(models.Model):
     """Mixin of methods for the appointment model only"""
 
     def get_appt_type_display(self: Appointment) -> str:
-        return (
-            get_appointment_type_model_cls()
-            .objects.get(id=self.appt_type_id)
-            .display_name
-        )
+        return get_appointment_type_model_cls().objects.get(id=self.appt_type_id).display_name
 
     @property
     def facility(self: Appointment) -> Facility:

edc_appointment/model_mixins/appointment_model_mixin.py

@@ -139,16 +139,10 @@ class AppointmentModelMixin(
                 )
 
     def validate_appt_datetime_not_after_next(self) -> None:
-        if (
-            self.appt_status != CANCELLED_APPT
-            and self.appt_datetime
-            and self.relative_next
-        ):
+        if self.appt_status != CANCELLED_APPT and self.appt_datetime and self.relative_next:
             if self.appt_datetime >= self.relative_next.appt_datetime:
                 appt_datetime = formatted_datetime(self.appt_datetime)
-                next_appt_datetime = formatted_datetime(
-                    self.relative_next.appt_datetime
-                )
+                next_appt_datetime = formatted_datetime(self.relative_next.appt_datetime)
                 raise AppointmentDatetimeError(
                     "Datetime cannot be on or after next appointment datetime. "
                     f"Got {appt_datetime} >= {next_appt_datetime}. "

edc_appointment/model_mixins/next_appointment_crf_model_mixin.py

@@ -22,9 +22,7 @@ class NextAppointmentCrfModelMixin(models.Model):
         choices=YES_NO,
         default=NO,
         max_length=15,
-        help_text=_(
-            "If going off schedule today, additional CRFs will be added for today."
-        ),
+        help_text=_("If going off schedule today, additional CRFs will be added for today."),
     )
 
     appt_date = models.DateField(

edc_appointment/modeladmin_mixins/next_appointment_crf_modeladmin_mixin.py

@@ -104,6 +104,4 @@ class NextAppointmentCrfModelAdminMixin(admin.ModelAdmin):
         )
 
     def get_default_info_source(self, request):
-        return django_apps.get_model("edc_appointment.infosources").objects.get(
-            name=PATIENT
-        )
+        return django_apps.get_model("edc_appointment.infosources").objects.get(name=PATIENT)

edc_appointment/modelform_mixins/next_appointment_crf_modelform_mixins.py

@@ -110,11 +110,7 @@ class NextAppointmentCrfModelFormMixin:
                 raise forms.ValidationError({self.appt_date_fld: str(e)})
             if not appointment:
                 raise forms.ValidationError(
-                    {
-                        self.appt_date_fld: _(
-                            "Invalid. Must be within the followup period."
-                        )
-                    }
+                    {self.appt_date_fld: _("Invalid. Must be within the followup period.")}
                 )
 
             if (

edc_appointment/models/signals.py

@@ -26,9 +26,7 @@ from ..utils import (
 from .appointment import Appointment
 
 
-@receiver(
-    post_save, sender=Appointment, weak=False, dispatch_uid="appointment_post_save"
-)
+@receiver(post_save, sender=Appointment, weak=False, dispatch_uid="appointment_post_save")
 def appointment_post_save(sender, instance, raw, update_fields, **kwargs):
     if not raw and not update_fields:
         # use the AppointmentStatusUpdater to set all
@@ -68,9 +66,7 @@ def create_appointments_on_post_save(sender, instance, raw, created, using, **kw
                 raise
 
 
-@receiver(
-    post_save, weak=False, dispatch_uid="update_appt_status_on_related_visit_post_save"
-)
+@receiver(post_save, weak=False, dispatch_uid="update_appt_status_on_related_visit_post_save")
 def update_appt_status_on_related_visit_post_save(
     sender, instance, created, raw, update_fields, **kwargs
 ):
@@ -144,11 +140,7 @@ def appointments_on_pre_delete(sender, instance, using, **kwargs):
                     f"first."
                 )
             else:
-                if (
-                    onschedule_datetime
-                    <= instance.appt_datetime
-                    <= offschedule_datetime
-                ):
+                if onschedule_datetime <= instance.appt_datetime <= offschedule_datetime:
                     raise AppointmentDeleteError(
                         f"Appointment may not be deleted. "
                         f"Subject {instance.subject_identifier} is on schedule "
@@ -184,9 +176,7 @@ def appointments_on_post_delete(sender, instance, using, **kwargs):
     weak=False,
     dispatch_uid="update_appointments_to_next_on_post_save",
 )
-def update_appointments_to_next_on_post_save(
-    sender, instance, raw, created, using, **kwargs
-):
+def update_appointments_to_next_on_post_save(sender, instance, raw, created, using, **kwargs):
     if not raw and not kwargs.get("update_fields"):
         if get_allow_skipped_appt_using().get(instance._meta.label_lower):
             skip_appt = SkipAppointments(instance)
@@ -199,9 +189,7 @@ def update_appointments_to_next_on_post_save(
                 )
 
 
-@receiver(
-    post_delete, weak=False, dispatch_uid="update_appointments_to_next_on_post_delete"
-)
+@receiver(post_delete, weak=False, dispatch_uid="update_appointments_to_next_on_post_delete")
 def update_appointments_to_next_on_post_delete(sender, instance, using, **kwargs):
     if get_allow_skipped_appt_using().get(instance._meta.label_lower):
         SkipAppointments(instance).reset_appointments()