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

edc_visit_tracking/migrations/0009_alter_historicalsubjectvisit_comments_and_more.py

@@ -0,0 +1,450 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+import edc_model_fields.fields.other_charfield
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_visit_tracking", "0008_alter_historicalsubjectvisit_revision_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalsubjectvisit",
+            name="comments",
+            field=models.TextField(
+                blank=True,
+                default="",
+                max_length=250,
+                verbose_name="Comment if any additional pertinent information about the participant",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisit",
+            name="consent_model",
+            field=models.CharField(blank=True, default="", max_length=50),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisit",
+            name="consent_version",
+            field=models.CharField(blank=True, default="", max_length=10),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisit",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisit",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisit",
+            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="historicalsubjectvisit",
+            name="info_source_other",
+            field=edc_model_fields.fields.other_charfield.OtherCharField(
+                blank=True,
+                default="",
+                max_length=35,
+                verbose_name='If "Other" source of information, specify',
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisit",
+            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="historicalsubjectvisit",
+            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="historicalsubjectvisit",
+            name="reason_missed",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("timepoint", "Missed timepoint"),
+                    ("OTHER", "Other"),
+                    ("N/A", "Not applicable"),
+                ],
+                default="",
+                max_length=35,
+                verbose_name="If 'missed', provide the reason for the missed visit",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisit",
+            name="reason_missed_other",
+            field=edc_model_fields.fields.other_charfield.OtherCharField(
+                blank=True,
+                default="",
+                max_length=25,
+                verbose_name='If the reason for the missed visit is "other", specify',
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisit",
+            name="study_status",
+            field=models.CharField(
+                default="",
+                max_length=50,
+                verbose_name="What is the participant's current study status",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisit",
+            name="survival_status",
+            field=models.CharField(
+                choices=[
+                    ("alive", "Alive"),
+                    ("dead", "Deceased"),
+                    ("unknown", "Unknown"),
+                    ("N/A", "Not applicable (if missed)"),
+                ],
+                default="alive",
+                help_text="If YES, submit Death report",
+                max_length=10,
+                verbose_name="Participant's survival status",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisit",
+            name="visit_code",
+            field=models.CharField(default="", editable=False, max_length=25),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisitmissed",
+            name="comment",
+            field=models.TextField(
+                blank=True,
+                default="",
+                verbose_name="Please provide further details, if any",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisitmissed",
+            name="consent_model",
+            field=models.CharField(blank=True, default="", max_length=50),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisitmissed",
+            name="consent_version",
+            field=models.CharField(blank=True, default="", max_length=10),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisitmissed",
+            name="contact_attempts_explained",
+            field=models.TextField(
+                blank=True,
+                default="",
+                verbose_name="If contact not made and less than 3 attempts, please explain",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisitmissed",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisitmissed",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisitmissed",
+            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="historicalsubjectvisitmissed",
+            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="subjectvisit",
+            name="comments",
+            field=models.TextField(
+                blank=True,
+                default="",
+                max_length=250,
+                verbose_name="Comment if any additional pertinent information about the participant",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisit",
+            name="consent_model",
+            field=models.CharField(blank=True, default="", max_length=50),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisit",
+            name="consent_version",
+            field=models.CharField(blank=True, default="", max_length=10),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisit",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisit",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisit",
+            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="subjectvisit",
+            name="info_source_other",
+            field=edc_model_fields.fields.other_charfield.OtherCharField(
+                blank=True,
+                default="",
+                max_length=35,
+                verbose_name='If "Other" source of information, specify',
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisit",
+            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="subjectvisit",
+            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="subjectvisit",
+            name="reason_missed",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("timepoint", "Missed timepoint"),
+                    ("OTHER", "Other"),
+                    ("N/A", "Not applicable"),
+                ],
+                default="",
+                max_length=35,
+                verbose_name="If 'missed', provide the reason for the missed visit",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisit",
+            name="reason_missed_other",
+            field=edc_model_fields.fields.other_charfield.OtherCharField(
+                blank=True,
+                default="",
+                max_length=25,
+                verbose_name='If the reason for the missed visit is "other", specify',
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisit",
+            name="study_status",
+            field=models.CharField(
+                default="",
+                max_length=50,
+                verbose_name="What is the participant's current study status",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisit",
+            name="survival_status",
+            field=models.CharField(
+                choices=[
+                    ("alive", "Alive"),
+                    ("dead", "Deceased"),
+                    ("unknown", "Unknown"),
+                    ("N/A", "Not applicable (if missed)"),
+                ],
+                default="alive",
+                help_text="If YES, submit Death report",
+                max_length=10,
+                verbose_name="Participant's survival status",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisit",
+            name="visit_code",
+            field=models.CharField(default="", editable=False, max_length=25),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisitmissed",
+            name="comment",
+            field=models.TextField(
+                blank=True,
+                default="",
+                verbose_name="Please provide further details, if any",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisitmissed",
+            name="consent_model",
+            field=models.CharField(blank=True, default="", max_length=50),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisitmissed",
+            name="consent_version",
+            field=models.CharField(blank=True, default="", max_length=10),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisitmissed",
+            name="contact_attempts_explained",
+            field=models.TextField(
+                blank=True,
+                default="",
+                verbose_name="If contact not made and less than 3 attempts, please explain",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisitmissed",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisitmissed",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisitmissed",
+            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="subjectvisitmissed",
+            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="subjectvisitmissedreasons",
+            name="extra_value",
+            field=models.CharField(default="", max_length=250),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisitmissedreasons",
+            name="field_name",
+            field=models.CharField(
+                blank=True,
+                default="",
+                editable=False,
+                help_text="Not required",
+                max_length=25,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisitmissedreasons",
+            name="plural_name",
+            field=models.CharField(
+                default="", max_length=250, verbose_name="Plural name"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="visitreasons",
+            name="extra_value",
+            field=models.CharField(default="", max_length=250),
+        ),
+        migrations.AlterField(
+            model_name="visitreasons",
+            name="field_name",
+            field=models.CharField(
+                blank=True,
+                default="",
+                editable=False,
+                help_text="Not required",
+                max_length=25,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="visitreasons",
+            name="plural_name",
+            field=models.CharField(
+                default="", max_length=250, verbose_name="Plural name"
+            ),
+        ),
+    ]

edc_visit_tracking/migrations/0010_alter_historicalsubjectvisit_report_datetime_and_more.py

@@ -0,0 +1,68 @@
+# 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_tracking", "0009_alter_historicalsubjectvisit_comments_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalsubjectvisit",
+            name="report_datetime",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now,
+                help_text="Date and time of this report",
+                validators=[
+                    edc_protocol.validators.datetime_not_before_study_start,
+                    edc_model.validators.date.datetime_not_future,
+                ],
+                verbose_name="Report date and time",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectvisitmissed",
+            name="report_datetime",
+            field=models.DateTimeField(
+                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,
+                    edc_model.validators.date.datetime_not_future,
+                ],
+                verbose_name="Report Date",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisit",
+            name="report_datetime",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now,
+                help_text="Date and time of this report",
+                validators=[
+                    edc_protocol.validators.datetime_not_before_study_start,
+                    edc_model.validators.date.datetime_not_future,
+                ],
+                verbose_name="Report date and time",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectvisitmissed",
+            name="report_datetime",
+            field=models.DateTimeField(
+                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,
+                    edc_model.validators.date.datetime_not_future,
+                ],
+                verbose_name="Report Date",
+            ),
+        ),
+    ]

edc_visit_tracking/model_mixins/base/visit_methods_model_mixin.py

@@ -27,7 +27,7 @@ class VisitMethodsModelMixin(models.Model):
     def natural_key(self) -> tuple:
         return tuple(getattr(self, self.related_visit_model_attr()).natural_key())
 
-    natural_key.dependencies = [settings.SUBJECT_VISIT_MODEL]
+    natural_key.dependencies = (settings.SUBJECT_VISIT_MODEL,)
 
     @classmethod
     def related_visit_model_attr(cls) -> str:
@@ -103,11 +103,11 @@ class VisitMethodsModelMixin(models.Model):
                 if issubclass(related_model, (VisitModelMixin,)):
                     try:
                         related_visit = getattr(self, field.name)
-                    except ObjectDoesNotExist:
+                    except ObjectDoesNotExist as e:
                         raise RelatedVisitFieldError(
                             f"Related visit cannot be None. See {self.__class__}. "
                             "Perhaps catch this in the form."
-                        )
+                        ) from e
                     break
                 related_model = None
         if not related_model:

edc_visit_tracking/model_mixins/crfs/visit_tracking_crf_model_mixin.py

@@ -2,11 +2,11 @@ from __future__ import annotations
 
 from django.conf import settings
 from django.db import models
+from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
 from edc_model.validators import datetime_not_future
 from edc_protocol.validators import datetime_not_before_study_start
-from edc_utils import get_utcnow
 from edc_visit_schedule.model_mixins import CrfScheduleModelMixin
 
 from ..base import VisitMethodsModelMixin
@@ -31,7 +31,7 @@ class VisitTrackingCrfModelMixin(VisitMethodsModelMixin, CrfScheduleModelMixin,
     report_datetime = models.DateTimeField(
         verbose_name=_("Report Date"),
         validators=[datetime_not_before_study_start, datetime_not_future],
-        default=get_utcnow,
+        default=timezone.now,
         help_text=_(
             "If reporting today, use today's date/time, otherwise use "
             "the date/time this information was reported."

edc_visit_tracking/model_mixins/requisitions/visit_tracking_requisition_model_mixin.py

@@ -1,10 +1,10 @@
 from django.conf import settings
 from django.db import models
+from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
 from edc_model.validators import datetime_not_future
 from edc_protocol.validators import datetime_not_before_study_start
-from edc_utils import get_utcnow
 from edc_visit_schedule.model_mixins import CrfScheduleModelMixin
 
 from ..base import VisitMethodsModelMixin
@@ -22,7 +22,7 @@ class VisitTrackingRequisitionModelMixin(
     report_datetime = models.DateTimeField(
         verbose_name=_("Report Date"),
         validators=[datetime_not_before_study_start, datetime_not_future],
-        default=get_utcnow,
+        default=timezone.now,
         help_text=_(
             "If reporting today, use today's date/time, otherwise use "
             "the date/time this information was reported."

edc_visit_tracking/model_mixins/subject_visit_missed_model_mixin.py

@@ -71,7 +71,7 @@ class SubjectVisitMissedModelMixin(models.Model):
 
     contact_attempts_explained = models.TextField(
         verbose_name=_("If contact not made and less than 3 attempts, please explain"),
-        null=True,
+        default="",
         blank=True,
     )
 
@@ -105,7 +105,7 @@ class SubjectVisitMissedModelMixin(models.Model):
 
     comment = models.TextField(
         verbose_name=_("Please provide further details, if any"),
-        null=True,
+        default="",
         blank=True,
     )
 

edc_visit_tracking/model_mixins/visit_model_mixin/caretaker_fields_mixin.py

@@ -16,8 +16,7 @@ class CaretakerFieldsMixin(models.Model):
 
     information_provider = models.CharField(
         verbose_name=(
-            "Please indicate who provided most of the "
-            "information for this participant's visit"
+            "Please indicate who provided most of the information for this participant's visit"
         ),
         max_length=20,
     )
@@ -26,7 +25,7 @@ class CaretakerFieldsMixin(models.Model):
         verbose_name="if information provider is Other, please specify",
         max_length=20,
         blank=True,
-        null=True,
+        default="",
     )
 
     is_present = models.CharField(

edc_visit_tracking/model_mixins/visit_model_mixin/previous_visit_model_mixin.py

@@ -43,7 +43,7 @@ class PreviousVisitModelMixin(models.Model):
         try:
             visit_sequence.enforce_sequence()
         except VisitSequenceError as e:
-            raise PreviousVisitError(e)
+            raise PreviousVisitError(e) from e
 
     @property
     def previous_visit(self: Appointment | RelatedVisitProtocol | Self) -> Any: