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

edc_adverse_event/migrations/0016_alter_aeactionclassification_device_created_and_more.py

@@ -0,0 +1,285 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_adverse_event", "0015_alter_aeactionclassification_revision_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="aeactionclassification",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="aeactionclassification",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="aeactionclassification",
+            name="extra_value",
+            field=models.CharField(default="", max_length=250),
+        ),
+        migrations.AlterField(
+            model_name="aeactionclassification",
+            name="field_name",
+            field=models.CharField(
+                blank=True,
+                default="",
+                editable=False,
+                help_text="Not required",
+                max_length=25,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="aeactionclassification",
+            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="aeactionclassification",
+            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="aeactionclassification",
+            name="plural_name",
+            field=models.CharField(
+                default="", max_length=250, verbose_name="Plural name"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="aeclassification",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="aeclassification",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="aeclassification",
+            name="extra_value",
+            field=models.CharField(default="", max_length=250),
+        ),
+        migrations.AlterField(
+            model_name="aeclassification",
+            name="field_name",
+            field=models.CharField(
+                blank=True,
+                default="",
+                editable=False,
+                help_text="Not required",
+                max_length=25,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="aeclassification",
+            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="aeclassification",
+            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="aeclassification",
+            name="plural_name",
+            field=models.CharField(
+                default="", max_length=250, verbose_name="Plural name"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="causeofdeath",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="causeofdeath",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="causeofdeath",
+            name="extra_value",
+            field=models.CharField(default="", max_length=250),
+        ),
+        migrations.AlterField(
+            model_name="causeofdeath",
+            name="field_name",
+            field=models.CharField(
+                blank=True,
+                default="",
+                editable=False,
+                help_text="Not required",
+                max_length=25,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="causeofdeath",
+            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="causeofdeath",
+            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="causeofdeath",
+            name="plural_name",
+            field=models.CharField(
+                default="", max_length=250, verbose_name="Plural name"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edcpermissions",
+            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="edcpermissions",
+            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="saereason",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="saereason",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="saereason",
+            name="extra_value",
+            field=models.CharField(default="", max_length=250),
+        ),
+        migrations.AlterField(
+            model_name="saereason",
+            name="field_name",
+            field=models.CharField(
+                blank=True,
+                default="",
+                editable=False,
+                help_text="Not required",
+                max_length=25,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="saereason",
+            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="saereason",
+            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="saereason",
+            name="plural_name",
+            field=models.CharField(
+                default="", max_length=250, verbose_name="Plural name"
+            ),
+        ),
+    ]

edc_adverse_event/model_mixins/ae_followup/ae_followup_fields_model_mixin.py

@@ -1,9 +1,9 @@
 from django.db import models
+from django.utils import timezone
 
 from edc_constants.choices import YES_NO
 from edc_constants.constants import NOT_APPLICABLE, YES
 from edc_model.validators import date_not_future
-from edc_utils import get_utcnow
 
 from ...choices import AE_GRADE_SIMPLE, AE_OUTCOME
 from ...utils import get_adverse_event_app_label
@@ -15,7 +15,7 @@ class AeFollowupFieldsModelMixin(models.Model):
     )
 
     report_datetime = models.DateTimeField(
-        verbose_name="Report date and time", default=get_utcnow
+        verbose_name="Report date and time", default=timezone.now
     )
 
     outcome = models.CharField(blank=False, null=False, max_length=25, choices=AE_OUTCOME)

edc_adverse_event/model_mixins/ae_initial/ae_initial_fields_model_mixin.py

@@ -1,9 +1,9 @@
+import django.utils.timezone
 from django.db import models
 
 from edc_constants.constants import NOT_APPLICABLE
 from edc_model.validators import date_not_future
 from edc_model_fields.fields.other_charfield import OtherCharField
-from edc_utils.date import get_utcnow
 
 from ...choices import AE_GRADE, STUDY_DRUG_RELATIONSHIP
 from ...models import AeClassification
@@ -17,7 +17,7 @@ class AeInitialFieldsModelMixin(models.Model):
     )
 
     report_datetime = models.DateTimeField(
-        verbose_name="Report Date and Time", default=get_utcnow
+        verbose_name="Report Date and Time", default=django.utils.timezone.now
     )
 
     ae_classification = models.ForeignKey(
@@ -34,22 +34,23 @@ class AeInitialFieldsModelMixin(models.Model):
 
     ae_awareness_date = models.DateField(
         verbose_name="AE Awareness date",
-        default=get_utcnow,
+        default=django.utils.timezone.now,
         validators=[date_not_future],
     )
 
     ae_start_date = models.DateField(
         verbose_name="Actual Start Date of AE",
-        default=get_utcnow,
+        default=django.utils.timezone.now,
         validators=[date_not_future],
     )
 
     ae_grade = models.CharField(verbose_name="Severity of AE", max_length=25, choices=AE_GRADE)
 
-    study_drug_relation = models.CharField(
+    study_drug_relation = models.CharField(  # noqa: DJ001
         verbose_name="Relation to study drug:",
         max_length=25,
         choices=STUDY_DRUG_RELATIONSHIP,
+        null=True,
     )
 
     class Meta:

edc_adverse_event/model_mixins/ae_special_interest/aesi_fields_model_mixin.py

@@ -1,7 +1,7 @@
 from django.db import models
+from django.utils import timezone
 
 from edc_model.validators import datetime_not_future
-from edc_utils import get_utcnow
 
 from ...utils import get_adverse_event_app_label
 
@@ -14,7 +14,7 @@ class AesiFieldsModelMixin(models.Model):
     report_datetime = models.DateTimeField(
         verbose_name="Report date and time",
         validators=[datetime_not_future],
-        default=get_utcnow,
+        default=timezone.now,
     )
 
     submitted_datetime = models.DateTimeField(

edc_adverse_event/model_mixins/ae_susar/ae_susar_fields_model_mixin.py

@@ -1,7 +1,7 @@
 from django.db import models
+from django.utils import timezone
 
 from edc_model.validators import datetime_not_future
-from edc_utils import get_utcnow
 
 from ...utils import get_adverse_event_app_label
 
@@ -14,7 +14,7 @@ class AeSusarFieldsModelMixin(models.Model):
     report_datetime = models.DateTimeField(
         verbose_name="Report date and time",
         validators=[datetime_not_future],
-        default=get_utcnow,
+        default=timezone.now,
     )
 
     submitted_datetime = models.DateTimeField(

edc_adverse_event/model_mixins/ae_tmg/ae_tmg_fields_model_mixin.py

@@ -1,10 +1,10 @@
 from django.db import models
+from django.utils import timezone
 
 from edc_constants.choices import YES_NO, YES_NO_NA
 from edc_constants.constants import NOT_APPLICABLE
 from edc_model.validators import datetime_not_future
 from edc_model_fields.fields import OtherCharField
-from edc_utils import get_utcnow
 
 from ...models import AeClassification
 from ...utils import get_adverse_event_app_label
@@ -24,7 +24,7 @@ class AeTmgFieldsModelMixin(models.Model):
     report_datetime = models.DateTimeField(
         verbose_name="Report date and time",
         validators=[datetime_not_future],
-        default=get_utcnow,
+        default=timezone.now,
     )
 
     ae_received_datetime = models.DateTimeField(
@@ -41,25 +41,31 @@ class AeTmgFieldsModelMixin(models.Model):
         verbose_name="Date and time of clinical review: ",
     )
 
-    ae_description = models.TextField(blank=True, verbose_name="Description of AE:")
+    ae_description = models.TextField(
+        verbose_name="Description of AE:",
+        default="",
+        blank=True,
+    )
 
     investigator_comments = models.TextField(
-        blank=True, verbose_name="This investigator's comments:"
+        verbose_name="This investigator's comments:",
+        default="",
+        blank=True,
     )
 
-    ae_classification = models.CharField(max_length=150, blank=True)
+    ae_classification = models.CharField(max_length=150, blank=True, default="")
 
-    ae_classification_other = OtherCharField(max_length=250, blank=True, null=True)
+    ae_classification_other = OtherCharField(max_length=250, blank=True, default="")
 
     original_report_agreed = models.CharField(
         verbose_name="Does this investigator agree with the original AE report?",
         max_length=15,
         choices=YES_NO,
-        blank=False,
+        default="",
         help_text="If No, explain in the narrative below",
     )
 
-    investigator_narrative = models.TextField(verbose_name="Narrative", blank=True)
+    investigator_narrative = models.TextField(verbose_name="Narrative", blank=True, default="")
 
     investigator_ae_classification_agreed = models.CharField(
         verbose_name=(
@@ -68,7 +74,6 @@ class AeTmgFieldsModelMixin(models.Model):
         ),
         max_length=15,
         choices=YES_NO_NA,
-        blank=False,
         default=NOT_APPLICABLE,
         help_text="If No, select a classification below",
     )
@@ -78,14 +83,13 @@ class AeTmgFieldsModelMixin(models.Model):
         on_delete=models.PROTECT,
         verbose_name="Adverse Event (AE) Classification",
         null=True,
-        blank=False,
         help_text=(
             "Only applicable if this investigator does not agree with the original AE report"
         ),
     )
 
     investigator_ae_classification_other = OtherCharField(
-        max_length=250, blank=True, null=True
+        max_length=250, blank=True, default=""
     )
 
     officials_notified = models.DateTimeField(

edc_adverse_event/model_mixins/ae_tmg/ae_tmg_methods_model_mixin.py

@@ -18,8 +18,6 @@ class AeTmgMethodsModelMixin(models.Model):
     def get_action_item_reason(self):
         return self.ae_initial.ae_description
 
-    def get_search_slug_fields(self):
+    def get_search_slug_fields(self) -> tuple[str]:
         fields = super().get_search_slug_fields()
-        fields.append("subject_identifier")
-        fields.append("report_status")
-        return fields
+        return *fields, "subject_identifier", "report_status"

edc_adverse_event/model_mixins/death_report/death_report_model_mixin.py

@@ -1,6 +1,7 @@
 from django.core.validators import MinValueValidator
 from django.db import models
 from django.db.models.deletion import PROTECT
+from django.utils import timezone
 
 from edc_action_item.managers import (
     ActionIdentifierModelManager,
@@ -18,7 +19,6 @@ from edc_protocol.validators import (
     datetime_not_before_study_start,
 )
 from edc_sites.model_mixins import SiteModelMixin
-from edc_utils import get_utcnow
 
 from ...constants import DEATH_REPORT_ACTION
 from ...models import CauseOfDeath
@@ -41,7 +41,7 @@ class DeathReportModelMixin(
     report_datetime = models.DateTimeField(
         verbose_name="Report Date",
         validators=[datetime_not_before_study_start, datetime_not_future],
-        default=get_utcnow,
+        default=timezone.now,
     )
 
     death_datetime = models.DateTimeField(
@@ -70,6 +70,7 @@ class DeathReportModelMixin(
         max_length=5,
         verbose_name="Death as inpatient",
         blank=False,
+        default="",
     )
 
     cause_of_death = models.ForeignKey(
@@ -83,9 +84,9 @@ class DeathReportModelMixin(
         blank=False,
     )
 
-    cause_of_death_other = OtherCharField(max_length=100, blank=True, null=True)
+    cause_of_death_other = OtherCharField(max_length=100, blank=True, default="")
 
-    narrative = models.TextField(verbose_name="Narrative", blank=False)
+    narrative = models.TextField(verbose_name="Narrative", default="")
 
     objects = ActionIdentifierModelManager()
 

edc_adverse_event/model_mixins/death_report/death_report_tmg_model_mixin.py

@@ -1,5 +1,6 @@
 from django.db import models
 from django.db.models.deletion import PROTECT
+from django.utils import timezone
 
 from edc_action_item.managers import (
     ActionIdentifierModelManager,
@@ -12,7 +13,6 @@ from edc_model.models import ReportStatusModelMixin
 from edc_model.validators import datetime_not_future
 from edc_protocol.validators import datetime_not_before_study_start
 from edc_sites.model_mixins import SiteModelMixin
-from edc_utils import get_utcnow
 
 from ...constants import DEATH_REPORT_TMG_ACTION, DEATH_REPORT_TMG_SECOND_ACTION
 from ...models import CauseOfDeath
@@ -51,7 +51,7 @@ class DeathReportTmgFieldsModelMixin(models.Model):
     report_datetime = models.DateTimeField(
         verbose_name="Report Date",
         validators=[datetime_not_before_study_start, datetime_not_future],
-        default=get_utcnow,
+        default=timezone.now,
     )
 
     cause_of_death = models.ForeignKey(
@@ -62,22 +62,25 @@ class DeathReportTmgFieldsModelMixin(models.Model):
             "Main cause of death in the opinion of the local study doctor and local PI"
         ),
         null=True,
+        default="",
     )
 
     cause_of_death_other = models.CharField(
         verbose_name='If "Other" above, please specify',
         max_length=100,
         blank=True,
+        default="",
     )
 
     cause_of_death_agreed = models.CharField(
         verbose_name="Is the cause of death agreed between study doctor and TMG member?",
         max_length=15,
         choices=YES_NO,
+        default="",
         help_text="If No, explain in the narrative below",
     )
 
-    narrative = models.TextField(verbose_name="Narrative", blank=True)
+    narrative = models.TextField(verbose_name="Narrative", blank=True, default="")
 
     class Meta:
         abstract = True

edc_adverse_event/model_mixins/death_report/simple_death_report_model_mixin.py

@@ -1,4 +1,5 @@
 from django.db import models
+from django.utils import timezone
 
 from edc_action_item.managers import (
     ActionIdentifierModelManager,
@@ -9,7 +10,6 @@ from edc_identifier.model_mixins import UniqueSubjectIdentifierFieldMixin
 from edc_model.validators import date_not_future, datetime_not_future
 from edc_protocol.validators import datetime_not_before_study_start
 from edc_sites.model_mixins import SiteModelMixin
-from edc_utils import get_utcnow
 
 from ...constants import DEATH_REPORT_ACTION
 
@@ -27,7 +27,7 @@ class SimpleDeathReportModelMixin(
     report_datetime = models.DateTimeField(
         verbose_name="Report Date",
         validators=[datetime_not_before_study_start, datetime_not_future],
-        default=get_utcnow,
+        default=timezone.now,
     )
 
     death_datetime = models.DateTimeField(

edc_adverse_event/model_mixins/hospitaization/hospitalization_model_mixin.py

@@ -1,22 +1,23 @@
 from django.db import models
+from django.utils import timezone
 
 from edc_constants.choices import YES_NO, YES_NO_UNKNOWN
 from edc_constants.constants import NOT_APPLICABLE
 from edc_identifier.model_mixins import NonUniqueSubjectIdentifierFieldMixin
 from edc_model import models as edc_models
 from edc_model.validators import date_not_future, datetime_not_future
+from edc_model_fields.fields import IsDateEstimatedField
 from edc_protocol.validators import (
     date_not_before_study_start,
     datetime_not_before_study_start,
 )
-from edc_utils import get_utcnow
 
 
 class HospitalizationModelMixin(NonUniqueSubjectIdentifierFieldMixin, models.Model):
     report_datetime = models.DateTimeField(
         verbose_name="Report Date",
         validators=[datetime_not_before_study_start, datetime_not_future],
-        default=get_utcnow,
+        default=timezone.now,
     )
 
     have_details = models.CharField(
@@ -30,7 +31,7 @@ class HospitalizationModelMixin(NonUniqueSubjectIdentifierFieldMixin, models.Mod
         validators=[date_not_future, date_not_before_study_start],
     )
 
-    admitted_date_estimated = edc_models.IsDateEstimatedField(
+    admitted_date_estimated = IsDateEstimatedField(
         verbose_name="Is this date estimated?",
     )
 

edc_adverse_event/modeladmin_mixins/death_report_admin_mixin.py

@@ -4,6 +4,7 @@ from django.contrib import admin
 from django.contrib.admin import display
 from django.template.loader import render_to_string
 from django.urls import NoReverseMatch, reverse
+from django.utils import timezone
 from django_audit_fields.admin import audit_fieldset_tuple
 
 from edc_action_item.fieldsets import action_fieldset_tuple
@@ -12,7 +13,6 @@ from edc_constants.constants import CANCELLED, OTHER
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.list_filters import ReportDateListFilter
 from edc_pdf_reports.admin import PdfButtonModelAdminMixin, print_selected_to_pdf_action
-from edc_utils import get_utcnow
 
 from ..utils import get_adverse_event_app_label
 from .list_filters import CauseOfDeathListFilter, DeathDateListFilter
@@ -111,14 +111,14 @@ class DeathReportModelAdminMixin(
     def report_datetime_with_ago(self, obj=None):
         return render_to_string(
             "edc_adverse_event/datetime_with_ago.html",
-            dict(utc_date=get_utcnow().date, report_datetime=obj.report_datetime),
+            dict(utc_date=timezone.now().date, report_datetime=obj.report_datetime),
         )
 
     @display(description="Death date", ordering="death_datetime")
     def death_datetime_with_ago(self, obj=None):
         return render_to_string(
             "edc_adverse_event/datetime_with_ago.html",
-            dict(utc_date=get_utcnow().date, report_datetime=obj.death_datetime),
+            dict(utc_date=timezone.now().date, report_datetime=obj.death_datetime),
         )
 
     @display(description="Action item", ordering="action_identifier")