meta-edc 1.1.8__py3-none-any.whl → 1.1.12__py3-none-any.whl

meta_pharmacy/migrations/0006_lotnumber_label.py

@@ -5,13 +5,12 @@ import django.db.models.deletion
 import django_audit_fields.fields.hostname_modification_field
 import django_audit_fields.fields.userfield
 import django_audit_fields.fields.uuid_auto_field
-import django_audit_fields.models.audit_model_mixin
+import django.utils.timezone
 import django_revision.revision_field
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("meta_pharmacy", "0005_auto_20240911_0352"),
     ]
@@ -33,15 +32,11 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "created",
-                    models.DateTimeField(
-                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-                    ),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "modified",
-                    models.DateTimeField(
-                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-                    ),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "user_created",
@@ -163,15 +158,11 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "created",
-                    models.DateTimeField(
-                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-                    ),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "modified",
-                    models.DateTimeField(
-                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-                    ),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "user_created",

meta_pharmacy/migrations/0008_remove_lotnumber_medication_and_more.py

@@ -5,7 +5,7 @@ import django.db.models.deletion
 import django_audit_fields.fields.hostname_modification_field
 import django_audit_fields.fields.userfield
 import django_audit_fields.fields.uuid_auto_field
-import django_audit_fields.models.audit_model_mixin
+import django.utils.timezone
 import django_revision.revision_field
 import edc_sites.managers
 import simple_history.models
@@ -15,7 +15,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_registration", "0031_alter_historicalregisteredsubject_site_and_more"),
         ("meta_pharmacy", "0007_lotnumber_medication"),
