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

edc_protocol_incident/model_mixins/protocol_deviation_violation_model_mixin.py

@@ -1,10 +1,10 @@
 from django.db import models
+from django.utils import timezone
 
 from edc_constants.choices import YES_NO_NA
 from edc_constants.constants import NOT_APPLICABLE
 from edc_model import REPORT_STATUS
 from edc_model.validators import datetime_not_future
-from edc_utils import get_utcnow
 
 from ..choices import DEVIATION_VIOLATION
 from ..models import ActionsRequired, ProtocolViolations
@@ -12,13 +12,13 @@ from ..models import ActionsRequired, ProtocolViolations
 
 class ProtocolDeviationViolationModelMixin(models.Model):
     report_datetime = models.DateTimeField(
-        verbose_name="Report Date and Time", default=get_utcnow
+        verbose_name="Report Date and Time", default=timezone.now
     )
 
     short_description = models.CharField(
         verbose_name="Provide a short description of this occurrence",
         max_length=35,
-        null=True,
+        default="",
         blank=False,
         help_text=(
             'Max 35 characters. Note: If this occurrence is a "violation" '
@@ -39,7 +39,7 @@ class ProtocolDeviationViolationModelMixin(models.Model):
     )
 
     safety_impact_details = models.TextField(
-        verbose_name='If "Yes", provide details', null=True, blank=True
+        verbose_name='If "Yes", provide details', default="", blank=True
     )
 
     study_outcomes_impact = models.CharField(
@@ -50,7 +50,7 @@ class ProtocolDeviationViolationModelMixin(models.Model):
     )
 
     study_outcomes_impact_details = models.TextField(
-        verbose_name='If "Yes", provide details', null=True, blank=True
+        verbose_name='If "Yes", provide details', default="", blank=True
     )
 
     violation_datetime = models.DateTimeField(
@@ -70,21 +70,24 @@ class ProtocolDeviationViolationModelMixin(models.Model):
     )
 
     violation_other = models.CharField(
-        null=True, blank=True, verbose_name="If other, please specify", max_length=75
+        verbose_name="If other, please specify",
+        max_length=75,
+        default="",
+        blank=True,
     )
 
     violation_description = models.TextField(
         verbose_name="Describe the violation",
-        null=True,
-        blank=True,
         help_text=(
             "Describe in full. Explain how the violation happened, what occurred, etc."
         ),
+        default="",
+        blank=True,
     )
 
     violation_reason = models.TextField(
         verbose_name="Explain the reason why the violation occurred",
-        null=True,
+        default="",
         blank=True,
     )
 
@@ -96,7 +99,9 @@ class ProtocolDeviationViolationModelMixin(models.Model):
     )
 
     corrective_action = models.TextField(
-        verbose_name="Corrective action taken", null=True, blank=True
+        verbose_name="Corrective action taken",
+        default="",
+        blank=True,
     )
 
     preventative_action_datetime = models.DateTimeField(
@@ -107,7 +112,9 @@ class ProtocolDeviationViolationModelMixin(models.Model):
     )
 
     preventative_action = models.TextField(
-        verbose_name="Preventative action taken", null=True, blank=True
+        verbose_name="Preventative action taken",
+        default="",
+        blank=True,
     )
 
     action_required = models.ForeignKey(

edc_protocol_incident/model_mixins/protocol_incident_model_mixin.py

@@ -1,8 +1,8 @@
 from django.db import models
+from django.utils import timezone
 
 from edc_constants.choices import YES_NO
 from edc_model.validators import datetime_not_future
-from edc_utils import get_utcnow
 
 from ..choices import DEVIATION_VIOLATION, REPORT_STATUS
 from ..models import ActionsRequired, ProtocolViolations
@@ -10,13 +10,14 @@ from ..models import ActionsRequired, ProtocolViolations
 
 class ProtocolIncidentModelMixin(models.Model):
     report_datetime = models.DateTimeField(
-        verbose_name="Report Date and Time", default=get_utcnow
+        verbose_name="Report Date and Time",
+        default=timezone.now,
     )
 
     short_description = models.CharField(
         verbose_name="Provide a short description of this incident",
         max_length=35,
-        null=True,
+        default="",
         blank=False,
         help_text=(
             "Max 35 characters. Note: there is additional space below for "
@@ -35,7 +36,9 @@ class ProtocolIncidentModelMixin(models.Model):
     )
 
     safety_impact_details = models.TextField(
-        verbose_name='If "Yes", provide details', null=True, blank=True
+        verbose_name='If "Yes", provide details',
+        default="",
+        blank=True,
     )
 
     study_outcomes_impact = models.CharField(
@@ -45,7 +48,9 @@ class ProtocolIncidentModelMixin(models.Model):
     )
 
     study_outcomes_impact_details = models.TextField(
-        verbose_name='If "Yes", provide details', null=True, blank=True
+        verbose_name='If "Yes", provide details',
+        default="",
+        blank=True,
     )
 
     incident_datetime = models.DateTimeField(
@@ -65,19 +70,22 @@ class ProtocolIncidentModelMixin(models.Model):
     )
 
     incident_other = models.CharField(
-        null=True, blank=True, verbose_name="If other, please specify", max_length=75
+        verbose_name="If other, please specify",
+        max_length=75,
+        default="",
+        blank=True,
     )
 
     incident_description = models.TextField(
         verbose_name="Describe the incident",
-        null=True,
+        default="",
         blank=False,
         help_text="Describe in full. Explain how the incident happened, what occurred, etc.",
     )
 
     incident_reason = models.TextField(
         verbose_name="Explain the reason why the incident occurred",
-        null=True,
+        default="",
         blank=False,
     )
 
@@ -89,7 +97,9 @@ class ProtocolIncidentModelMixin(models.Model):
     )
 
     corrective_action = models.TextField(
-        verbose_name="Corrective action taken", null=True, blank=True
+        verbose_name="Corrective action taken",
+        default="",
+        blank=True,
     )
 
     preventative_action_datetime = models.DateTimeField(
@@ -100,7 +110,9 @@ class ProtocolIncidentModelMixin(models.Model):
     )
 
     preventative_action = models.TextField(
-        verbose_name="Preventative action taken", null=True, blank=True
+        verbose_name="Preventative action taken",
+        default="",
+        blank=True,
     )
 
     action_required = models.ForeignKey(
@@ -117,7 +129,10 @@ class ProtocolIncidentModelMixin(models.Model):
         choices=REPORT_STATUS,
     )
 
-    reasons_withdrawn = models.TextField(null=True, blank=True)
+    reasons_withdrawn = models.TextField(
+        default="",
+        blank=True,
+    )
 
     report_closed_datetime = models.DateTimeField(
         blank=True,

edc_pylabels/actions.py

@@ -6,11 +6,10 @@ from django.apps import apps as django_apps
 from django.contrib import admin, messages
 from django.db.models import Count, QuerySet
 from django.http import FileResponse
+from django.utils import timezone
 from django.utils.translation import gettext as _
 from pylabels import Sheet, Specification
 
-from edc_utils import get_utcnow
-
 from .site_label_configs import LabelConfig, site_label_configs
 
 if TYPE_CHECKING:
@@ -19,7 +18,6 @@ if TYPE_CHECKING:
 
 @admin.action(description="Test print sheet of labels")
 def print_test_label_sheet_action(modeladmin, request, queryset: QuerySet[LabelConfiguration]):
-
     if queryset.count() > 1 or queryset.count() == 0:
         messages.add_message(
             request,
@@ -74,10 +72,10 @@ def print_label_sheet(modeladmin, request, queryset):
         sheet = Sheet(specs, drawing_callable, border=config.label_specification.border)
         sheet.add_labels(label_data)
         buffer = sheet.save_to_buffer()
-        now = get_utcnow()
+        now = timezone.now()
         return FileResponse(
             buffer,
             as_attachment=True,
-            filename=f"{config.name}_{now.strftime("%Y-%m-%d %H:%M")}.pdf",
+            filename=f"{config.name}_{now.strftime('%Y-%m-%d %H:%M')}.pdf",
         )
     return None

edc_pylabels/migrations/0002_alter_label_options_label_created_and_more.py

@@ -7,10 +7,10 @@ import django_audit_fields.fields.uuid_auto_field
 import django_audit_fields.models.audit_model_mixin
 import django_revision.revision_field
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("django_pylabels", "0003_rename_updated_labelspecification_modified"),
         ("edc_pylabels", "0001_initial"),
@@ -36,9 +36,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name="label",
             name="created",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AddField(
             model_name="label",
@@ -96,9 +94,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name="label",
             name="modified",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AddField(
             model_name="label",

edc_pylabels/migrations/0005_labelconfiguration_delete_label_and_more.py

@@ -8,10 +8,10 @@ import django_audit_fields.fields.uuid_auto_field
 import django_audit_fields.models.audit_model_mixin
 import django_revision.revision_field
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("django_pylabels", "0003_rename_updated_labelspecification_modified"),
         ("edc_pylabels", "0004_remove_label_drawing_callable_name_and_more"),
@@ -36,14 +36,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,
                     ),
                 ),
                 (

edc_pylabels/migrations/0013_alter_labelconfiguration_device_created_and_more.py

@@ -0,0 +1,49 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_pylabels", "0012_alter_labelconfiguration_revision"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="labelconfiguration",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="labelconfiguration",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="labelconfiguration",
+            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="labelconfiguration",
+            name="locale_modified",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale modified",
+            ),
+        ),
+    ]

edc_qareports/migrations/0001_initial.py

@@ -11,11 +11,10 @@ import django_revision.revision_field
 from django.db import migrations, models
 
 import edc_sites.managers
-import edc_utils.date
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
@@ -41,14 +40,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,
                     ),
                 ),
                 (
@@ -132,7 +131,7 @@ class Migration(migrations.Migration):
                 ("report_model", models.CharField(max_length=150)),
                 (
                     "report_datetime",
-                    models.DateTimeField(default=edc_utils.date.get_utcnow),
+                    models.DateTimeField(default=django.utils.timezone.now),
                 ),
                 ("note", models.TextField(null=True)),
                 (

edc_qareports/migrations/0005_edcpermissions.py

@@ -7,10 +7,10 @@ import django_audit_fields.fields.uuid_auto_field
 import django_audit_fields.models.audit_model_mixin
 import django_revision.revision_field
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_qareports", "0004_alter_qareportnote_status"),
     ]
@@ -34,14 +34,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,
                     ),
                 ),
                 (

edc_qareports/migrations/0006_qareportlog.py

@@ -3,11 +3,10 @@
 import django.db.models.deletion
 from django.db import migrations, models
 
-import edc_utils.date
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("sites", "0002_alter_domain_unique"),
         ("edc_qareports", "0005_edcpermissions"),
@@ -28,7 +27,7 @@ class Migration(migrations.Migration):
                 ),
                 ("username", models.CharField(max_length=100)),
                 ("report_model", models.CharField(max_length=100)),
