meta-edc 0.3.50__py3-none-any.whl → 0.3.51__py3-none-any.whl

meta_consent/admin/list_filters.py

@@ -0,0 +1,22 @@
+from django.contrib.admin import SimpleListFilter
+from edc_constants.choices import YES_NO_NA
+from edc_constants.constants import NO, NOT_APPLICABLE, YES
+
+
+class AgreesListFilter(SimpleListFilter):
+    title = "Agrees"
+    parameter_name = "agrees"
+
+    def lookups(self, request, model_admin):
+        return YES_NO_NA
+
+    def queryset(self, request, queryset):
+        qs = None
+        if self.value():
+            if self.value() == YES:
+                qs = queryset.filter(agrees_to_extension=YES)
+            elif self.value() == NO:
+                qs = queryset.filter(agrees_to_extension=NO)
+            elif self.value() == NOT_APPLICABLE:
+                qs = queryset.filter(agrees_to_extension=NOT_APPLICABLE)
+        return qs

meta_consent/admin/subject_consent_v1_ext_admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+from django.utils.translation import gettext_lazy as _
 from django_audit_fields import audit_fieldset_tuple
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
@@ -6,6 +7,7 @@ from edc_model_admin.history import SimpleHistoryAdmin
 from ..admin_site import meta_consent_admin
 from ..forms import SubjectConsentV1ExtForm
 from ..models import SubjectConsentV1Ext
+from .list_filters import AgreesListFilter
 
 
 @admin.register(SubjectConsentV1Ext, site=meta_consent_admin)
@@ -15,6 +17,11 @@ class SubjectConsentV1ExtAdmin(
 ):
     form = SubjectConsentV1ExtForm
 
+    additional_instructions = (
+        "This consent offers the participant the option to agree to "
+        "extend clinic followup from the original 36 months to 48 months. "
+    )
+
     fieldsets = (
         (
             None,
@@ -26,10 +33,41 @@ class SubjectConsentV1ExtAdmin(
                 )
             },
         ),
+        (
+            "Review Questions",
+            {
+                "fields": (
+                    "consent_reviewed",
+                    "study_questions",
+                    "assessment_score",
+                    "consent_signature",
+                    "consent_copy",
+                ),
+                "description": _("The following questions are directed to the interviewer."),
+            },
+        ),
         audit_fieldset_tuple,
     )
 
-    radio_fields = {"agrees_to_extension": admin.VERTICAL}
+    list_display = (
+        "subject_consent",
+        "report_date",
+        "agrees",
+    )
+
+    list_filter = (
+        "report_datetime",
+        AgreesListFilter,
+    )
+
+    radio_fields = {
+        "agrees_to_extension": admin.VERTICAL,
+        "consent_reviewed": admin.VERTICAL,
+        "study_questions": admin.VERTICAL,
+        "assessment_score": admin.VERTICAL,
+        "consent_signature": admin.VERTICAL,
+        "consent_copy": admin.VERTICAL,
+    }
 
     def get_readonly_fields(self, request, obj=None) -> tuple[str, ...]:
         if obj:
@@ -43,3 +81,13 @@ class SubjectConsentV1ExtAdmin(
                 subject_identifier=subject_identifier
             )
         return super().formfield_for_foreignkey(db_field, request, **kwargs)
+
+    @admin.display(description="Agrees")
+    def agrees(self, obj):
+        return obj.agrees_to_extension
+
+    @admin.display(description="Report date")
+    def report_date(self, obj):
+        if obj:
+            return obj.report_datetime.date()
+        return None

meta_consent/forms/subject_consent_v1_ext_form.py

@@ -1,11 +1,33 @@
 from django import forms
+from edc_consent.modelform_mixins import ReviewFieldsModelFormMixin
+from edc_constants.constants import NOT_APPLICABLE
 from edc_form_validators import FormValidatorMixin
 from edc_sites.forms import SiteModelFormMixin
+from edc_utils.date import to_local
 
+from ..consents import consent_v1_ext
 from ..models import SubjectConsentV1Ext
 
 