@@ -59,14 +58,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,
                     ),
                 ),
                 (
@@ -243,14 +242,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,
                     ),
                 ),
                 (

meta_pharmacy/migrations/0010_alter_historicallabeldata_device_created_and_more.py

@@ -0,0 +1,382 @@
+# Generated by Django 5.2.6 on 2025-09-24 05:45
+
+import django.utils.timezone
+import django_revision.revision_field
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_pharmacy", "0009_remove_historicalrx_slug"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicallabeldata",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicallabeldata",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicallabeldata",
+            name="gender",
+            field=models.CharField(default="", max_length=5),
+        ),
+        migrations.AlterField(
+            model_name="historicallabeldata",
+            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="historicallabeldata",
+            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="historicallabeldata",
+            name="reference",
+            field=models.CharField(
+                db_index=True, default="", help_text="Bottle reference", max_length=10
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicallabeldata",
+            name="revision",
+            field=django_revision.revision_field.RevisionField(
+                blank=True,
+                default="",
+                editable=False,
+                help_text="System field. From git repository (tag:branch:commit), project metadata, project toml, project VERSION, or settings.",
+                max_length=75,
+                verbose_name="Revision",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicallabeldata",
+            name="site_name",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="historicallabeldata",
+            name="subject_identifier",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="historicalrx",
+            name="action_identifier",
+            field=models.CharField(
+                blank=True, db_index=True, default="", max_length=50
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalrx",
+            name="action_item_reason",
+            field=models.TextField(default="", editable=False),
+        ),
+        migrations.AlterField(
+            model_name="historicalrx",
+            name="clinician_initials",
+            field=models.CharField(default="", max_length=3),
+        ),
+        migrations.AlterField(
+            model_name="historicalrx",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalrx",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalrx",
+            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="historicalrx",
+            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="historicalrx",
+            name="notes",
+            field=models.TextField(
+                blank=True,
+                default="",
+                help_text="Private notes for pharmacist only",
+                max_length=250,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalrx",
+            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="historicalrx",
+            name="rando_sid",
+            field=models.CharField(blank=True, default="", max_length=25),
+        ),
+        migrations.AlterField(
+            model_name="historicalrx",
+            name="randomizer_name",
+            field=models.CharField(blank=True, default="", max_length=25),
+        ),
+        migrations.AlterField(
+            model_name="historicalrx",
+            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="historicalrx",
+            name="report_datetime",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name="historicalrx",
+            name="revision",
+            field=django_revision.revision_field.RevisionField(
+                blank=True,
+                default="",
+                editable=False,
+                help_text="System field. From git repository (tag:branch:commit), project metadata, project toml, project VERSION, or settings.",
+                max_length=75,
+                verbose_name="Revision",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalrx",
+            name="rx_date",
+            field=models.DateField(
+                default=django.utils.timezone.now, verbose_name="Date RX written"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubstitutions",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubstitutions",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubstitutions",
+            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="historicalsubstitutions",
+            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="historicalsubstitutions",
+            name="revision",
+            field=django_revision.revision_field.RevisionField(
+                blank=True,
+                default="",
+                editable=False,
+                help_text="System field. From git repository (tag:branch:commit), project metadata, project toml, project VERSION, or settings.",
+                max_length=75,
+                verbose_name="Revision",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubstitutions",
+            name="updated_subject_identifier",
+            field=models.CharField(
+                blank=True, default="", max_length=50, verbose_name="Taken from subject"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="labeldata",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="labeldata",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="labeldata",
+            name="gender",
+            field=models.CharField(default="", max_length=5),
+        ),
+        migrations.AlterField(
+            model_name="labeldata",
+            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="labeldata",
+            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="labeldata",
+            name="reference",
+            field=models.CharField(
+                default="", help_text="Bottle reference", max_length=10, unique=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="labeldata",
+            name="revision",
+            field=django_revision.revision_field.RevisionField(
+                blank=True,
+                default="",
+                editable=False,
+                help_text="System field. From git repository (tag:branch:commit), project metadata, project toml, project VERSION, or settings.",
+                max_length=75,
+                verbose_name="Revision",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="labeldata",
+            name="site_name",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="labeldata",
+            name="subject_identifier",
+            field=models.CharField(default="", max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="substitutions",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="substitutions",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="substitutions",
+            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="substitutions",
+            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="substitutions",
+            name="revision",
+            field=django_revision.revision_field.RevisionField(
+                blank=True,
+                default="",
+                editable=False,
+                help_text="System field. From git repository (tag:branch:commit), project metadata, project toml, project VERSION, or settings.",
+                max_length=75,
+                verbose_name="Revision",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="substitutions",
+            name="updated_subject_identifier",
+            field=models.CharField(
+                blank=True, default="", max_length=50, verbose_name="Taken from subject"
+            ),
+        ),
+    ]

meta_pharmacy/models/__init__.py

@@ -1,3 +1,10 @@
 from .label_data import LabelData
 from .rx import Rx
 from .substitutions import MyManager, Substitutions
+
+__all__ = [
+    "LabelData",
+    "MyManager",
+    "Rx",
+    "Substitutions",
+]

meta_pharmacy/models/label_data.py

@@ -9,14 +9,13 @@ random.seed(237548)
 
 
 class LabelData(SiteModelMixin, BaseUuidModel):
-
-    subject_identifier = models.CharField(max_length=15, null=True)
+    subject_identifier = models.CharField(max_length=15, default="")
     sid = models.IntegerField(null=True, help_text="Pharmacy reference")
     reference = models.CharField(
-        max_length=10, null=True, unique=True, help_text="Bottle reference"
+        max_length=10, default="", unique=True, help_text="Bottle reference"
     )
-    site_name = models.CharField(max_length=15, null=True)
-    gender = models.CharField(max_length=5, null=True)
+    site_name = models.CharField(max_length=15, default="")
+    gender = models.CharField(max_length=5, default="")
     pills_per_bottle = models.IntegerField(null=True, default=128)
 
     printed_datetime = models.DateTimeField(null=True)

meta_pharmacy/models/substitutions.py

@@ -42,7 +42,7 @@ class Substitutions(NonUniqueSubjectIdentifierFieldMixin, SiteModelMixin, BaseUu
     updated_visit_no = models.IntegerField("Visit Number", null=True, blank=True)
 
     updated_subject_identifier = models.CharField(
-        max_length=50, verbose_name="Taken from subject", null=True, blank=True
+        max_length=50, verbose_name="Taken from subject", default="", blank=True
     )
 
     arm_match = models.CharField(
@@ -82,7 +82,7 @@ class Substitutions(NonUniqueSubjectIdentifierFieldMixin, SiteModelMixin, BaseUu
     class Meta(SiteModelMixin.Meta, BaseUuidModel.Meta):
         verbose_name_plural = "IMP Substitutions"
         verbose_name = "IMP Substitution"
-        indexes = [
+        indexes = (
             Index(fields=["sid", "dispensed_sid", "subject_identifier"]),
             Index(fields=["row_index"]),
-        ]
+        )

meta_pharmacy/prepare_meta_pharmacy.py

@@ -9,7 +9,7 @@ style = color_style()
 
 
 def prepare_meta_pharmacy():
-    from django.apps import apps as django_apps
+    from django.apps import apps as django_apps  # noqa: PLC0415
 
     sys.stdout.write(style.MIGRATE_HEADING("Populating static pharmacy models for META3:\n"))
 

meta_pharmacy/utils/__init__.py

@@ -1 +1,3 @@
 from .update_initial_pharmacy_data import update_initial_pharmacy_data
+
+__all__ = ["update_initial_pharmacy_data"]

meta_pharmacy/utils/update_initial_pharmacy_data.py

@@ -136,7 +136,7 @@ def update_labels():
         LabelSpecification().save()
         default = LabelSpecification.objects.get(name="default")
 
-    for name, label_config in site_label_configs.registry.items():
+    for name in site_label_configs.registry:
         LabelConfiguration.objects.create(name=name, label_specification=default)
     for label_configuration in LabelConfiguration.objects.filter(name__contains="patient"):
         label_configuration.requires_allocation = True

meta_prn/admin/__init__.py

@@ -11,3 +11,19 @@ from .onschedule_dm_referral_admin import OnScheduleDmReferralAdmin
 from .pregnancy_notification_admin import PregnancyNotificationAdmin
 from .protocol_incident_admin import ProtocolIncidentAdmin
 from .subject_transfer_admin import SubjectTransferAdmin
+
+__all__ = [
+    "DmReferralAdmin",
+    "EndOfStudyAdmin",
+    "LossToFollowupAdmin",
+    "OffScheduleAdmin",
+    "OffScheduleDmReferralAdmin",
+    "OffSchedulePostnatalAdmin",
+    "OffSchedulePregnancyAdmin",
+    "OffStudyMedicationAdmin",
+    "OnScheduleAdmin",
+    "OnScheduleDmReferralAdmin",
+    "PregnancyNotificationAdmin",
+    "ProtocolIncidentAdmin",
+    "SubjectTransferAdmin",
+]

meta_prn/admin/dm_referral_admin.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
-from edc_action_item import ActionItemModelAdminMixin, action_fieldset_tuple
+from edc_action_item.fieldsets import action_fieldset_tuple
+from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
 from edc_sites.admin import SiteModelAdminMixin

meta_prn/admin/end_of_study_admin.py

@@ -1,12 +1,11 @@
-from typing import Tuple
-
 from dateutil.relativedelta import relativedelta
 from django.contrib import admin
 from django.template.loader import render_to_string
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 from django_audit_fields.admin import audit_fieldset_tuple
-from edc_action_item import ActionItemModelAdminMixin, action_fieldset_tuple
+from edc_action_item.fieldsets import action_fieldset_tuple
+from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
 from edc_constants.constants import OTHER
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
@@ -30,7 +29,7 @@ class EndOfStudyAdmin(
 ):
     additional_instructions = format_html(
         "{html}",
-        html=mark_safe(
+        html=mark_safe(  # noqa: S308
             render_to_string(
                 "meta_prn/eos/additional_instructions.html",
                 context=dict(
@@ -123,7 +122,7 @@ class EndOfStudyAdmin(
             kwargs["queryset"] = OffstudyReasons.objects.order_by("display_index")
         return super().formfield_for_foreignkey(db_field, request, **kwargs)
 
-    def get_list_display(self, request) -> Tuple[str, ...]:
+    def get_list_display(self, request) -> tuple[str, ...]:
         list_display = super().get_list_display(request)
         custom_fields = (
             "subject_identifier",
@@ -137,12 +136,12 @@ class EndOfStudyAdmin(
             f for f in list_display if f not in custom_fields + ("__str__",)
         )
 
-    def get_list_filter(self, request) -> Tuple[str, ...]:
+    def get_list_filter(self, request) -> tuple[str, ...]:
         list_filter = super().get_list_filter(request)
         custom_fields = ("offstudy_reason", "last_seen_date")
         return custom_fields + tuple(f for f in list_filter if f not in custom_fields)
 
-    def get_search_fields(self, request) -> Tuple[str, ...]:
+    def get_search_fields(self, request) -> tuple[str, ...]:
         search_fields = super().get_search_fields(request)
         custom_fields = ("subject_identifier",)
         return tuple(set(custom_fields + search_fields))

meta_prn/admin/loss_to_followup_admin.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
-from edc_action_item import ActionItemModelAdminMixin, action_fieldset_tuple
+from edc_action_item.fieldsets import action_fieldset_tuple
+from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
 from edc_sites.admin import SiteModelAdminMixin
@@ -54,7 +55,7 @@ class LossToFollowupAdmin(
         "number_consecutive_missed_visits",
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "home_visited": admin.VERTICAL,
         "loss_category": admin.VERTICAL,
     }