clinicedc 2.0.6__py3-none-any.whl → 2.0.8__py3-none-any.whl

edc_appointment/migrations/0006_auto_20170106_2118.py

@@ -6,7 +6,7 @@ from django.db import migrations, models
 
 import edc_model_fields.fields.hostname_modification_field
 import edc_model_fields.fields.userfield
-import edc_utils
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -16,7 +16,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="appointment",
             name="created",
-            field=models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="appointment",
@@ -40,7 +40,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="appointment",
             name="modified",
-            field=models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="appointment",
@@ -59,7 +59,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="historicalappointment",
             name="created",
-            field=models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="historicalappointment",
@@ -83,7 +83,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="historicalappointment",
             name="modified",
-            field=models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="historicalappointment",

edc_appointment/migrations/0018_auto_20190305_0123.py

@@ -4,6 +4,7 @@ import django_audit_fields.fields.hostname_modification_field
 import django_audit_fields.fields.userfield
 import django_audit_fields.models.audit_model_mixin
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -13,9 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="appointment",
             name="created",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="appointment",
@@ -29,9 +28,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="appointment",
             name="modified",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="appointment",
@@ -56,9 +53,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="historicalappointment",
             name="created",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="historicalappointment",
@@ -72,9 +67,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="historicalappointment",
             name="modified",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="historicalappointment",

edc_appointment/migrations/0050_alter_appointment_appt_type_and_more.py