-class SubjectConsentV1ExtForm(SiteModelFormMixin, FormValidatorMixin, forms.ModelForm):
+class SubjectConsentV1ExtForm(
+    SiteModelFormMixin, ReviewFieldsModelFormMixin, FormValidatorMixin, forms.ModelForm
+):
+
+    def clean(self):
+        cleaned_data = super().clean()
+        start_datetime = to_local(consent_v1_ext.start)
+        if (
+            cleaned_data.get("report_datetime")
+            and cleaned_data.get("report_datetime") < start_datetime
+        ):
+            dt = start_datetime.date().strftime("%Y-%m-%d")
+            raise forms.ValidationError(
+                {"report_datetime": f"Cannot be before consent approval date {dt}."}
+            )
+
+        if cleaned_data.get("agrees_to_extension") == NOT_APPLICABLE:
+            raise forms.ValidationError({"agrees_to_extension": "Invalid option"})
+        return cleaned_data
 
     widgets = {
         "subject_identifier": forms.TextInput(attrs={"readonly": "readonly"}),
@@ -14,3 +36,13 @@ class SubjectConsentV1ExtForm(SiteModelFormMixin, FormValidatorMixin, forms.Mode
     class Meta:
         model = SubjectConsentV1Ext
         fields = "__all__"
+        labels = {
+            "study_questions": (
+                "I have answered all questions the participant had about the "
+                "follow-up extension"
+            ),
+            "assessment_score": (
+                "I have asked the participant questions about the follow-up extension and "
+                "the participant has demonstrated understanding"
+            ),
+        }

meta_consent/migrations/0028_historicalsubjectconsentv1ext_assessment_score_and_more.py

@@ -0,0 +1,162 @@
+# Generated by Django 5.1.2 on 2025-01-15 23:45
+
+import edc_consent.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_consent", "0027_auto_20250111_0344"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="historicalsubjectconsentv1ext",
+            name="assessment_score",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                help_text="If no, participant is not eligible.",
+                max_length=3,
+                null=True,
+                validators=[edc_consent.validators.eligible_if_yes],
+                verbose_name="I have asked the participant questions about this study and the participant has demonstrated understanding",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalsubjectconsentv1ext",
+            name="consent_copy",
+            field=models.CharField(
+                choices=[
+                    ("Yes", "Yes"),
+                    ("No", "No"),
+                    ("Declined", "Yes, but subject declined copy"),
+                ],
+                help_text="If declined, return copy with the consent",
+                max_length=20,
+                null=True,
+                validators=[edc_consent.validators.eligible_if_yes_or_declined],
+                verbose_name="I have provided the participant with a copy of their signed informed consent",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalsubjectconsentv1ext",
+            name="consent_reviewed",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                help_text="If no, participant is not eligible.",
+                max_length=3,
+                null=True,
+                validators=[edc_consent.validators.eligible_if_yes],
+                verbose_name="I have reviewed the consent with the participant",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalsubjectconsentv1ext",
+            name="consent_signature",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                help_text="If no, participant is not eligible.",
+                max_length=3,
+                null=True,
+                validators=[edc_consent.validators.eligible_if_yes],
+                verbose_name="I have verified that the participant has signed the consent form",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalsubjectconsentv1ext",
+            name="study_questions",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                help_text="If no, participant is not eligible.",
+                max_length=3,
+                null=True,
+                validators=[edc_consent.validators.eligible_if_yes],
+                verbose_name="I have answered all questions the participant had about the study",
+            ),
+        ),
+        migrations.AddField(
+            model_name="subjectconsentv1ext",
+            name="assessment_score",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                help_text="If no, participant is not eligible.",
+                max_length=3,
+                null=True,
+                validators=[edc_consent.validators.eligible_if_yes],
+                verbose_name="I have asked the participant questions about this study and the participant has demonstrated understanding",
+            ),
+        ),
+        migrations.AddField(
+            model_name="subjectconsentv1ext",
+            name="consent_copy",
+            field=models.CharField(
+                choices=[
+                    ("Yes", "Yes"),
+                    ("No", "No"),
+                    ("Declined", "Yes, but subject declined copy"),
+                ],
+                help_text="If declined, return copy with the consent",
+                max_length=20,
+                null=True,
+                validators=[edc_consent.validators.eligible_if_yes_or_declined],
+                verbose_name="I have provided the participant with a copy of their signed informed consent",
+            ),
+        ),
+        migrations.AddField(
+            model_name="subjectconsentv1ext",
+            name="consent_reviewed",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                help_text="If no, participant is not eligible.",
+                max_length=3,
+                null=True,
+                validators=[edc_consent.validators.eligible_if_yes],
+                verbose_name="I have reviewed the consent with the participant",
+            ),
+        ),
+        migrations.AddField(
+            model_name="subjectconsentv1ext",
+            name="consent_signature",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                help_text="If no, participant is not eligible.",
+                max_length=3,
+                null=True,
+                validators=[edc_consent.validators.eligible_if_yes],
+                verbose_name="I have verified that the participant has signed the consent form",
+            ),
+        ),
+        migrations.AddField(
+            model_name="subjectconsentv1ext",
+            name="study_questions",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                help_text="If no, participant is not eligible.",
+                max_length=3,
+                null=True,
+                validators=[edc_consent.validators.eligible_if_yes],
+                verbose_name="I have answered all questions the participant had about the study",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectconsentv1ext",
+            name="agrees_to_extension",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No"), ("N/A", "Not applicable")],
+                help_text="See above for the definition of extended followup.",
+                max_length=15,
+                verbose_name="Does the participant agree to extend followup as per the protocol amendment?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectconsentv1ext",
+            name="agrees_to_extension",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No"), ("N/A", "Not applicable")],
+                help_text="See above for the definition of extended followup.",
+                max_length=15,
+                verbose_name="Does the participant agree to extend followup as per the protocol amendment?",
+            ),
+        ),
+    ]

meta_consent/migrations/0029_alter_historicalsubjectconsentv1ext_agrees_to_extension_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 5.1.2 on 2025-01-15 23:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_consent", "0028_historicalsubjectconsentv1ext_assessment_score_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalsubjectconsentv1ext",
+            name="agrees_to_extension",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No"), ("N/A", "Not applicable")],
+                help_text="See above for the definition of extended followup.",
+                max_length=15,
+                verbose_name="Does the participant give consent to extend clinic followup as per the protocol amendment?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectconsentv1ext",
+            name="agrees_to_extension",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No"), ("N/A", "Not applicable")],
+                help_text="See above for the definition of extended followup.",
+                max_length=15,
+                verbose_name="Does the participant give consent to extend clinic followup as per the protocol amendment?",
+            ),
+        ),
+    ]

meta_consent/models/subject_consent_v1_ext.py

@@ -1,5 +1,6 @@
 from django.db import models
 from edc_action_item.models import ActionModelMixin
+from edc_consent.field_mixins import ReviewFieldsMixin
 from edc_consent.model_mixins import ConsentExtensionModelMixin
 from edc_model.models import BaseUuidModel
 from edc_sites.model_mixins import SiteModelMixin
