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

meta_prn/models/__init__.py

@@ -21,3 +21,23 @@ from .signals import (
     update_urine_pregnancy_on_pregnancy_notification_on_post_save,
 )
 from .subject_transfer import SubjectTransfer
+
+__all__ = [
+    "DmReferral",
+    "EndOfStudy",
+    "LossToFollowup",
+    "OffSchedule",
+    "OffScheduleDmReferral",
+    "OffSchedulePostnatal",
+    "OffSchedulePregnancy",
+    "OffStudyMedication",
+    "OnSchedule",
+    "OnScheduleDmReferral",
+    "OnSchedulePostnatal",
+    "OnSchedulePregnancy",
+    "PregnancyNotification",
+    "ProtocolIncident",
+    "SubjectTransfer",
+    "update_schedule_on_pregnancy_notification_post_save",
+    "update_urine_pregnancy_on_pregnancy_notification_on_post_save",
+]

meta_prn/models/offschedule.py

@@ -11,7 +11,7 @@ from ..constants import (
 )
 
 
-class OffSchedule(SiteModelMixin, ActionModelMixin, OffScheduleModelMixin, BaseUuidModel):
+class OffSchedule(SiteModelMixin, OffScheduleModelMixin, ActionModelMixin, BaseUuidModel):
     action_name = OFFSCHEDULE_ACTION
     offschedule_compare_dates_as_datetimes = False
 
