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

edc_subject_dashboard/view_mixins/subject_visit_view_mixin.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
 
+import contextlib
 from typing import TYPE_CHECKING, Any
 
 from django.core.exceptions import ObjectDoesNotExist
+from django.utils import timezone
 
-from edc_utils import get_utcnow
 from edc_visit_schedule.models import VisitSchedule
 
 if TYPE_CHECKING:
@@ -46,8 +47,8 @@ class SubjectVisitViewMixin:
                     self._related_visit = self.appointment.related_visit
                 except AttributeError as e:
                     raise SubjectVisitViewMixinError(
-                        "Visit model must have a OneToOne relation to appointment. " f"Got {e}"
-                    )
+                        f"Visit model must have a OneToOne relation to appointment. Got {e}"
+                    ) from e
         return self._related_visit
 
     def get_visit_schedule(self) -> VisitSchedule | None:
@@ -60,10 +61,8 @@ class SubjectVisitViewMixin:
                 schedule_name=self.appointment.schedule_name,
                 visit_code=self.appointment.visit_code,
             )
-            try:
+            with contextlib.suppress(ObjectDoesNotExist):
                 visit_schedule = VisitSchedule.objects.get(**opts)
-            except ObjectDoesNotExist:
-                pass
         return visit_schedule
 
     @property
@@ -76,7 +75,7 @@ class SubjectVisitViewMixin:
                 try:
                     self._report_datetime = self.appointment.appt_datetime
                 except AttributeError:
-                    self._report_datetime = get_utcnow()
+                    self._report_datetime = timezone.now()
         return self._report_datetime
 
     def has_appointment_attr_or_raise(self) -> None:
@@ -89,5 +88,5 @@ class SubjectVisitViewMixin:
             if "appointment" in str(e):
                 raise SubjectVisitViewMixinError(
                     f"Mixin must be declared together with AppointmentViewMixin. Got {e}"
-                )
+                ) from e
             raise

edc_subject_dashboard/view_utils/subject_consent_listboard_button.py

@@ -5,10 +5,11 @@ from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, TypeVar
 from uuid import UUID
 
+from django.utils import timezone
+
 from edc_consent import site_consents
 from edc_pdutils.site import Site
 from edc_protocol.research_protocol_config import ResearchProtocolConfig
-from edc_utils import get_utcnow
 from edc_view_utils import ModelButton
 
 if TYPE_CHECKING:
@@ -42,7 +43,7 @@ class SubjectConsentListboardButton(ModelButton):
 
     def __post_init__(self):
         cdef = site_consents.get_consent_definition(
-            report_datetime=get_utcnow(),
+            report_datetime=timezone.now(),
             screening_model=self.screening_obj._meta.label_lower,
         )
         self.model_cls = cdef.model_cls

edc_subject_dashboard/view_utils/timepoint_status_button.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, TypeVar
 