@@ -9,10 +10,14 @@ from .subject_consent_v1 import SubjectConsentV1
 
 
 class SubjectConsentV1Ext(
-    ConsentExtensionModelMixin, SiteModelMixin, ActionModelMixin, BaseUuidModel
+    ConsentExtensionModelMixin,
+    SiteModelMixin,
+    ActionModelMixin,
+    ReviewFieldsMixin,
+    BaseUuidModel,
 ):
     """A consent extension to allow a participant to extend followup
-    up to 48 months.
+    up to 48 months, or not.
     """
 
     subject_consent = models.ForeignKey(SubjectConsentV1, on_delete=models.PROTECT)

meta_edc/settings/debug.py

@@ -9,9 +9,9 @@ print(f"Settings file {__file__}")
 # TZ Sites:
 # SITE_ID = SiteID(default=20)  # Amana
 # SITE_ID = SiteID(default=10)  # Hindu Mandal
-SITE_ID = SiteID(default=40)  # Mwananyamala
+# SITE_ID = SiteID(default=40)  # Mwananyamala
 # SITE_ID = SiteID(default=50)  # Mbagala
-# SITE_ID = SiteID(default=60)  # Mnazi-Moja
+SITE_ID = SiteID(default=60)  # Mnazi-Moja
 # SITE_ID = SiteID(default=30)  # Temeke
 INDEX_PAGE = "http://localhost:8000"
 EDC_SITES_UAT_DOMAIN = False