@@ -21,7 +21,7 @@ class OffSchedule(SiteModelMixin, ActionModelMixin, OffScheduleModelMixin, BaseU
 
 
 class OffSchedulePregnancy(
-    SiteModelMixin, ActionModelMixin, OffScheduleModelMixin, BaseUuidModel
+    SiteModelMixin, OffScheduleModelMixin, ActionModelMixin, BaseUuidModel
 ):
     action_name = OFFSCHEDULE_PREGNANCY_ACTION
 
@@ -31,7 +31,7 @@ class OffSchedulePregnancy(
 
 
 class OffSchedulePostnatal(
-    SiteModelMixin, ActionModelMixin, OffScheduleModelMixin, BaseUuidModel
+    SiteModelMixin, OffScheduleModelMixin, ActionModelMixin, BaseUuidModel
 ):
     action_name = OFFSCHEDULE_POSTNATAL_ACTION
 
@@ -41,7 +41,7 @@ class OffSchedulePostnatal(
 
 
 class OffScheduleDmReferral(
-    SiteModelMixin, ActionModelMixin, OffScheduleModelMixin, BaseUuidModel
+    SiteModelMixin, OffScheduleModelMixin, ActionModelMixin, BaseUuidModel
 ):
     action_name = OFFSCHEDULE_DM_REFERRAL_ACTION
 

meta_prn/models/protocol_incident.py

@@ -29,7 +29,7 @@ class ProtocolIncident(
     action_required_old = models.CharField(max_length=45, choices=ACTION_REQUIRED, null=True)
 
     def natural_key(self):
-        return (self.action_identifier,)  # noqa
+        return (self.action_identifier,)
 
     class Meta(ProtocolIncidentModelMixin.Meta, BaseUuidModel.Meta):
         pass

meta_prn/models/subject_transfer.py

@@ -1,3 +1,5 @@
+from django.conf import settings
+from django.db import models
 from edc_model.models import BaseUuidModel
 from edc_transfer.model_mixins import SubjectTransferModelMixin
 
@@ -6,5 +8,11 @@ class SubjectTransfer(
     SubjectTransferModelMixin,
     BaseUuidModel,
 ):
+
+    transfer_reason = models.ManyToManyField(
+        f"{settings.LIST_MODEL_APP_LABEL}.transferreasons",
+        verbose_name="Reason for transfer",
+    )
+
     class Meta(SubjectTransferModelMixin.Meta, BaseUuidModel.Meta):
         pass

meta_rando/migrations/0001_initial.py

@@ -8,7 +8,7 @@ import django.db.models.manager
 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_crypto_fields.fields.encrypted_char_field
 import django_revision.revision_field
 import edc_sites.models
@@ -44,14 +44,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,
                     ),
                 ),
                 (
@@ -202,14 +202,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_rando/migrations/0006_alter_historicalrandomizationlist_allocated_user_and_more.py

@@ -0,0 +1,130 @@
+# Generated by Django 5.2.6 on 2025-09-24 05:45
+
+import django_revision.revision_field
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_rando", "0005_alter_randomizationlist_options_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalrandomizationlist",
+            name="allocated_user",
+            field=models.CharField(default="", max_length=50),
+        ),
+        migrations.AlterField(
+            model_name="historicalrandomizationlist",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalrandomizationlist",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalrandomizationlist",
+            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="historicalrandomizationlist",
+            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="historicalrandomizationlist",
+            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="historicalrandomizationlist",
+            name="verified_user",
+            field=models.CharField(default="", max_length=50),
+        ),
+        migrations.AlterField(
+            model_name="randomizationlist",
+            name="allocated_user",
+            field=models.CharField(default="", max_length=50),
+        ),
+        migrations.AlterField(
+            model_name="randomizationlist",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="randomizationlist",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="randomizationlist",
+            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="randomizationlist",
+            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="randomizationlist",
+            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="randomizationlist",
+            name="verified_user",
+            field=models.CharField(default="", max_length=50),
+        ),
+    ]

meta_reports/__init__.py

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

meta_reports/admin/__init__.py

@@ -13,3 +13,19 @@ from .dbviews import (
 from .endpoints_admin import EndpointsAdmin
 from .endpoints_all_admin import EndpointsAllAdmin
 from .last_imp_refill_admin import LastImpRefillAdmin
+
+__all__ = [
+    "EndpointsAdmin",
+    "EndpointsAllAdmin",
+    "GlucoseSummaryAdmin",
+    "ImpSubstitutionsAdmin",
+    "LastImpRefillAdmin",
+    "MissingOgttNoteModelAdmin",
+    "MissingScreeningOgttAdmin",
+    "OnStudyMissingLabValuesAdmin",
+    "OnStudyMissingValuesAdmin",
+    "PatientHistoryMissingBaselineCd4Admin",
+    "UnattendedThreeInRow2Admin",
+    "UnattendedThreeInRowAdmin",
+    "UnattendedTwoInRowAdmin",
+]

meta_reports/admin/dbviews/__init__.py

@@ -12,3 +12,16 @@ from .patient_history_missing_baseline_cd4_admin import (
 from .unattended_three_in_row2_admin import UnattendedThreeInRow2Admin
 from .unattended_three_in_row_admin import UnattendedThreeInRowAdmin
 from .unattended_two_in_row_admin import UnattendedTwoInRowAdmin
+
+__all__ = [
+    "GlucoseSummaryAdmin",
+    "ImpSubstitutionsAdmin",
+    "MissingOgttNoteModelAdmin",
+    "MissingScreeningOgttAdmin",
+    "OnStudyMissingLabValuesAdmin",
+    "OnStudyMissingValuesAdmin",
+    "PatientHistoryMissingBaselineCd4Admin",
+    "UnattendedThreeInRow2Admin",
+    "UnattendedThreeInRowAdmin",
+    "UnattendedTwoInRowAdmin",
+]

meta_reports/admin/dbviews/glucose_summary_admin.py

@@ -23,9 +23,9 @@ class GlucoseSummaryAdmin(
     TemplatesModelAdminMixin,
     admin.ModelAdmin,
 ):
-    ordering = ["site", "subject_identifier", "fbg_datetime"]
+    ordering = ("site", "subject_identifier", "fbg_datetime")
     include_note_column = False
-    list_display = [
+    list_display = (
         "dashboard",
         "subject_identifier_link",
         "site",
@@ -37,9 +37,9 @@ class GlucoseSummaryAdmin(
         "ogtt_date",
         "endpoint",
         "offstudy_date",
-    ]
+    )
 
-    list_filter = [
+    list_filter = (
         ScheduleStatusListFilter,
         "fasted",
         FbgListFilter,
@@ -47,9 +47,9 @@ class GlucoseSummaryAdmin(
         "fbg_datetime",
         "ogtt_datetime",
         EndpointListFilter,
-    ]
+    )
 
-    search_fields = ["subject_identifier"]
+    search_fields = ("subject_identifier",)
 
     @admin.display(description="visit", ordering="visit_code")
     def visit(self, obj=None):

meta_reports/admin/dbviews/imp_substitutions_admin.py

@@ -1,3 +1,5 @@
+import contextlib
+
 from django.apps import apps as django_apps
 from django.contrib import admin
 from django.core.exceptions import ObjectDoesNotExist
@@ -25,8 +27,8 @@ class ImpSubstitutionsAdmin(
     TemplatesModelAdminMixin,
     admin.ModelAdmin,
 ):
-    ordering = ["site", "subject_identifier"]
-    list_display = [
+    ordering = ("site", "subject_identifier")
+    list_display = (
         "dashboard",
         "render_button",
         "subject",
@@ -38,20 +40,20 @@ class ImpSubstitutionsAdmin(
         "user_created",
         "user_modified",
         "modified",
-    ]
+    )
 
-    list_filter = [
+    list_filter = (
         "arm_match",
         ScheduleStatusListFilter,
         ReportDateListFilter,
         "allocated_datetime",
-    ]
+    )
 
     search_fields = ["subject_identifier", "sid", "dispensed_sid"]
 
     def dashboard(self, obj=None, label=None) -> str:
         kwargs = self.get_subject_dashboard_url_kwargs(obj)
-        try:
+        with contextlib.suppress(ObjectDoesNotExist):
             kwargs.update(
                 appointment=str(
                     Appointment.objects.get(
@@ -61,8 +63,6 @@ class ImpSubstitutionsAdmin(
                     ).id
                 )
             )
-        except ObjectDoesNotExist:
-            pass
         url = reverse(self.get_subject_dashboard_url_name(obj=obj), kwargs=kwargs)
         context = dict(title=_("Go to subject's dashboard@1000"), url=url, label=label)
         return render_to_string("edc_subject_dashboard/dashboard_button.html", context=context)
@@ -86,13 +86,14 @@ class ImpSubstitutionsAdmin(
             f"{url}?next={self.admin_site.name}:"
             f"{self.model._meta.label_lower.replace('.', '_')}_changelist"
         )
-        title = _(f"View {crf_model_cls._meta.verbose_name}")
+        title = _("View %(verbose_name)s").format(
+            verbose_name=crf_model_cls._meta.verbose_name
+        )
         label = _("View")
-        crf_button = render_to_string(
+        return render_to_string(
             "edc_qareports/columns/change_button.html",
             context=dict(title=title, url=url, label=label),
         )
-        return crf_button
 
     @admin.display(description="Report date", ordering="report_datetime")
     def report_date(self, obj) -> str | None:

meta_reports/admin/dbviews/missing_screening_ogtt_admin/__init__.py

@@ -1,2 +1,7 @@
 from .note_model_admin import MissingOgttNoteModelAdmin
 from .unmanaged_model_admin import MissingScreeningOgttAdmin
+
+__all__ = [
+    "MissingOgttNoteModelAdmin",
+    "MissingScreeningOgttAdmin",
+]

meta_reports/admin/dbviews/missing_screening_ogtt_admin/note_model_admin.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 from django_audit_fields import audit_fieldset_tuple
-from edc_qareports.modeladmin_mixins import NoteModelAdminMixin
+from edc_model_admin.mixins import TemplatesModelAdminMixin
+from edc_sites.admin import SiteModelAdminMixin
 
 from ....admin_site import meta_reports_admin
 from ....forms import MissingOgttNoteForm
@@ -9,7 +10,8 @@ from ....models import MissingOgttNote
 
 @admin.register(MissingOgttNote, site=meta_reports_admin)
 class MissingOgttNoteModelAdmin(
-    NoteModelAdminMixin,
+    SiteModelAdminMixin,
+    TemplatesModelAdminMixin,
     admin.ModelAdmin,
 ):
     """A modeladmin class for the Note model."""
@@ -46,8 +48,30 @@ class MissingOgttNoteModelAdmin(
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "ogtt_units": admin.VERTICAL,
         "result_status": admin.VERTICAL,
         "fasting": admin.VERTICAL,
     }
+
+    list_display = (
+        "subject_identifier",
+        "note",
+        "status",
+        "report_datetime",
+    )
+
+    # radio_fields = {"status": admin.VERTICAL}
+
+    list_filter = (
+        "report_datetime",
+        "status",
+        "report_model",
+        "user_created",
+        "user_modified",
+    )
+
+    search_fields = ("subject_identifier", "name")
+
+    def get_view_only_site_ids_for_user(self, request) -> list[int]:
+        return [s.id for s in request.user.userprofile.sites.all() if s.id != request.site.id]

meta_reports/admin/dbviews/missing_screening_ogtt_admin/unmanaged_model_admin.py

@@ -32,9 +32,9 @@ class MissingScreeningOgttAdmin(
     note_template = "edc_qareports/columns/notes_column.html"
     include_note_column = True
 
-    ordering = ["site", "subject_identifier"]
+    ordering = ("site", "subject_identifier")
 
-    list_display = [
+    list_display = (
         "dashboard",
         "subject_identifier",
         "site",
@@ -49,17 +49,17 @@ class MissingScreeningOgttAdmin(
         "fbg2_datetime",
         "ogtt2_datetime",
         "consented",
-    ]
+    )
 
-    list_filter = [
+    list_filter = (
         ScheduleStatusListFilter,
         "screening_datetime",
         "fbg_datetime",
         "repeated",
         "p3_ltfu",
-    ]
+    )
 
-    search_fields = ["subject_identifier"]
+    search_fields = ("subject_identifier",)
 
     def dashboard(self, obj=None, label=None) -> str:
         url = self.get_subject_dashboard_url(obj=obj)

meta_reports/admin/dbviews/on_study_missing_lab_values_admin/__init__.py

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

meta_reports/admin/dbviews/on_study_missing_lab_values_admin/unmanaged_model_admin.py

@@ -7,7 +7,4 @@ from ....models import OnStudyMissingLabValues
 
 @admin.register(OnStudyMissingLabValues, site=meta_reports_admin)
 class OnStudyMissingLabValuesAdmin(OnStudyMissingValuesModelAdminMixin, admin.ModelAdmin):
-
     include_note_column: bool = True
-
-    instructions = ["ello"]

meta_reports/admin/dbviews/on_study_missing_values_admin/__init__.py

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

meta_reports/admin/dbviews/patient_history_missing_baseline_cd4_admin.py

@@ -1,3 +1,5 @@
+import contextlib
+
 from django.contrib import admin
 from django.core.exceptions import ObjectDoesNotExist
 from django.template.loader import render_to_string
@@ -23,8 +25,8 @@ class PatientHistoryMissingBaselineCd4Admin(
     TemplatesModelAdminMixin,
     admin.ModelAdmin,
 ):
-    ordering = ["site", "subject_identifier"]
-    list_display = [
+    ordering = ("site", "subject_identifier")
+    list_display = (
         "dashboard",
         "subject_identifier",
         "cd4",
@@ -33,15 +35,15 @@ class PatientHistoryMissingBaselineCd4Admin(
         "user_created",
         "user_modified",
         "modified",
-    ]
+    )
 
-    list_filter = [ScheduleStatusListFilter]
+    list_filter = (ScheduleStatusListFilter,)
 
-    search_fields = ["subject_identifier"]
+    search_fields = ("subject_identifier",)
 
     def dashboard(self, obj=None, label=None) -> str:
         kwargs = self.get_subject_dashboard_url_kwargs(obj)
-        try:
+        with contextlib.suppress(ObjectDoesNotExist):
             kwargs.update(
                 appointment=str(
                     Appointment.objects.get(
@@ -51,8 +53,6 @@ class PatientHistoryMissingBaselineCd4Admin(
                     ).id
                 )
             )
-        except ObjectDoesNotExist:
-            pass
         url = reverse(self.get_subject_dashboard_url_name(obj=obj), kwargs=kwargs)
         context = dict(title=_("Go to subject's dashboard@1000"), url=url, label=label)
         return render_to_string("edc_subject_dashboard/dashboard_button.html", context=context)

meta_reports/admin/dbviews/unattended_three_in_row2_admin.py

@@ -17,9 +17,9 @@ class UnattendedThreeInRow2Admin(
     TemplatesModelAdminMixin,
     admin.ModelAdmin,
 ):
-    ordering = ["site", "subject_identifier"]
+    ordering = ("site", "subject_identifier")
 
-    list_display = [
+    list_display = (
         "dashboard",
         "subject",
         "first_value",
@@ -30,17 +30,17 @@ class UnattendedThreeInRow2Admin(
         "site",
         "missed_count",
         "created",
-    ]
+    )
 
-    list_filter = [
+    list_filter = (
         "missed_count",
         ScheduleStatusListFilter,
         "first_value",
         "second_value",
         "third_value",
-    ]
+    )
 
-    search_fields = ["id", "subject_identifier", "first_value", "second_value", "third_value"]
+    search_fields = ("id", "subject_identifier", "first_value", "second_value", "third_value")
 
     @admin.display(description="Subject", ordering="subject_identifier")
     def subject(self, obj):

meta_reports/admin/dbviews/unattended_three_in_row_admin.py

@@ -17,8 +17,8 @@ class UnattendedThreeInRowAdmin(
     TemplatesModelAdminMixin,
     admin.ModelAdmin,
 ):
-    ordering = ["site", "subject_identifier"]
-    list_display = [
+    ordering = ("site", "subject_identifier")
+    list_display = (
         "dashboard",
         "subject_identifier",
         "first_value",
@@ -28,8 +28,8 @@ class UnattendedThreeInRowAdmin(
         "from_now_days",
         "site",
         "created",
-    ]
+    )
 
-    list_filter = [ScheduleStatusListFilter, "first_value", "second_value", "third_value"]
+    list_filter = (ScheduleStatusListFilter, "first_value", "second_value", "third_value")
 
-    search_fields = ["subject_identifier", "first_value", "second_value", "third_value"]
+    search_fields = ("subject_identifier", "first_value", "second_value", "third_value")

meta_reports/admin/dbviews/unattended_two_in_row_admin.py

@@ -17,8 +17,8 @@ class UnattendedTwoInRowAdmin(
     TemplatesModelAdminMixin,
     admin.ModelAdmin,
 ):
-    ordering = ["site", "subject_identifier"]
-    list_display = [
+    ordering = ("site", "subject_identifier")
+    list_display = (
         "dashboard",
         "subject_identifier",
         "first_value",
@@ -27,8 +27,8 @@ class UnattendedTwoInRowAdmin(
         "from_now_days",
         "site",
         "created",
-    ]
+    )
 
-    list_filter = [ScheduleStatusListFilter, "first_value", "second_value"]
+    list_filter = (ScheduleStatusListFilter, "first_value", "second_value")
 
-    search_fields = ["subject_identifier", "first_value", "second_value"]
+    search_fields = ("subject_identifier", "first_value", "second_value")

meta_reports/admin/endpoints_admin.py

@@ -8,7 +8,7 @@ from .modeladmin_mixins import EndpointsModelAdminMixin
 
 @admin.register(Endpoints, site=meta_reports_admin)
 class EndpointsAdmin(EndpointsModelAdminMixin, admin.ModelAdmin):
-    queryset_filter = dict(offstudy_date__isnull=True)
+    queryset_filter = dict(offstudy_date__isnull=True)  # noqa: RUF012
 
     def rendered_change_list_note(self):
         return render_to_string("meta_reports/endpoints_change_list_note.html")