@@ -0,0 +1,220 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+import django.db.models.deletion
+import edc_model_fields.fields.other_charfield
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_appointment", "0049_alter_appointment_revision_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="appointment",
+            name="appt_type",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="edc_appointment.appointmenttype",
+                verbose_name="Appointment type",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="appointment",
+            name="appt_type_other",
+            field=edc_model_fields.fields.other_charfield.OtherCharField(
+                blank=True,
+                default="",
+                max_length=35,
+                verbose_name="If other appointment type, please specify ...",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="appointment",
+            name="comment",
+            field=models.CharField(
+                blank=True, default="", max_length=250, verbose_name="Comment"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="appointment",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="appointment",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="appointment",
+            name="document_status_comments",
+            field=models.TextField(
+                blank=True,
+                default="",
+                help_text="for example, why some data is still pending",
+                verbose_name="Any comments related to status of this document",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="appointment",
+            name="locale_created",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale created",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="appointment",
+            name="locale_modified",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale modified",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="appointment",
+            name="visit_code",
+            field=models.CharField(default="", editable=False, max_length=25),
+        ),
+        migrations.AlterField(
+            model_name="appointmenttype",
+            name="extra_value",
+            field=models.CharField(default="", max_length=250),
+        ),
+        migrations.AlterField(
+            model_name="appointmenttype",
+            name="field_name",
+            field=models.CharField(
+                blank=True,
+                default="",
+                editable=False,
+                help_text="Not required",
+                max_length=25,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="appointmenttype",
+            name="plural_name",
+            field=models.CharField(
+                default="", max_length=250, verbose_name="Plural name"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalappointment",
+            name="appt_type",
+            field=models.ForeignKey(
+                blank=True,
+                db_constraint=False,
+                null=True,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                related_name="+",
+                to="edc_appointment.appointmenttype",
+                verbose_name="Appointment type",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalappointment",
+            name="appt_type_other",
+            field=edc_model_fields.fields.other_charfield.OtherCharField(
+                blank=True,
+                default="",
+                max_length=35,
+                verbose_name="If other appointment type, please specify ...",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalappointment",
+            name="comment",
+            field=models.CharField(
+                blank=True, default="", max_length=250, verbose_name="Comment"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalappointment",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalappointment",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalappointment",
+            name="document_status_comments",
+            field=models.TextField(
+                blank=True,
+                default="",
+                help_text="for example, why some data is still pending",
+                verbose_name="Any comments related to status of this document",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalappointment",
+            name="locale_created",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale created",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalappointment",
+            name="locale_modified",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale modified",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalappointment",
+            name="visit_code",
+            field=models.CharField(default="", editable=False, max_length=25),
+        ),
+        migrations.AlterField(
+            model_name="infosources",
+            name="extra_value",
+            field=models.CharField(default="", max_length=250),
+        ),
+        migrations.AlterField(
+            model_name="infosources",
+            name="field_name",
+            field=models.CharField(
+                blank=True,
+                default="",
+                editable=False,
+                help_text="Not required",
+                max_length=25,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="infosources",
+            name="plural_name",
+            field=models.CharField(
+                default="", max_length=250, verbose_name="Plural name"
+            ),
+        ),
+    ]

edc_appointment/model_mixins/appointment_fields_model_mixin.py

@@ -36,7 +36,6 @@ class AppointmentFieldsModelMixin(models.Model):
         "edc_appointment.AppointmentType",
         verbose_name="Appointment type",
         on_delete=models.PROTECT,
-        default=None,
         null=True,
         blank=False,
         help_text="",
@@ -82,7 +81,7 @@ class AppointmentFieldsModelMixin(models.Model):
         ),
     )
 
-    comment = models.CharField("Comment", max_length=250, blank=True, null=True)
+    comment = models.CharField("Comment", max_length=250, blank=True, default="")
 
     is_confirmed = models.BooleanField(default=False, editable=False)
 

edc_appointment/model_mixins/appointment_methods_model_mixin.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 from typing import TYPE_CHECKING, TypeVar
 
 from django.core.exceptions import ObjectDoesNotExist
@@ -154,10 +155,8 @@ class AppointmentMethodsModelMixin(models.Model):
     def related_visit(self: Appointment) -> VisitModel | None:
         """Returns the related visit model for the current instance."""
         related_visit = None
-        try:
+        with contextlib.suppress(ObjectDoesNotExist):
             related_visit = getattr(self, self.related_visit_model_attr())
-        except ObjectDoesNotExist:
-            pass
         return related_visit
 
     @property

edc_appointment/model_mixins/appointment_model_mixin.py

@@ -87,7 +87,7 @@ class AppointmentModelMixin(
                         "Subject is not on a schedule. Using subject_identifier="
                         f"`{self.subject_identifier}` and appt_datetime=`{dte_as_str}`."
                         f"Got {e}"
-                    )
+                    ) from e
                 if self.appt_datetime > onschedule_obj.onschedule_datetime:
                     # update appointment timepoints
                     schedule.put_on_schedule(
@@ -122,33 +122,36 @@ class AppointmentModelMixin(
         return self.pk
 
     def validate_appt_datetime_not_before_previous(self) -> None:
-        if self.appt_status != CANCELLED_APPT and self.appt_datetime:
-            if (
-                self.relative_previous
-                and self.appt_datetime <= self.relative_previous.appt_datetime
-            ):
-                appt_datetime = formatted_datetime(self.appt_datetime)
-                previous_appt_datetime = formatted_datetime(
-                    self.relative_previous.appt_datetime
-                )
-                raise AppointmentDatetimeError(
-                    "Datetime cannot be on or before previous appointment datetime. "
-                    f"Got {appt_datetime} <= {previous_appt_datetime}. "
-                    f"See appointment `{self}` and "
-                    f"`{self.relative_previous}`."
-                )
+        if (
+            self.appt_status != CANCELLED_APPT
+            and self.appt_datetime
+            and self.relative_previous
+            and self.appt_datetime <= self.relative_previous.appt_datetime
+        ):
+            appt_datetime = formatted_datetime(self.appt_datetime)
+            previous_appt_datetime = formatted_datetime(self.relative_previous.appt_datetime)
+            raise AppointmentDatetimeError(
+                "Datetime cannot be on or before previous appointment datetime. "
+                f"Got {appt_datetime} <= {previous_appt_datetime}. "
+                f"See appointment `{self}` and "
+                f"`{self.relative_previous}`."
+            )
 
     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_datetime >= self.relative_next.appt_datetime:
-                appt_datetime = formatted_datetime(self.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}. "
-                    f"See appointment `{self}` and "
-                    f"`{self.relative_next}`."
-                )
+        if (
+            self.appt_status != CANCELLED_APPT
+            and self.appt_datetime
+            and self.relative_next
+            and 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)
+            raise AppointmentDatetimeError(
+                "Datetime cannot be on or after next appointment datetime. "
+                f"Got {appt_datetime} >= {next_appt_datetime}. "
+                f"See appointment `{self}` and "
+                f"`{self.relative_next}`."
+            )
 
     @property
     def title(self: Appointment) -> str:
@@ -171,7 +174,7 @@ class AppointmentModelMixin(
 
     class Meta(NonUniqueSubjectIdentifierFieldMixin.Meta):
         abstract = True
-        constraints = [
+        constraints = (
             UniqueConstraint(
                 fields=[
                     "subject_identifier",
@@ -192,7 +195,7 @@ class AppointmentModelMixin(
                 ],
                 name="unique_%(app_label)s_%(class)s_200",
             ),
-        ]
+        )
         indexes = (
             models.Index(fields=["appt_datetime"]),
             models.Index(fields=["appt_status"]),

edc_appointment/model_mixins/window_period_model_mixin.py

@@ -30,13 +30,12 @@ class WindowPeriodModelMixin(models.Model):
             and self.appt_status != CANCELLED_APPT
             and self.appt_datetime
             and self.timepoint_datetime
-        ):
-            if not self.ignore_window_period:
-                try:
-                    raise_on_appt_datetime_not_in_window(self)
-                except AppointmentWindowError as e:
-                    msg = f"{e} Perhaps catch this in the form"
-                    raise AppointmentWindowError(msg)
+        ) and not self.ignore_window_period:
+            try:
+                raise_on_appt_datetime_not_in_window(self)
+            except AppointmentWindowError as e:
+                msg = f"{e} Perhaps catch this in the form"
+                raise AppointmentWindowError(msg) from e
 
     class Meta:
         abstract = True

edc_appointment/models/appointment.py

@@ -23,7 +23,7 @@ class Appointment(AppointmentModelMixin, SiteModelMixin, BaseUuidModel):
         )
 
     # noinspection PyTypeHints
-    natural_key.dependencies = ["sites.Site"]  # type: ignore
+    natural_key.dependencies = ("sites.Site",)
 
     class Meta(AppointmentModelMixin.Meta, SiteModelMixin.Meta, BaseUuidModel.Meta):
         indexes = (*AppointmentModelMixin.Meta.indexes, *BaseUuidModel.Meta.indexes)

edc_appointment/models/signals.py

@@ -1,9 +1,10 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models.signals import post_delete, post_save, pre_delete
 from django.dispatch import receiver
+from django.utils import timezone
 
 from edc_constants.constants import NO
-from edc_utils import formatted_datetime, get_utcnow
+from edc_utils import formatted_datetime
 from edc_visit_schedule.site_visit_schedules import site_visit_schedules
 from edc_visit_tracking.utils import get_related_visit_model_cls
 
@@ -70,19 +71,23 @@ def create_appointments_on_post_save(sender, instance, raw, created, using, **kw
 def update_appt_status_on_related_visit_post_save(
     sender, instance, created, raw, update_fields, **kwargs
 ):
-    if not raw and not update_fields and created:
-        if isinstance(instance, (get_related_visit_model_cls(),)):
-            try:
-                AppointmentStatusUpdater(
-                    instance.appointment,
-                    change_to_in_progress=True,
-                    clear_others_in_progress=True,
-                )
-            except AttributeError as e:
-                if "appointment" not in str(e):
-                    raise
-            except AppointmentStatusUpdaterError:
-                pass
+    if (
+        not raw
+        and not update_fields
+        and created
+        and isinstance(instance, (get_related_visit_model_cls(),))
+    ):
+        try:
+            AppointmentStatusUpdater(
+                instance.appointment,
+                change_to_in_progress=True,
+                clear_others_in_progress=True,
+            )
+        except AttributeError as e:
+            if "appointment" not in str(e):
+                raise
+        except AppointmentStatusUpdaterError:
+            pass
 
 
 @receiver(
@@ -127,7 +132,7 @@ def appointments_on_pre_delete(sender, instance, using, **kwargs):
                 offschedule_datetime = schedule.offschedule_model_cls.objects.get(
                     subject_identifier=instance.subject_identifier
                 ).offschedule_datetime
-            except ObjectDoesNotExist:
+            except ObjectDoesNotExist as e:
                 raise AppointmentDeleteError(
                     f"Appointment may not be deleted. "
                     f"Subject {instance.subject_identifier} is on schedule "
@@ -138,7 +143,7 @@ def appointments_on_pre_delete(sender, instance, using, **kwargs):
                     f"Perhaps complete off schedule model "
                     f"'{instance.schedule.offschedule_model_cls().verbose_name.title()}' "
                     f"first."
-                )
+                ) from e
             else:
                 if onschedule_datetime <= instance.appt_datetime <= offschedule_datetime:
                     raise AppointmentDeleteError(
@@ -146,7 +151,7 @@ def appointments_on_pre_delete(sender, instance, using, **kwargs):
                         f"Subject {instance.subject_identifier} is on schedule "
                         f"'{instance.visit_schedule.verbose_name}.{instance.schedule_name}' "
                         f"as of '{formatted_datetime(onschedule_datetime)}' "
-                        f"until '{formatted_datetime(get_utcnow())}'. "
+                        f"until '{formatted_datetime(timezone.now())}'. "
                         f"Got appointment datetime "
                         f"{formatted_datetime(instance.appt_datetime)}. "
                     )
@@ -177,16 +182,19 @@ def appointments_on_post_delete(sender, instance, using, **kwargs):
     dispatch_uid="update_appointments_to_next_on_post_save",
 )
 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)
-            next_appointment_updated = skip_appt.update()
-            allow_create_interim = getattr(instance, "allow_create_interim", False)
-            if not next_appointment_updated and allow_create_interim:
-                create_next_appointment_as_interim(
-                    next_appt_datetime=skip_appt.next_appt_datetime,
-                    appointment=skip_appt.appointment,
-                )
+    if (
+        not raw
+        and not kwargs.get("update_fields")
+        and get_allow_skipped_appt_using().get(instance._meta.label_lower)
+    ):
+        skip_appt = SkipAppointments(instance)
+        next_appointment_updated = skip_appt.update()
+        allow_create_interim = getattr(instance, "allow_create_interim", False)
+        if not next_appointment_updated and allow_create_interim:
+            create_next_appointment_as_interim(
+                next_appt_datetime=skip_appt.next_appt_datetime,
+                appointment=skip_appt.appointment,
+            )
 
 
 @receiver(post_delete, weak=False, dispatch_uid="update_appointments_to_next_on_post_delete")
@@ -203,11 +211,12 @@ def update_appointments_to_next_on_post_delete(sender, instance, using, **kwargs
 def update_appointment_from_nextappointment_post_save(
     sender, instance, raw, created, using, **kwargs
 ):
-    if not raw and not kwargs.get("update_fields"):
-        if isinstance(instance, (NextAppointmentCrfModelMixin,)):
-            if instance.offschedule_today == NO:
-                appointment = Appointment.objects.get(
-                    pk=instance.related_visit.appointment.next.id
-                )
-                appointment.appt_datetime = instance.appt_datetime
-                appointment.save()
+    if (
+        not raw
+        and not kwargs.get("update_fields")
+        and isinstance(instance, (NextAppointmentCrfModelMixin,))
+        and instance.offschedule_today == NO
+    ):
+        appointment = Appointment.objects.get(pk=instance.related_visit.appointment.next.id)
+        appointment.appt_datetime = instance.appt_datetime
+        appointment.save()