{meta_edc-0.3.50.dist-info → meta_edc-0.3.51.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: meta-edc
-Version: 0.3.50
+Version: 0.3.51
 Summary: META Trial EDC (http://www.isrctn.com/ISRCTN76157257)
 Home-page: https://github.com/meta-trial/meta-edc
 Author: Erik van Widenfelt
@@ -693,7 +693,7 @@ Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: edc==0.6.24
+Requires-Dist: edc==0.6.25
 Requires-Dist: edc-microscopy
 Requires-Dist: beautifulsoup4
 Requires-Dist: celery[redis]

{meta_edc-0.3.50.dist-info → meta_edc-0.3.51.dist-info}/RECORD

@@ -120,17 +120,18 @@ meta_consent/consents.py,sha256=JkO2dlt7Fn7ckWRGgdicAaXWgtIANo1amwxK5ykL5uk,1185
 meta_consent/constants.py,sha256=w5n3B4jwUDDZEc4gMpkKeffsHqi724GnoABFtjmvbQk,78
 meta_consent/urls.py,sha256=YXQLoyH5tFMPUK9PTk33Yve_HCWw-rhUrlXegbadxlw,206
 meta_consent/admin/__init__.py,sha256=8r1_xNoP3ZdrIB9naPRDTLENYdwBIxZvqO9CCH20aNc,182
+meta_consent/admin/list_filters.py,sha256=rEz1xfr3WnG6UsJoq6hk1OLMjaa5VTKSGuI5CJl_pP4,743
 meta_consent/admin/modeladmin_mixins.py,sha256=hMwrkwI7BrjpozvhxRtG1JiyLUWqs5_QNPluN_3Zous,5362
 meta_consent/admin/subject_consent_admin.py,sha256=IfGANb9TFvVs9yga8WOTxHxy2yRHP--KgsVUWEg30MQ,647
 meta_consent/admin/subject_consent_v1_admin.py,sha256=nmssuWL7eomQfXi3mVrszs3Ghufhz46JAwr9wFU3gkI,657
-meta_consent/admin/subject_consent_v1_ext_admin.py,sha256=QV3vL2aXSEH3Qi8cd4wQJLpkEJbJj93xqIUk2h8uWYA,1439
+meta_consent/admin/subject_consent_v1_ext_admin.py,sha256=HUqBp67_IpIW3L8VSf6UbgNqqLBWobZyLKj65HTDXEc,2817
 meta_consent/admin/actions/__init__.py,sha256=ipklkCOCQY9z9oqij2--MMNlczc-1MdzsRhMHEDDkQY,70
 meta_consent/admin/actions/create_missing_prescriptions.py,sha256=xx1HeLkJlB-QAa_a9GtZD74d39SkExzwg97U7Gq_86U,1474
 meta_consent/form_validators/__init__.py,sha256=MFB5Vz9rFKxJaS2uW6jtdfg5G6vA0nyzwNcKGLa--Y0,72
 meta_consent/form_validators/subject_consent_form_validator.py,sha256=2f4FY1VZ1qU4u35LSoRtBIhmRhrflOhs0Zal8z1Ogo8,1258
 meta_consent/forms/__init__.py,sha256=fLrim2NPwpbo0Y7PCGbeDk6ryS-4W0ju7nYNF4fZWaY,233
 meta_consent/forms/subject_consent_form.py,sha256=Dwnwn7y-8AABvzgTa1zfs2b2Mli0OKnNMsx0VOxO9n0,1293
-meta_consent/forms/subject_consent_v1_ext_form.py,sha256=LVbMSYEkJNSeaU0QWttFRPekrgr8bb10GL6ukr0tRmY,437
+meta_consent/forms/subject_consent_v1_ext_form.py,sha256=K_qzOGLqKpC3QjYX_fQ8SLsu_EeLwuqrXtTI95yrzkw,1704
 meta_consent/forms/subject_consent_v1_form.py,sha256=XHrklzP-wh6ny3VJ2Bf9v7BTaUlfTToYVrpIAm3JZFc,766
 meta_consent/forms/subject_reconsent_form.py,sha256=lJAaVb3TXwTFjg8-iAJo836wAw2D3ofsfgGUZu_svb0,1306
 meta_consent/locale/lg/LC_MESSAGES/django.po,sha256=qWq1GuH-sIg05d2vydpYIxS71-fjutlJTPiLEJ905rw,1969
@@ -165,13 +166,15 @@ meta_consent/migrations/0024_historicalsubjectconsentv1.py,sha256=y2-R0h-leaIWy-
 meta_consent/migrations/0025_alter_historicalsubjectconsent_first_name_and_more.py,sha256=E8VES-7To-09v0IIpv0jBDJGs5lYGcRxOk_Bhbr9QmQ,6307
 meta_consent/migrations/0026_historicalsubjectconsentv1ext_subjectconsentv1ext.py,sha256=t8MFiBkc_iJ58QTy_Vn8GKZhhe7OOOuUa6sUVWrSJtE,21611
 meta_consent/migrations/0027_auto_20250111_0344.py,sha256=iQGpH03s_x4iBl47QSzR5NauOdSSZCtSPUF2NdRf4y4,943
+meta_consent/migrations/0028_historicalsubjectconsentv1ext_assessment_score_and_more.py,sha256=N_pDoynD0y1ssSqlHuq3Doy9lyl8q-ARVz7Dop85bR4,6834
+meta_consent/migrations/0029_alter_historicalsubjectconsentv1ext_agrees_to_extension_and_more.py,sha256=hH5Wz1qAhaaFog13hOVhkuvdlUBqf0dDN1D5sHAD0EE,1277
 meta_consent/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_consent/models/__init__.py,sha256=ugL8eQybOHAEFgOtGKxVHLZ3ibAnRCNSaf9wup6J_uI,279
 meta_consent/models/model_mixins.py,sha256=r5KmTykU0qV4JymMMKP2IBwAP8Z5hDnVJix-rO2PvME,296
 meta_consent/models/signals.py,sha256=WHaCDREbWOnUfmT01U_Nxiu5x4OIyV3wKRLd98vbfeQ,5152
 meta_consent/models/subject_consent.py,sha256=bI17d15K7A8UzyKCAoKL8Xe2E4jlhNY1Axwftuo2n4Y,3803
 meta_consent/models/subject_consent_v1.py,sha256=xJPGTTVfne5KBdeNZm5dXheWcGQ2bFTxjOxm_4sjfVk,458
-meta_consent/models/subject_consent_v1_ext.py,sha256=LHBR-27E5kDv0MyQKq0E7yKi-wETvOmHqDM0QO5M4Fk,934
+meta_consent/models/subject_consent_v1_ext.py,sha256=MpK5TlUqf2JuYRpmRLzYBClOFstC_6pIGwDRUckIztU,1033
 meta_consent/models/subject_reconsent.py,sha256=4SqwRntG6Ik8JoO73Sa1BddNqFAIrdtFcGrKQ1ZeUV0,3595
 meta_consent/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_consent/tests/holidays.csv,sha256=Ywr5pK_caGUJMgRwLzjMeSEUuyEpUWyJE5aJkfbg3bg,539
@@ -242,7 +245,7 @@ meta_edc/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 meta_edc/management/commands/update_forms_reference.py,sha256=jvCU9YdMtp9wbmjqKQsB9gxNw4DcAP97sZD-kfIxOns,1071
 meta_edc/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_edc/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_edc/settings/debug.py,sha256=pqPPuRAuwopIx8FAkJ3ZpZwBp5NRGugEe4yq4eUQTKM,1296
+meta_edc/settings/debug.py,sha256=5WkxxapNtYDi9XKXCOCnlZ3q9--zktBtRyGhCVUaMEs,1296
 meta_edc/settings/defaults.py,sha256=4jIHzK4pSIWCD2uJiyr3U1Rp1Uhhwi2MXPbXrMd7SZs,19704
 meta_edc/settings/live.py,sha256=uLTlsIc3H6gdE_7pkL6vyOVa6V_74hnXFkiojqGFAYY,264
 meta_edc/settings/logging.py,sha256=6qVUE37OMkf5rzwTmMq4krFsZ2jcyCpWdFtGih_Cs4U,1938
@@ -275,7 +278,7 @@ meta_lists/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_lists/admin.py,sha256=g05vpXfVIEBVG03aiPD8Vn-AnR7gL60MbPJAfzsO6R8,2157
 meta_lists/admin_site.py,sha256=M4uorELumZDIKD8SHs-AEX1doQFqXhRy-eCcRWYEu9k,165
 meta_lists/apps.py,sha256=aegHpyrHw188UxhNVFd-v35HP9wO7J7G9BYmliOOE0c,278
-meta_lists/list_data.py,sha256=yf2LMdTHd85cQW91UO-K3dVsALA7st9P3NQ9OaQJJiA,9702
+meta_lists/list_data.py,sha256=kybIQAevrVKqncQHNoCatdgUpkLTV0S-Avim6hSgPWw,9819
 meta_lists/models.py,sha256=3amfYtGe4GGtSpLXs36On8k_ZmpDzNs5ga54O-SIABs,3032
 meta_lists/urls.py,sha256=9NCrRvdkPXzH3L7VMCa0iQnz-j5tujzhvvtRRAGunV8,204
 meta_lists/migrations/0001_initial.py,sha256=87crhJGEUzUxe9TaNTzzKM6AjE3Pjw032PkhYrnRz9k,13881
@@ -340,18 +343,18 @@ meta_pharmacy/models/substitutions.py,sha256=9FjjD4x66B8SxABZR5atan2S5uE4nJH0tn0
 meta_pharmacy/utils/__init__.py,sha256=PiPRCZqgxPiudXWEvQmXOqFZMoj56NEiOeRuYEyE_9w,71
 meta_pharmacy/utils/update_initial_pharmacy_data.py,sha256=Od0QL41unsDEGDBYsVCe8k-T3GpMae0DtHt61vz4sYM,4621
 meta_prn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_prn/action_items.py,sha256=wz6X7Ve8ibqPBO5kB6S9rYYkWfx8JxsoYRVppzIGAzk,9110
+meta_prn/action_items.py,sha256=R83aFDxyOEkmzfJwWMcRYXWXZBcv3hTp_QzHNJPLNPM,9108
 meta_prn/admin_site.py,sha256=E4dJ6ofu9Kp-1SIWIuY3PraVPbEJSWBBqhorJPGUNqU,161
 meta_prn/apps.py,sha256=NEqrwzEW277BAPGeL1H1KdK9e74FqXfYHK6o46BtaJA,280
 meta_prn/baker_recipes.py,sha256=jDGg3btxjtvnsph_AnKoZBDUeTfokMs5iQWnQBJD-jw,660
 meta_prn/choices.py,sha256=QKqCh2mN_Fgt9Z_la_YVeAqlzRxd507TurFVOOc71G0,3210
-meta_prn/constants.py,sha256=Sx5yFdV39CxalQ74cXvhIUwlJaKVn3CCBVRJwZJLALw,970
+meta_prn/constants.py,sha256=Z0atxRnTIj-_bWbfYY0vZIwfmbwaFRpSZqb1-K1B4Jo,1018
 meta_prn/list_data.py,sha256=Se-GxHTuxmU_j17tIdLicKlW6d5E9pVKvYVrTLZQFUo,2336
 meta_prn/pregnancy_action_item_mixin.py,sha256=E_7aFSs_PXkqlRqRbKohWZSnE7rUcFVr0LacF7EjrvM,1018
 meta_prn/urls.py,sha256=AOKhAkkdXlr5P4z-WK70Da6Zm9DktKWnPDtXfCKYJWs,202
 meta_prn/admin/__init__.py,sha256=gwAfqcnkJm8rcjYdtd_e1aFVsv7qDq7RCIHUaheo82c,766
 meta_prn/admin/dm_referral_admin.py,sha256=IUYxEw-PaAKlC0GnBV5kEUL3jMWGymUeA183SNlqfJg,1401
-meta_prn/admin/end_of_study_admin.py,sha256=uidlvWj2280kSxocNDX0mKP63lsMtCmiuWCR_ySn_0Q,5121
+meta_prn/admin/end_of_study_admin.py,sha256=G0l0e1V9FYWky6jh-DG6rqwNB1Uv0NjA0uFkoT55Gyw,5444
 meta_prn/admin/loss_to_followup_admin.py,sha256=N385T_F1PJZBWw7jldG2HZiWuvlJs3SW92Oa_NNvGHo,1736
 meta_prn/admin/off_study_medication_admin.py,sha256=pUc6vXvPuoAwTBxE24ztvqEOVSK4wFG8yx_4SQOn918,2377
 meta_prn/admin/offschedule_admin.py,sha256=FjijlMYfv3DhyNF0kTLmvmLhI1ASmIY8lUl0L-NfUx4,1707
@@ -364,7 +367,7 @@ meta_prn/admin/pregnancy_notification_admin.py,sha256=fIAbpU1QEVAGeewxc2xcRu7aip
 meta_prn/admin/protocol_incident_admin.py,sha256=fTlYJAxsrPDB8skZc-_2DxKH21k_cG7UH7wCgnviBck,739
 meta_prn/admin/subject_transfer_admin.py,sha256=YKViIZLAaAquiN5RO-V6lRoGP76bYwcb_EA5QTEeI2Y,723
 meta_prn/form_validators/__init__.py,sha256=ROZbWrtQ4dLCwy-aeBcOh0mnYm12qFrvUWzV-BkGvTU,111
-meta_prn/form_validators/end_of_study.py,sha256=jSLn5nFTrg7b3b5h86ynN6dT8VavKwUQNLvTAyBH6iI,11246
+meta_prn/form_validators/end_of_study.py,sha256=nhAymg1c_GH74MrrubzYSJUKdBkRVY4qKj7C0GufrQw,12917
 meta_prn/form_validators/protocol_incident.py,sha256=g28qDxXpb-RiE4szn-KHFA03GcaAp0VWJ5SD5f3NUp8,1068
 meta_prn/forms/__init__.py,sha256=rQX_sPN77qzktlfH46qQNcZ1yV1WvKThm2c-jzangNQ,565
 meta_prn/forms/dm_referral_form.py,sha256=TvJSzKyVXXCOHRw67_i3BP9yEjAwE2yT5H6Y9bLRddU,1350
@@ -436,10 +439,13 @@ meta_prn/migrations/0056_alter_endofstudy_clinical_withdrawal_reason_and_more.py
 meta_prn/migrations/0057_historicalonscheduledmreferral_and_more.py,sha256=nGu1PaQHenWjkFaEPPfNJelXFBYNAFJkNiN7NV-BW90,46174
 meta_prn/migrations/0058_dmreferral_referral_note_and_more.py,sha256=i18Cioesp1J1Szop3UQyNYnujMj8aiSMyioqtIidQsU,876
 meta_prn/migrations/0059_alter_historicaloffstudymedication_reason_and_more.py,sha256=ToRLwJg6pF_6DIglm729xlC8O4u7nfe0jI_XC0aSarY,2057
+meta_prn/migrations/0060_alter_onschedule_managers_and_more.py,sha256=zTlobJgliy-LuQ3z_BE_cwpdVddrvpHRvhDH4Hj64zY,1791
+meta_prn/migrations/0061_auto_20250115_2025.py,sha256=u7F2GsXo-9pIN5z0VM1aXW_KoRjS82BaBqqj2xWwWzo,1937
+meta_prn/migrations/0062_alter_endofstudy_offstudy_reason_and_more.py,sha256=L1ZDX1IMS0nIs77lF4QZ0SX-ye4rXvouTLnijob8SAQ,2421
 meta_prn/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_prn/models/__init__.py,sha256=l06P7L2_Aye2h2VmAyb1XRcIbQAOyxws08IMc8sIops,717
 meta_prn/models/dm_referral.py,sha256=XyyB5ylcaMRCumGRFPlh2Op5VvT9ROJ1A9x5q55vUuc,1096
-meta_prn/models/end_of_study.py,sha256=rAA5H5m2cXKSTwQAxYyXSrzlm0jG7RnWZ1EInBYfOP4,5316
+meta_prn/models/end_of_study.py,sha256=TBvLrJO6hLNBc69w7jBgWesMoJvrdeiT1TzLPWZffd8,5418
 meta_prn/models/loss_to_followup.py,sha256=k4fXO6_U-IXiEOOnLrxhhuiTYgisPT5lqqA7mavZFfs,2436
 meta_prn/models/off_study_medication.py,sha256=qq8DadWCNvFOYLkx9VoDMyLnbuZiRGc7-gmPSb-QVFk,1701
 meta_prn/models/offschedule.py,sha256=DjQvXteecXJOzN6ijdH36FCxXoR1halzxl9EliqQJk8,1717
@@ -1172,9 +1178,9 @@ tests/etc/user-rsa-restricted-private.pem,sha256=CUcHW9bznWdmmASN00hCzvxFPAFl4N2
 tests/etc/user-rsa-restricted-public.pem,sha256=mt84djoL-uHw6Wc5SJh0zml6VzXulnf8eQSFg7-fheg,450
 tests/etc/user-salt-local.key,sha256=x5anBw9fvbHurczouT3CjrkWb_xs7Ypm1htIJsgiuiw,256
 tests/etc/user-salt-restricted.key,sha256=pxmpcfBRNB-4C6wTvHXz-9fOfJgKIFOjaAF8ZFfa4q4,256
-meta_edc-0.3.50.dist-info/AUTHORS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_edc-0.3.50.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-meta_edc-0.3.50.dist-info/METADATA,sha256=vVYCwcmwZIY7HWi1cz8w3BIk8u-V2Dt_fuuhBqVhJKI,43529
-meta_edc-0.3.50.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-meta_edc-0.3.50.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
-meta_edc-0.3.50.dist-info/RECORD,,
+meta_edc-0.3.51.dist-info/AUTHORS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+meta_edc-0.3.51.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+meta_edc-0.3.51.dist-info/METADATA,sha256=tIZcCLmKTFyK47iHNEMztEeSh7uOzT0ZCfeFiMcCAIQ,43529
+meta_edc-0.3.51.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+meta_edc-0.3.51.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
+meta_edc-0.3.51.dist-info/RECORD,,

meta_lists/list_data.py

@@ -12,7 +12,11 @@ from edc_ltfu.constants import LOST_TO_FOLLOWUP
 from edc_offstudy.constants import COMPLETED_FOLLOWUP, WITHDRAWAL
 from edc_transfer.constants import TRANSFERRED
 
-from meta_prn.constants import CLINICAL_WITHDRAWAL, LATE_EXCLUSION
+from meta_prn.constants import (
+    CLINICAL_WITHDRAWAL,
+    COMPLETED_FOLLOWUP_48,
+    LATE_EXCLUSION,
+)
 
 list_data = {
     "meta_lists.dmmedications": [
@@ -197,6 +201,7 @@ list_data = {
     ],
     "meta_lists.offstudyreasons": [
         (COMPLETED_FOLLOWUP, "Patient completed 36 months of follow-up"),
+        (COMPLETED_FOLLOWUP_48, "Patient completed 48 months of follow-up"),
         (DELIVERY, "Delivered / Completed followup from pregnancy"),
         (PREGNANCY, "Pregnancy, declined further followup"),
         (DIABETES, "Patient developed diabetes"),

meta_prn/action_items.py

@@ -90,7 +90,7 @@ class EndOfStudyAction(ActionWithNotification):
     display_name = "Submit End of Study Report"
     notification_display_name = "End of Study Report"
     parent_action_names = [
-        # OFFSCHEDULE_ACTION,
+        OFFSCHEDULE_ACTION,
         OFFSTUDY_MEDICATION_ACTION,
         OFFSCHEDULE_PREGNANCY_ACTION,
         OFFSCHEDULE_DM_REFERRAL_ACTION,

meta_prn/admin/end_of_study_admin.py

@@ -12,6 +12,7 @@ from edc_sites.admin import SiteModelAdminMixin
 
 from meta_ae.models import DeathReport
 from meta_consent.models import SubjectConsent
+from meta_lists.models import OffstudyReasons
 
 from ..admin_site import meta_prn_admin
 from ..forms import EndOfStudyForm
@@ -111,6 +112,11 @@ class EndOfStudyAdmin(
         "toxicity_withdrawal_reason": admin.VERTICAL,
     }
 
+    def formfield_for_foreignkey(self, db_field, request, **kwargs):
+        if db_field.name == "offstudy_reason":
+            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, ...]:
         list_display = super().get_list_display(request)
         custom_fields = (

meta_prn/constants.py

@@ -1,5 +1,6 @@
 CLINICAL_WITHDRAWAL = "clinical_withdrawal"
 CLINICIAN = "clinician"
+COMPLETED_FOLLOWUP_48 = "completed_followup_48"
 DEATH_REPORT_ACTION = "submit_death_report"
 DEVIATION = "protocol_deviation"
 DM_REFFERAL_ACTION = "dm_refferal_action"

meta_prn/form_validators/end_of_study.py

@@ -19,11 +19,13 @@ from edc_offstudy.utils import OffstudyError
 from edc_prn.modelform_mixins import PrnFormValidatorMixin
 from edc_transfer.constants import TRANSFERRED
 from edc_utils import formatted_date
-from edc_visit_schedule.constants import MONTH36
+from edc_visit_schedule.constants import MONTH36, MONTH48
+from edc_visit_schedule.site_visit_schedules import site_visit_schedules
 from edc_visit_schedule.utils import off_all_schedules_or_raise
 
 from ..constants import (
     CLINICAL_WITHDRAWAL,
+    COMPLETED_FOLLOWUP_48,
     INVESTIGATOR_DECISION,
     OFFSTUDY_MEDICATION_ACTION,
 )
@@ -44,6 +46,7 @@ class EndOfStudyFormValidator(
         self.validate_offstudy_datetime_against_last_seen_date()
 
         self.validate_completed_36m()
+        self.validate_completed_48m()
 
         self.required_if(DEAD, field="offstudy_reason", field_required="death_date")
         self.validate_death_report_if_deceased()
@@ -108,6 +111,41 @@ class EndOfStudyFormValidator(
                     {"offstudy_reason": "Invalid. 36 month visit has not been submitted."},
                     INVALID_ERROR,
                 )
+            schedule = site_visit_schedules.get_visit_schedule(
+                visit_schedule_name="visit_schedule"
+            ).schedules.get("schedule")
+            if subject_visit_model_cls.objects.filter(
+                subject_identifier=self.subject_identifier,
+                visit_code_sequence=0,
+                appointment__timepoint__gt=schedule.visits.get(MONTH36).timepoint,
+                appointment__schedule_name=schedule.name,
+            ):
+                self.raise_validation_error(
+                    {
+                        "offstudy_reason": (
+                            "Invalid. Participant has attended visits past 36 months."
+                        )
+                    },
+                    INVALID_ERROR,
+                )
+
+    def validate_completed_48m(self):
+        if (
+            self.cleaned_data.get("offstudy_reason")
+            and self.cleaned_data.get("offstudy_reason").name == COMPLETED_FOLLOWUP_48
+        ):
+            subject_visit_model_cls = django_apps.get_model("meta_subject.subjectvisit")
+            try:
+                subject_visit_model_cls.objects.get(
+                    subject_identifier=self.subject_identifier,
+                    visit_code=MONTH48,
+                    visit_code_sequence=0,
+                )
+            except ObjectDoesNotExist:
+                self.raise_validation_error(
+                    {"offstudy_reason": "Invalid. 48 month visit has not been submitted."},
+                    INVALID_ERROR,
+                )
 
     def validate_pregnancy(self):
         if (

meta_prn/migrations/0060_alter_onschedule_managers_and_more.py

@@ -0,0 +1,55 @@
+# Generated by Django 5.1.2 on 2025-01-15 13:29
+
+import edc_sites.managers
+import edc_visit_schedule.model_mixins.on_schedule_model_mixin
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_prn", "0059_alter_historicaloffstudymedication_reason_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelManagers(
+            name="onschedule",
+            managers=[
+                (
+                    "objects",
+                    edc_visit_schedule.model_mixins.on_schedule_model_mixin.OnScheduleManager(),
+                ),
+                ("on_site", edc_sites.managers.CurrentSiteManager()),
+            ],
+        ),
+        migrations.AlterModelManagers(
+            name="onscheduledmreferral",
+            managers=[
+                (
+                    "objects",
+                    edc_visit_schedule.model_mixins.on_schedule_model_mixin.OnScheduleManager(),
+                ),
+                ("on_site", edc_sites.managers.CurrentSiteManager()),
+            ],
+        ),
+        migrations.AlterModelManagers(
+            name="onschedulepostnatal",
+            managers=[
+                (
+                    "objects",
+                    edc_visit_schedule.model_mixins.on_schedule_model_mixin.OnScheduleManager(),
+                ),
+                ("on_site", edc_sites.managers.CurrentSiteManager()),
+            ],
+        ),
+        migrations.AlterModelManagers(
+            name="onschedulepregnancy",
+            managers=[
+                (
+                    "objects",
+                    edc_visit_schedule.model_mixins.on_schedule_model_mixin.OnScheduleManager(),
+                ),
+                ("on_site", edc_sites.managers.CurrentSiteManager()),
+            ],
+        ),
+    ]

meta_prn/migrations/0061_auto_20250115_2025.py

@@ -0,0 +1,57 @@
+# Generated by Django 5.1.2 on 2025-01-15 17:25
+
+from django.db import IntegrityError, migrations, transaction
+from edc_constants.constants import OTHER
+from edc_utils import get_utcnow
+
+from meta_lists.models import OffstudyReasons
+from meta_prn.action_items import OffStudyMedicationAction
+from meta_prn.models import EndOfStudy
+
+
+def update_offstudy_reason(apps, schema_editor):
+    """Datafix: Correct offstudy_reason from `other` to 'diabetes'
+    based on the `other_offstudy_reason`. These four subjects were
+    taken off study before 'diabetes' was an option.
+
+    Create missing OffStudyMedicationAction if needed.
+    """
+    subject_identifiers = [
+        "105-60-0029-0",
+        "105-60-0106-6",
+        "105-60-0145-4",
+        "105-60-0166-0",
+    ]
+    other_reason_obj = OffstudyReasons.objects.get(name=OTHER)
+    diabetes_reason_obj = OffstudyReasons.objects.get(name="diabetes")
+    for obj in EndOfStudy.objects.filter(
+        subject_identifier__in=subject_identifiers,
+        offstudy_reason=other_reason_obj,
+        other_offstudy_reason__icontains="THE CLIENT HAS DEVELOPED DIABETES",
+    ):
+        try:
+            with transaction.atomic():
+                OffStudyMedicationAction(
+                    subject_identifier=obj.subject_identifier,
+                    skip_get_current_site=True,
+                    site_id=obj.site_id,
+                )
+        except IntegrityError:
+            pass
+
+        obj.offstudy_reason = diabetes_reason_obj
+        obj.comment = obj.other_offstudy_reason
+        obj.comment = obj.comment + " [datafix: 0061_auto_20250115_2025]"
+        obj.other_offstudy_reason = ""
+        obj.modified = get_utcnow()
+        obj.user_modified = "erikvw"
+        obj.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_prn", "0060_alter_onschedule_managers_and_more"),
+    ]
+
+    operations = [migrations.RunPython(update_offstudy_reason)]

meta_prn/migrations/0062_alter_endofstudy_offstudy_reason_and_more.py

@@ -0,0 +1,72 @@
+# Generated by Django 5.1.2 on 2025-01-15 23:45
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_lists", "0018_missedreferralreasons"),
+        ("meta_prn", "0061_auto_20250115_2025"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="endofstudy",
+            name="offstudy_reason",
+            field=models.ForeignKey(
+                limit_choices_to={
+                    "name__in": [
+                        "completed_followup",
+                        "completed_followup_48",
+                        "diabetes",
+                        "delivery",
+                        "pregnancy",
+                        "clinical_withdrawal",
+                        "dead",
+                        "LTFU",
+                        "toxicity",
+                        "transferred",
+                        "withdrawal",
+                        "late_exclusion",
+                        "OTHER",
+                    ]
+                },
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="meta_lists.offstudyreasons",
+                verbose_name="Reason patient was terminated from the study",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalendofstudy",
+            name="offstudy_reason",
+            field=models.ForeignKey(
+                blank=True,
+                db_constraint=False,
+                limit_choices_to={
+                    "name__in": [
+                        "completed_followup",
+                        "completed_followup_48",
+                        "diabetes",
+                        "delivery",
+                        "pregnancy",
+                        "clinical_withdrawal",
+                        "dead",
+                        "LTFU",
+                        "toxicity",
+                        "transferred",
+                        "withdrawal",
+                        "late_exclusion",
+                        "OTHER",
+                    ]
+                },
+                null=True,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                related_name="+",
+                to="meta_lists.offstudyreasons",
+                verbose_name="Reason patient was terminated from the study",
+            ),
+        ),
+    ]

meta_prn/models/end_of_study.py

@@ -26,11 +26,11 @@ from edc_transfer.constants import TRANSFERRED
 from meta_lists.models import OffstudyReasons
 
 from ..choices import CLINICAL_WITHDRAWAL_REASONS, TOXICITY_WITHDRAWAL_REASONS
+from ..constants import CLINICAL_WITHDRAWAL, COMPLETED_FOLLOWUP_48
 
 # TODO: confirm all appointments are either new, incomplete or done
 # TODO: take off study meds but coninue followup (WITHDRAWAL)
 # TODO: follow on new schedule, if permanently off drug (Single 36m visit)
-from ..constants import CLINICAL_WITHDRAWAL
 
 
 class EndOfStudy(ActionModelMixin, SiteModelMixin, OffstudyModelMixin, BaseUuidModel):
@@ -52,24 +52,28 @@ class EndOfStudy(ActionModelMixin, SiteModelMixin, OffstudyModelMixin, BaseUuidM
         null=True,
         limit_choices_to={
             "name__in": [
-                CLINICAL_WITHDRAWAL,
                 COMPLETED_FOLLOWUP,
-                DEAD,
-                DELIVERY,
+                COMPLETED_FOLLOWUP_48,
                 DIABETES,
-                LATE_EXCLUSION,
-                LOST_TO_FOLLOWUP,
-                OTHER,
+                DELIVERY,
                 PREGNANCY,
+                CLINICAL_WITHDRAWAL,
+                DEAD,
+                LOST_TO_FOLLOWUP,
                 TOXICITY,
                 TRANSFERRED,
                 WITHDRAWAL,
+                LATE_EXCLUSION,
+                OTHER,
             ]
         },
     )
 
     other_offstudy_reason = models.TextField(
-        verbose_name="If OTHER, please specify", max_length=500, blank=True, null=True
+        verbose_name="If OTHER, please specify",
+        max_length=500,
+        blank=True,
+        null=True,
     )
 
     # TODO: 6m off drug and duration ?? See SOP
@@ -95,8 +99,9 @@ class EndOfStudy(ActionModelMixin, SiteModelMixin, OffstudyModelMixin, BaseUuidM
         blank=True,
         null=True,
         help_text=(
-            "A UPT CRF must be on file and participant not on the delivery schedule. "
-            "Use UPT date or, if UPT not needed, use report date on last UPT CRF."
+            "A UPT CRF must be on file and participant not on the "
+            "delivery schedule. Use UPT date or, if UPT not needed, "
+            "use report date on last UPT CRF."
         ),
     )