+from django.utils import timezone
 from django.utils.translation import gettext as _
 
 from edc_appointment.constants import (
@@ -13,7 +14,6 @@ from edc_appointment.constants import (
     SKIPPED_APPT,
 )
 from edc_appointment.view_utils import AppointmentButton
-from edc_utils import get_utcnow
 
 if TYPE_CHECKING:
     from edc_visit_tracking.model_mixins import VisitModelMixin
@@ -79,7 +79,7 @@ class TimepointStatusButton(AppointmentButton):
         elif self.model_obj.appt_status == INCOMPLETE_APPT:
             color = self.colors[INCOMPLETE]  # default / grey
         elif self.model_obj.appt_status == NEW_APPT:
-            if self.model_obj.appt_datetime <= get_utcnow():
+            if self.model_obj.appt_datetime <= timezone.now():
                 color = self.colors[NEW_LATE]  # warning / orange
             else:
                 color = self.colors[NEW]

edc_timepoint/apps.py

@@ -1,7 +1,6 @@
 import sys
 
 from django.apps import AppConfig as DjangoAppConfig
-from django.conf import settings
 
 from edc_appointment.constants import COMPLETE_APPT
 
@@ -35,23 +34,3 @@ class AppConfig(DjangoAppConfig):
         for model in self.timepoints:
             sys.stdout.write(f" * '{model}' is a timepoint model.\n")
         sys.stdout.write(f" Done loading {self.verbose_name}.\n")
-
-
-if settings.APP_NAME == "edc_timepoint":
-    from dateutil.relativedelta import FR, MO, SA, SU, TH, TU, WE
-
-    from edc_facility.apps import AppConfig as BaseEdcFacilityAppConfig
-
-    class EdcFacilityAppConfig(BaseEdcFacilityAppConfig):
-        definitions = {
-            "7-day-clinic": dict(
-                days=[MO, TU, WE, TH, FR, SA, SU],
-                slots=[100, 100, 100, 100, 100, 100, 100],
-            ),
-            "5-day-clinic": dict(days=[MO, TU, WE, TH, FR], slots=[100, 100, 100, 100, 100]),
-            "3-day-clinic": dict(
-                days=[TU, WE, TH],
-                slots=[100, 100, 100],
-                best_effort_available_datetime=True,
-            ),
-        }

edc_timepoint/model_mixins.py

@@ -1,8 +1,7 @@
 from django.apps import apps as django_apps
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
-
-from edc_utils import get_utcnow
+from django.utils import timezone
 
 from .choices import TIMEPOINT_STATUS
 from .constants import CLOSED_TIMEPOINT, FEEDBACK, OPEN_TIMEPOINT
@@ -12,10 +11,17 @@ from .timepoint_lookup import TimepointLookup
 from .utils import get_enable_timepoint_checks
 
 
-class UnableToCloseTimepoint(Exception):
+class UnableToCloseTimepoint(Exception):  # noqa: N818
     pass
 
 
+MODEL_NOT_REGISTERED = (
+    "Model not registered. Model '{label_lower}' is not registered "
+    "in AppConfig as a timepoint. "
+    "See AppConfig for 'edc_timepoint'."
+)
+
+
 class TimepointLookupModelMixin(models.Model):
     """Makes a model lookup the timepoint model instance on `save`
     and check if it is a closed before allowing a create or update.
@@ -59,15 +65,14 @@ class TimepointModelMixin(models.Model):
     timepoint_closed_datetime = models.DateTimeField(null=True, editable=False)
 
     def save(self, *args, **kwargs):
-        if self.enabled_as_timepoint:
-            if (
-                kwargs.get("update_fields") != ["timepoint_status"]
-                and kwargs.get("update_fields")
-                != ["timepoint_opened_datetime", "timepoint_status"]
-                and kwargs.get("update_fields")
-                != ["timepoint_closed_datetime", "timepoint_status"]
-            ):
-                self.timepoint_open_or_raise()
+        if self.enabled_as_timepoint and (
+            kwargs.get("update_fields") != ["timepoint_status"]
+            and kwargs.get("update_fields")
+            != ["timepoint_opened_datetime", "timepoint_status"]
+            and kwargs.get("update_fields")
+            != ["timepoint_closed_datetime", "timepoint_status"]
+        ):
+            self.timepoint_open_or_raise()
         super().save(*args, **kwargs)
 
     def update_timepoint(self):
@@ -95,12 +100,10 @@ class TimepointModelMixin(models.Model):
             app_config = django_apps.get_app_config("edc_timepoint")
             try:
                 timepoint = app_config.timepoints.get(self._meta.label_lower)
-            except KeyError:
+            except KeyError as e:
                 raise TimepointConfigError(
-                    f"Model '{self._meta.label_lower}' is not registered "
-                    f"in AppConfig as a timepoint. "
-                    f"See AppConfig for 'edc_timepoint'."
-                )
+                    MODEL_NOT_REGISTERED.format(label_lower=self._meta.label_lower)
+                ) from e
         if getattr(self, timepoint.status_field) != timepoint.closed_status:
             self.timepoint_status = OPEN_TIMEPOINT
             self.timepoint_closed_datetime = None
@@ -122,7 +125,7 @@ class TimepointModelMixin(models.Model):
         status = getattr(self, timepoint.status_field)
         if status == timepoint.closed_status:
             self.timepoint_status = CLOSED_TIMEPOINT
-            self.timepoint_closed_datetime = get_utcnow()
+            self.timepoint_closed_datetime = timezone.now()
             self.save(update_fields=["timepoint_status"])
         else:
             raise UnableToCloseTimepoint(
@@ -146,8 +149,7 @@ class TimepointModelMixin(models.Model):
             return '<span style="color:red;">Closed</span>'
         if self.timepoint_status == FEEDBACK:
             return '<span style="color:orange;">Feedback</span>'
-
-    # timepoint.allow_tags = True
+        return None
 
     class Meta:
         abstract = True

edc_transfer/model_mixins.py

@@ -1,5 +1,6 @@
 from django.conf import settings
 from django.db import models
+from django.utils import timezone
 from django_crypto_fields.fields import EncryptedTextField
 
 from edc_action_item.models import ActionModelMixin
@@ -8,7 +9,6 @@ from edc_identifier.model_mixins import UniqueSubjectIdentifierFieldMixin
 from edc_model import models as edc_models
 from edc_sites.model_mixins import SiteModelMixin
 from edc_utils import convert_php_dateformat
-from edc_utils.date import get_utcnow
 
 from .choices import TRANSFER_INITIATORS
 from .constants import SUBJECT_TRANSFER_ACTION
@@ -23,10 +23,10 @@ class SubjectTransferModelMixin(
     action_name = SUBJECT_TRANSFER_ACTION
 
     report_datetime = models.DateTimeField(
-        verbose_name="Report Date and Time", default=get_utcnow
+        verbose_name="Report Date and Time", default=timezone.now
     )
 
-    transfer_date = models.DateField(verbose_name="Transfer date", default=get_utcnow)
+    transfer_date = models.DateField(verbose_name="Transfer date", default=timezone.now)
 
     initiated_by = models.CharField(
         verbose_name="Who initiated the transfer request",
@@ -53,7 +53,7 @@ class SubjectTransferModelMixin(
     )
 
     may_contact = models.CharField(
-        verbose_name=("Is the participant willing to be contacted at the end of the study?"),
+        verbose_name="Is the participant willing to be contacted at the end of the study?",
         max_length=15,
         choices=YES_NO,
     )

edc_transfer/modeladmin_mixins.py

@@ -30,7 +30,7 @@ class SubjectTransferModelAdminMixin:
 
     filter_horizontal = ("transfer_reason",)
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "initiated_by": admin.VERTICAL,
         "may_return": admin.VERTICAL,
         "may_contact": admin.VERTICAL,

edc_unblinding/auths.py

@@ -9,7 +9,12 @@ from .auth_objects import (
     unblinding_reviewers,
 )
 
-site_auths.add_group(*unblinding_requestors, name=UNBLINDING_REQUESTORS)
-site_auths.add_group(*unblinding_reviewers, name=UNBLINDING_REVIEWERS)
-site_auths.add_role(UNBLINDING_REQUESTORS, name=UNBLINDING_REQUESTORS_ROLE)
-site_auths.add_role(UNBLINDING_REVIEWERS, name=UNBLINDING_REVIEWERS_ROLE)
+
+def update_site_auths() -> None:
+    site_auths.add_group(*unblinding_requestors, name=UNBLINDING_REQUESTORS)
+    site_auths.add_group(*unblinding_reviewers, name=UNBLINDING_REVIEWERS)
+    site_auths.add_role(UNBLINDING_REQUESTORS, name=UNBLINDING_REQUESTORS_ROLE)
+    site_auths.add_role(UNBLINDING_REVIEWERS, name=UNBLINDING_REVIEWERS_ROLE)
+
+
+update_site_auths()

edc_unblinding/migrations/0001_initial.py

@@ -17,7 +17,7 @@ from django.db import migrations, models
 
 import edc_identifier.managers
 import edc_sites.models
-import edc_utils.date
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -81,14 +81,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -163,7 +163,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         verbose_name="Report Date and Time",
                     ),
                 ),
@@ -257,14 +257,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -339,7 +339,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         verbose_name="Report Date and Time",
                     ),
                 ),
@@ -452,14 +452,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -542,7 +542,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         verbose_name="Report Date and Time",
                     ),
                 ),
@@ -661,14 +661,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -751,7 +751,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         verbose_name="Report Date and Time",
                     ),
                 ),

edc_unblinding/migrations/0014_alter_historicalunblindingrequest_action_identifier_and_more.py

@@ -0,0 +1,291 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_unblinding", "0013_alter_historicalunblindingrequest_revision_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalunblindingrequest",
+            name="action_identifier",
+            field=models.CharField(
+                blank=True, db_index=True, default="", max_length=50
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalunblindingrequest",
+            name="action_item_reason",
+            field=models.TextField(default="", editable=False),
+        ),
+        migrations.AlterField(
+            model_name="historicalunblindingrequest",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalunblindingrequest",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalunblindingrequest",
+            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="historicalunblindingrequest",
+            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="historicalunblindingrequest",
+            name="parent_action_identifier",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="action identifier that links to parent reference model instance.",
+                max_length=30,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalunblindingrequest",
+            name="related_action_identifier",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="action identifier that links to related reference model instance.",
+                max_length=30,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalunblindingreview",
+            name="action_identifier",
+            field=models.CharField(
+                blank=True, db_index=True, default="", max_length=50
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalunblindingreview",
+            name="action_item_reason",
+            field=models.TextField(default="", editable=False),
+        ),
+        migrations.AlterField(
+            model_name="historicalunblindingreview",
+            name="comment",
+            field=models.TextField(default="", verbose_name="Comment"),
+        ),
+        migrations.AlterField(
+            model_name="historicalunblindingreview",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalunblindingreview",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalunblindingreview",
+            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="historicalunblindingreview",
+            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="historicalunblindingreview",
+            name="parent_action_identifier",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="action identifier that links to parent reference model instance.",
+                max_length=30,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalunblindingreview",
+            name="related_action_identifier",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="action identifier that links to related reference model instance.",
+                max_length=30,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="unblindingrequest",
+            name="action_identifier",
+            field=models.CharField(blank=True, default="", max_length=50, unique=True),
+        ),
+        migrations.AlterField(
+            model_name="unblindingrequest",
+            name="action_item_reason",
+            field=models.TextField(default="", editable=False),
+        ),
+        migrations.AlterField(
+            model_name="unblindingrequest",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="unblindingrequest",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="unblindingrequest",
+            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="unblindingrequest",
+            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="unblindingrequest",
+            name="parent_action_identifier",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="action identifier that links to parent reference model instance.",
+                max_length=30,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="unblindingrequest",
+            name="related_action_identifier",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="action identifier that links to related reference model instance.",
+                max_length=30,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="unblindingreview",
+            name="action_identifier",
+            field=models.CharField(blank=True, default="", max_length=50, unique=True),
+        ),
+        migrations.AlterField(
+            model_name="unblindingreview",
+            name="action_item_reason",
+            field=models.TextField(default="", editable=False),
+        ),
+        migrations.AlterField(
+            model_name="unblindingreview",
+            name="comment",
+            field=models.TextField(default="", verbose_name="Comment"),
+        ),
+        migrations.AlterField(
+            model_name="unblindingreview",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="unblindingreview",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="unblindingreview",
+            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="unblindingreview",
+            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="unblindingreview",
+            name="parent_action_identifier",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="action identifier that links to parent reference model instance.",
+                max_length=30,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="unblindingreview",
+            name="related_action_identifier",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="action identifier that links to related reference model instance.",
+                max_length=30,
+            ),
+        ),
+    ]