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

edc_visit_schedule/migrations/0020_alter_historicalonschedule_onschedule_datetime_and_more.py

@@ -0,0 +1,65 @@
+# Generated by Django 5.2.6 on 2025-09-18 00:24
+
+import django.utils.timezone
+import edc_model.validators.date
+import edc_protocol.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "edc_visit_schedule",
+            "0019_alter_historicalonschedule_device_created_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalonschedule",
+            name="onschedule_datetime",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now,
+                validators=[
+                    edc_protocol.validators.datetime_not_before_study_start,
+                    edc_model.validators.date.datetime_not_future,
+                ],
+            ),
+        ),
+        migrations.AlterField(
+            model_name="offschedule",
+            name="offschedule_datetime",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now,
+                validators=[
+                    edc_protocol.validators.datetime_not_before_study_start,
+                    edc_model.validators.date.datetime_not_future,
+                ],
+                verbose_name="Date and time subject taken off schedule",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="onschedule",
+            name="onschedule_datetime",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now,
+                validators=[
+                    edc_protocol.validators.datetime_not_before_study_start,
+                    edc_model.validators.date.datetime_not_future,
+                ],
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectschedulehistory",
+            name="schedule_status",
+            field=models.CharField(
+                choices=[
+                    ("onschedule", "On schedule"),
+                    ("offschedule", "Off schedule"),
+                ],
+                default="",
+                max_length=15,
+            ),
+        ),
+    ]

edc_visit_schedule/model_mixins/off_schedule_model_mixin.py

@@ -6,13 +6,14 @@ from zoneinfo import ZoneInfo
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
+from django.utils import timezone
 
 from edc_identifier.managers import SubjectIdentifierManager
 from edc_identifier.model_mixins import UniqueSubjectIdentifierFieldMixin
 from edc_model.validators import datetime_not_future
 from edc_protocol.validators import datetime_not_before_study_start
 from edc_sites.managers import CurrentSiteManager as BaseCurrentSiteManager
-from edc_utils import convert_php_dateformat, get_utcnow
+from edc_utils import convert_php_dateformat
 
 from ..site_visit_schedules import site_visit_schedules
 
@@ -36,7 +37,7 @@ class OffScheduleModelMixin(UniqueSubjectIdentifierFieldMixin, models.Model):
     offschedule_datetime = models.DateTimeField(
         verbose_name="Date and time subject taken off schedule",
         validators=[datetime_not_before_study_start, datetime_not_future],
-        default=get_utcnow,
+        default=timezone.now,
     )
 
     report_datetime = models.DateTimeField(editable=False)
@@ -62,11 +63,11 @@ class OffScheduleModelMixin(UniqueSubjectIdentifierFieldMixin, models.Model):
             self.offschedule_datetime = getattr(self, self.offschedule_datetime_field_attr)
         try:
             self.offschedule_datetime.date()
-        except AttributeError:
+        except AttributeError as e:
             raise ImproperlyConfigured(
                 f"Field class must be DateTimeField. See {self.__class__}."
                 f"{self.offschedule_datetime_field_attr}."
-            )
+            ) from e
 
         datetime_not_before_study_start(self.offschedule_datetime)
         datetime_not_future(self.offschedule_datetime)

edc_visit_schedule/model_mixins/on_schedule_model_mixin.py

@@ -5,13 +5,14 @@ from zoneinfo import ZoneInfo
 
 from django.conf import settings
 from django.db import models
+from django.utils import timezone
 
 from edc_identifier.managers import SubjectIdentifierManager
 from edc_identifier.model_mixins import UniqueSubjectIdentifierFieldMixin
 from edc_model.models import HistoricalRecords
 from edc_model.validators import datetime_not_future
 from edc_protocol.validators import datetime_not_before_study_start
-from edc_utils import convert_php_dateformat, get_utcnow
+from edc_utils import convert_php_dateformat
 
 from ..site_visit_schedules import site_visit_schedules
 
@@ -25,8 +26,8 @@ if TYPE_CHECKING:
 class OnScheduleManager(SubjectIdentifierManager):
     def put_on_schedule(
         self,
-        subject_identifier: str = None,
-        onschedule_datetime: datetime = None,
+        subject_identifier: str,
+        onschedule_datetime: datetime,
         skip_get_current_site: bool | None = None,
     ) -> None:
         """Puts a subject on the schedule associated with this
@@ -51,7 +52,7 @@ class OnScheduleModelMixin(UniqueSubjectIdentifierFieldMixin, models.Model):
 
     onschedule_datetime = models.DateTimeField(
         validators=[datetime_not_before_study_start, datetime_not_future],
-        default=get_utcnow,
+        default=timezone.now,
     )
 
     report_datetime = models.DateTimeField(editable=False)

edc_visit_schedule/model_mixins/visit_schedule/visit_code_fields_model_mixin.py

@@ -2,7 +2,7 @@ from django.db import models
 
 
 class VisitCodeFieldsModelMixin(models.Model):
-    visit_code = models.CharField(max_length=25, null=True, editable=False)
+    visit_code = models.CharField(max_length=25, default="", editable=False)
 
     visit_code_sequence = models.IntegerField(
         verbose_name="Sequence",

edc_visit_schedule/models/subject_schedule_history.py

@@ -1,6 +1,7 @@
 from django.apps import apps as django_apps
 from django.db import models
 from django.db.models import Q, UniqueConstraint
+from django.utils import timezone
 
 from edc_identifier.model_mixins import NonUniqueSubjectIdentifierFieldMixin
 from edc_model.models import BaseUuidModel
@@ -8,7 +9,6 @@ from edc_model.validators import datetime_not_future
 from edc_protocol.validators import datetime_not_before_study_start
 from edc_sites.managers import CurrentSiteManager
 from edc_sites.model_mixins import SiteModelMixin
-from edc_utils import get_utcnow
 
 from ..choices import SCHEDULE_STATUS
 from ..model_mixins import VisitScheduleFieldsModelMixin
@@ -32,7 +32,7 @@ class SubjectScheduleModelManager(models.Manager):
         relative to the report_datetime.
         """
         onschedules = []
-        report_datetime = report_datetime or get_utcnow()
+        report_datetime = report_datetime or timezone.now()
         qs = self.filter(
             Q(subject_identifier=subject_identifier),
             Q(onschedule_datetime__lte=report_datetime),
@@ -67,7 +67,7 @@ class SubjectScheduleHistory(
         validators=[datetime_not_before_study_start, datetime_not_future], null=True
     )
 
-    schedule_status = models.CharField(max_length=15, choices=SCHEDULE_STATUS, null=True)
+    schedule_status = models.CharField(max_length=15, choices=SCHEDULE_STATUS, default="")
 
     objects = SubjectScheduleModelManager()
 
@@ -101,12 +101,12 @@ class SubjectScheduleHistory(
         return django_apps.get_model(self.offschedule_model)
 
     class Meta(BaseUuidModel.Meta, NonUniqueSubjectIdentifierFieldMixin.Meta):
-        constraints = [
+        constraints = (
             UniqueConstraint(
                 fields=["subject_identifier", "visit_schedule_name", "schedule_name"],
                 name="%(app_label)s_%(class)s_subject_uniq",
-            )
-        ]
+            ),
+        )
         indexes = (
             *BaseUuidModel.Meta.indexes,
             *NonUniqueSubjectIdentifierFieldMixin.Meta.indexes,

edc_visit_schedule/schedule/visit_collection.py

@@ -39,7 +39,7 @@ class VisitCollection(OrderedCollection):
             except TypeError as e:
                 raise VisitCollectionError(
                     f"Invalid visit.rbase. visit.rbase={visit.rbase}. See {visit!r}. Got {e}."
-                )
+                ) from e
             else:
                 visit.timepoint_datetime = timepoint_datetime
             timepoint_dates.update({visit: visit.timepoint_datetime})

edc_visit_schedule/site_visit_schedules.py

@@ -163,10 +163,10 @@ class SiteVisitSchedules:
             for schedule in visit_schedule.schedules.values():
                 try:
                     model_name = getattr(schedule, attr)
-                except (AttributeError, TypeError):
+                except (AttributeError, TypeError) as e:
                     raise SiteVisitScheduleError(
                         f"Invalid attr for Schedule. See {schedule}. Got {attr}."
-                    )
+                    ) from e
                 if model_name and model_name == model:
                     ret.append([visit_schedule, schedule])
         if not ret:

edc_visit_schedule/subject_schedule.py

@@ -6,6 +6,7 @@ from typing import TYPE_CHECKING
 from django.apps import apps as django_apps
 from django.conf import settings
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
+from django.utils import timezone
 
 from edc_appointment.constants import COMPLETE_APPT, IN_PROGRESS_APPT
 from edc_appointment.creators import AppointmentsCreator