-                ("accessed", models.DateTimeField(default=edc_utils.date.get_utcnow)),
+                ("accessed", models.DateTimeField(default=django.utils.timezone.now)),
                 (
                     "site",
                     models.ForeignKey(

edc_qareports/migrations/0019_alter_edcpermissions_device_created_and_more.py

@@ -0,0 +1,102 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_qareports", "0018_alter_edcpermissions_revision_alter_note_revision"),
+    ]
+
+    operations = [
+        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="note",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="note",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="note",
+            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="note",
+            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="note",
+            name="note",
+            field=models.TextField(blank=True, default=""),
+        ),
+        migrations.AlterField(
+            model_name="note",
+            name="status",
+            field=models.CharField(
+                choices=[
+                    ("PENDING", "Data is pending"),
+                    ("not_available", "Data not available"),
+                ],
+                default="",
+                max_length=25,
+            ),
+        ),
+    ]

edc_qareports/migrations/0020_alter_note_report_datetime_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.2.6 on 2025-09-18 00:24
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_qareports", "0019_alter_edcpermissions_device_created_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="note",
+            name="report_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="qareportlog",
+            name="accessed",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+    ]

edc_qareports/model_mixins/note_model_mixin.py

@@ -1,9 +1,9 @@
 from django.apps import apps as django_apps
 from django.db import models