@@ -14,7 +15,7 @@ from edc_consent.exceptions import ConsentDefinitionError
 from edc_consent.site_consents import site_consents
 from edc_sites.site import sites as site_sites
 from edc_sites.utils import valid_site_for_subject_or_raise
-from edc_utils import convert_php_dateformat, formatted_datetime, get_utcnow
+from edc_utils import convert_php_dateformat, formatted_datetime
 from edc_utils.date import to_local
 
 from .constants import OFF_SCHEDULE, ON_SCHEDULE
@@ -112,7 +113,7 @@ class SubjectSchedule:
         Appointment are created here by calling the
         appointments_creator_cls.
         """
-        onschedule_datetime = onschedule_datetime or get_utcnow()
+        onschedule_datetime = onschedule_datetime or timezone.now()
         if not consent_definition and len(self.schedule.consent_definitions) == 1:
             consent_definition = self.schedule.consent_definitions[0]
         elif not consent_definition:
@@ -375,13 +376,13 @@ class SubjectSchedule:
             in_date_range = (
                 onschedule_obj.onschedule_datetime
                 <= report_datetime
-                <= (offschedule_datetime or get_utcnow())
+                <= (offschedule_datetime or timezone.now())
             )
         else:
             in_date_range = (
                 onschedule_obj.onschedule_datetime.date()
                 <= report_datetime.date()
-                <= (offschedule_datetime or get_utcnow()).date()
+                <= (offschedule_datetime or timezone.now()).date()
             )
 
         if offschedule_datetime and not in_date_range:

edc_visit_schedule/view_mixins.py

@@ -3,8 +3,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 
 from django.core.exceptions import ObjectDoesNotExist
-
-from edc_utils import get_utcnow
+from django.utils import timezone
 
 from .site_visit_schedules import site_visit_schedules
 
@@ -39,7 +38,7 @@ class VisitScheduleViewMixin:
                     else:
                         self.onschedule_models.append(onschedule_model_obj)
                         self.visit_schedules.update({visit_schedule.name: visit_schedule})
-                        if schedule.is_onschedule(self.subject_identifier, get_utcnow()):
+                        if schedule.is_onschedule(self.subject_identifier, timezone.now()):
                             self.current_schedule = schedule
                             self.current_visit_schedule = visit_schedule
                             self.current_onschedule_model = onschedule_model_obj

edc_visit_schedule/visit/visit.py

@@ -5,9 +5,10 @@ from decimal import Decimal
 from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
+from django.utils import timezone
 
 from edc_facility.utils import get_default_facility_name, get_facility
-from edc_utils import get_utcnow, to_local
+from edc_utils import to_local
 
 from .crf_collection import CrfCollection
 from .forms_collection import FormsCollection
@@ -172,7 +173,7 @@ class Visit:
             timepoint=self.timepoint,
             base_timepoint=self.base_timepoint,
         )
-        utcnow = get_utcnow()
+        utcnow = timezone.now()
         self.validate_rlower_late(utcnow)
         self.validate_rupper_late(utcnow)
         self.title = title or f"Visit {self.code}"

edc_visit_tracking/migrations/0004_subjectvisit_subjectvisitmissedreasons_extra_value_and_more.py

@@ -21,8 +21,8 @@ import edc_model.validators.date
 import edc_model_fields.fields.other_charfield
 import edc_protocol.validators
 import edc_sites.models
-import edc_utils.date
 import edc_visit_tracking.managers
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -52,14 +52,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,
                     ),
                 ),
                 (
@@ -146,7 +146,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         help_text="Date and time of this report",
                         validators=[
                             edc_protocol.validators.datetime_not_before_study_start,
@@ -414,14 +414,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,
                     ),
                 ),
                 (
@@ -483,7 +483,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         help_text="If reporting today, use today's date/time, otherwise use the date/time this information was reported.",
                         validators=[
                             edc_protocol.validators.datetime_not_before_study_start,
@@ -673,14 +673,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,
                     ),
                 ),
                 (
@@ -766,7 +766,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         help_text="Date and time of this report",
                         validators=[
                             edc_protocol.validators.datetime_not_before_study_start,
@@ -1033,14 +1033,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,
                     ),
                 ),
                 (
@@ -1103,7 +1103,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         help_text="If reporting today, use today's date/time, otherwise use the date/time this information was reported.",
                         validators=[
                             edc_protocol.validators.datetime_not_before_study_start,