+from django.utils import timezone
 
 from edc_model.models import BaseUuidModel
 from edc_sites.model_mixins import SiteModelMixin
-from edc_utils import get_utcnow
 
 from ..choices import NOTE_STATUSES
 
@@ -17,11 +17,14 @@ class NoteModelMixin(SiteModelMixin, BaseUuidModel):
 
     report_model = models.CharField(max_length=150)
 
-    report_datetime = models.DateTimeField(default=get_utcnow)
+    report_datetime = models.DateTimeField(default=timezone.now)
 
-    note = models.TextField(null=True, blank=True)
+    note = models.TextField(
+        default="",
+        blank=True,
+    )
 
-    status = models.CharField(max_length=25, choices=NOTE_STATUSES, null=True, blank=False)
+    status = models.CharField(max_length=25, choices=NOTE_STATUSES, default="", blank=False)
 
     @property
     def report_model_cls(self):

edc_qareports/model_mixins/on_study_missing_values_model_mixin.py

@@ -4,19 +4,19 @@ from django.db import models
 class OnStudyMissingValuesModelMixin(models.Model):
     original_id = models.UUIDField(null=True)
 
-    label_lower = models.CharField(max_length=150, null=True)
+    label_lower = models.CharField(max_length=150, default="")
 
     subject_visit_id = models.UUIDField(null=True)
 
     report_datetime = models.DateTimeField(null=True)
 
-    label = models.CharField(max_length=50, null=True)
+    label = models.CharField(max_length=50, default="")
 
-    visit_code = models.CharField(max_length=25, null=True)
+    visit_code = models.CharField(max_length=25, default="")
 
     visit_code_sequence = models.IntegerField(null=True)
 
-    schedule_name = models.CharField(max_length=25, null=True)
+    schedule_name = models.CharField(max_length=25, default="")
 
     modified = models.DateTimeField(null=True)
 

edc_qareports/model_mixins/qa_report_model_mixin.py

@@ -1,8 +1,7 @@
 from django.contrib.sites.models import Site
 from django.db import models
 from django.db.models import DO_NOTHING, Index
-
-from edc_utils import get_utcnow
+from django.utils import timezone
 
 from ..utils import recreate_db_view
 from .qa_reports_permissions import qa_reports_permissions
@@ -15,7 +14,7 @@ class QaReportModelMixin(models.Model):
 
     site = models.ForeignKey(Site, on_delete=DO_NOTHING)
 
-    created = models.DateTimeField(default=get_utcnow)
+    created = models.DateTimeField(default=timezone.now)
 
     def __str__(self):
         return f"{self.subject_identifier}: {self.report_model}"

edc_qareports/models/note.py

@@ -21,11 +21,11 @@ class Note(NonUniqueSubjectIdentifierFieldMixin, NoteModelMixin):
     class Meta(BaseUuidModel.Meta):
         verbose_name = "Note"
         verbose_name_plural = "Notes"
-        constraints = [
+        constraints = (
             UniqueConstraint(
                 fields=["report_model", "subject_identifier"],
                 name="%(app_label)s_%(class)s_report_model_subj_uniq",
-            )
-        ]
+            ),
+        )
         indexes = BaseUuidModel.Meta.indexes
-        default_permissions = default_permissions + ("viewallsites",)
+        default_permissions = *default_permissions, "viewallsites"

edc_qareports/models/qa_reports_log.py

@@ -1,7 +1,6 @@
 from django.contrib.sites.models import Site
 from django.db import models
-
-from edc_utils import get_utcnow
+from django.utils import timezone
 
 from ..model_mixins import qa_reports_permissions
 
@@ -10,7 +9,7 @@ class QaReportLog(models.Model):
     username = models.CharField(max_length=100)
     site = models.ForeignKey(Site, on_delete=models.CASCADE)
     report_model = models.CharField(max_length=100)
-    accessed = models.DateTimeField(default=get_utcnow)
+    accessed = models.DateTimeField(default=timezone.now)
 
     class Meta:
         verbose_name = "QA Report Log"