meta-edc 1.6.5__py3-none-any.whl → 1.6.7__py3-none-any.whl

{meta_edc-1.6.5.dist-info → meta_edc-1.6.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meta-edc
-Version: 1.6.5
+Version: 1.6.7
 Summary: META Trial EDC (https://www.isrctn.com/ISRCTN76157257)
 Keywords: django,clinicedc,META EDC,EDC,clinical trials,META Trial,ISRCTN76157257
 Author: Erik van Widenfelt, Jonathan Willitts
@@ -18,7 +18,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: django==5.2.10
 Requires-Dist: celery>=5.6.2
-Requires-Dist: clinicedc==2.3.6
+Requires-Dist: clinicedc==2.3.7
 Requires-Dist: edc-he>=1.5.2
 Requires-Dist: edc-microscopy>=1.4.2
 Requires-Dist: edc-mnsi>=1.4.0
@@ -92,8 +92,8 @@ Assuming you are logged into the account ``myaccount``:
     mkdir ~/edc && \
     cd ~/edc && \
     uv venv && \
-    uv pip install -U meta-edc==1.6.4 && \
-    wget https://raw.githubusercontent.com/meta-trial/meta-edc/1.6.4/manage.py && \
+    uv pip install -U meta-edc==1.6.6 && \
+    wget https://raw.githubusercontent.com/meta-trial/meta-edc/1.6.6/manage.py && \
     uv pip freeze | grep meta-edc
 
 Copy your ``.env`` file to ``~/.etc``.
@@ -143,7 +143,7 @@ From the above example:
 
     cd ~/edc && \
     uv venv --clear && \
-    uv pip install -U meta-edc==1.6.4 && \
+    uv pip install -U meta-edc==1.6.6 && \
     wget -O manage.py https://raw.githubusercontent.com/meta-trial/meta-edc/1.1.10/manage.py && \
     uv pip freeze | grep meta-edc && \
     python manage.py check

{meta_edc-1.6.5.dist-info → meta_edc-1.6.7.dist-info}/RECORD

@@ -262,7 +262,8 @@ meta_lists/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_lists/admin.py,sha256=_Ww9dkT8BiXwbBFAAUuFYjsWmrF22FEVyR_8E5FsH_g,2318
 meta_lists/admin_site.py,sha256=M4uorELumZDIKD8SHs-AEX1doQFqXhRy-eCcRWYEu9k,165
 meta_lists/apps.py,sha256=aegHpyrHw188UxhNVFd-v35HP9wO7J7G9BYmliOOE0c,278
-meta_lists/list_data.py,sha256=i9JsXMsWImB9ajvS31hyiDu2omtjwm0oOXAq0WZvrPw,10014
+meta_lists/constants.py,sha256=t5IS9rwOKG1nd3Wda2FdUkkJI05Nc9CzXZeSnR4wvEw,42
+meta_lists/list_data.py,sha256=VHZuzUJqvFTbc2jW_N2TKnpbhIY8Lx6cTYCkMcvChhg,10125
 meta_lists/migrations/0001_initial.py,sha256=87crhJGEUzUxe9TaNTzzKM6AjE3Pjw032PkhYrnRz9k,13881
 meta_lists/migrations/0002_auto_20191026_2231.py,sha256=lV7keU3h-MC7O_RJLYxSY_Gr2T7ROtCf0qm_WkS2s3g,4608
 meta_lists/migrations/0003_auto_20191102_0033.py,sha256=LkLUHM5zTj6vg3l1997g57uhncZPLHW-jrJgiUSe6rM,2555
@@ -748,8 +749,8 @@ meta_subject/admin/fields.py,sha256=wlKr_x8-PWL4urv6N0L4ti5yG3D7FnLy2U_hH6Baqzc,
 meta_subject/admin/fieldsets.py,sha256=NjFKDAMvzePa9TijR_-zTLsDbawfBQDuws2BzWDzeZQ,1516
 meta_subject/admin/followup_examination_admin.py,sha256=nNFQvW_zipgJCd1RDa2A2UOQkcPIq8cirwM2f3Ih0ZY,5278
 meta_subject/admin/followup_vitals_admin.py,sha256=a2bwBwFsQ1sMmnBgmeCOEv6wNCXuKeIqIwEZB-Lqt_E,2297
-meta_subject/admin/glucose_admin.py,sha256=76j7mGttcJEn4R-futfUt7LDiBFE3ffR_DnIqNzUwmE,3332
-meta_subject/admin/glucose_fbg_admin.py,sha256=O5GaNjBR0bZQcbbw1ZrgWHzcRCWRA8viNkOfwk1fVSk,2964
+meta_subject/admin/glucose_admin.py,sha256=4nxsbjgzffhdjTtG4x-RIDEQFJGOLwpBZazAwt14iI8,4222
+meta_subject/admin/glucose_fbg_admin.py,sha256=dtgdlcLBDgXME-b9GFFG3vZt2YSMShay7eLf6CPh_Is,3487
 meta_subject/admin/health_economics/__init__.py,sha256=t0vFauE3auk7FESIvk5tFjc3-Jtshl9eiAJswQBG1gw,212
 meta_subject/admin/health_economics/health_economics_simple_admin.py,sha256=nL0CvjWQsFsR19ine14iItt9e8Px53Ln_tSppMN8UQ4,1053
 meta_subject/admin/health_economics/health_economics_update_admin.py,sha256=mtsd1fJ8yvTK1eol5f03fZ8jk1afeYKSxEydPGmma7w,3905
@@ -784,11 +785,11 @@ meta_subject/form_validators/dm_endpoint_form_validator.py,sha256=KKt2G1UVzeCgpK
 meta_subject/form_validators/dm_followup_form_validator.py,sha256=78vfIr6BuW5AASdUvjIPpocIgyRhMuxmh73jBVmP8Xk,7977
 meta_subject/form_validators/egfr_drop_notification_form_validator.py,sha256=RiSwH6ZTt_bWgeTWTtSR9YT58lp7ATKx0AI7CRHSeC0,526
 meta_subject/form_validators/followup_examination_form_validator.py,sha256=AQItUjh65R-tPGWIzcHuPbCvfkr6Rzhy2dOVyPD_gVA,4237
-meta_subject/form_validators/glucose_fbg_form_validator.py,sha256=xh76UCC854s0rB0WPyEEYlzOBlerQCdk-5xe5jiXxrE,3103
-meta_subject/form_validators/glucose_form_validator.py,sha256=mx8RnL-8Bq3qa1z3Jdyn352WvdhP6SQWB-SOqmkxxqA,1008
+meta_subject/form_validators/glucose_fbg_form_validator.py,sha256=GERc2U10EQx7R7tMljcM5L5wnCZLfUACn07Z5o4a6dg,3403
+meta_subject/form_validators/glucose_form_validator.py,sha256=3giJ7TRPKmtr1oXYRUJq3qP_ZU4VejBHOjGXQVRAsaw,1316
 meta_subject/form_validators/health_economics_form_validator.py,sha256=kp-LQU4ydBXlnYFt-0xKuVSb8Y4irlhz9d_X8ppvWgE,250
 meta_subject/form_validators/hiv_exit_review_form_validator.py,sha256=9w3CHoBUkC4kWzpzGfbmsfULH-70NOegzh3IDJPEqDk,630
-meta_subject/form_validators/mixins.py,sha256=6jNZzUyMiFrLmjodmzcQl69w6nNDBNgaF4819V7ZywM,3606
+meta_subject/form_validators/mixins.py,sha256=5mhsCynXu11tKHf2SZ2Cw_IgNe1nSx8JRAfk6CPPPxw,3745
 meta_subject/forms/__init__.py,sha256=KOuMcL66-FN192az3dDSmzBb7X4r1RE2HM2zpv4PNbQ,2853
 meta_subject/forms/birth_outcomes_form.py,sha256=qqhZNQKiYk8C8CFebZTQB0hOm4ONrgkTG7hfuK7kW-o,374
 meta_subject/forms/blood_results/__init__.py,sha256=DYs2J30cgTPxvY9qDuKfr_kF_muoZ1iVmpu_I3wLpdM,528
@@ -1084,6 +1085,8 @@ meta_subject/migrations/0237_historicalhivexitreview_singleton_field_and_more.py
 meta_subject/migrations/0238_historicalhivexitreview_available_and_more.py,sha256=r2kSbcMSbKzQswJSfMP1CqRAZSdDayHjjQzsv6p-D3I,2900
 meta_subject/migrations/0239_glucosefbg_diagnostic_device_and_more.py,sha256=SIU3VMAIOwwvYtKOx6MmHlyAX6QnWi5VC9wtib-OVcI,1220
 meta_subject/migrations/0240_glucose_diagnostic_device_and_more.py,sha256=GzJJSbGU4cHvkRRZQyB94Gfiu8nKJyBJjZQkp2XTcig,2111
+meta_subject/migrations/0241_remove_glucose_diagnostic_device_and_more.py,sha256=ITanoKLlhkjn9jNuRM951ob5L9vb9av-3K6UpFHH9v0,1024
+meta_subject/migrations/0242_glucose_ogtt_diagnostic_device_and_more.py,sha256=cL7IfDqNkXdgPz7DIegsTKQtWowHX4U82Y4s1cpS3vE,3176
 meta_subject/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_subject/model_mixins/__init__.py,sha256=2Dae7t4r2f3YubLevk_HH_GVTDrZREOpCDDMYthLV5U,522
 meta_subject/model_mixins/arv_history_model_mixin.py,sha256=Ync4oLFng1OQW3pVxNxbEhKplWVNpUY5BiXy47lv6pk,1573
@@ -1115,8 +1118,8 @@ meta_subject/models/egfr_drop_notification.py,sha256=LSA0s4klzQ69CwPDI_q89eQ49Xb
 meta_subject/models/eq5d3l.py,sha256=itRrbfzL7Jsg9u7ml0SXwsw4nMoMcNyG0-YCD2VeXB0,291
 meta_subject/models/followup_examination.py,sha256=ZNapm_-fofIQiWZtWbtVnmSY4NJ3OdktmY_16rVxvrs,8072
 meta_subject/models/followup_vitals.py,sha256=pBZt4xrw7eVUfHBRtotUh9orJdNjOGxSuNa6JeWQRqA,903
-meta_subject/models/glucose.py,sha256=X4ujhc71RHINwFaoN1JrpwiGNkGOnJFQwr_u-WXaA-4,2526
-meta_subject/models/glucose_fbg.py,sha256=T4jFKB3LeEZ0ujjMEH670-fHrWRSAmfpBgWM6PG17c4,2381
+meta_subject/models/glucose.py,sha256=gnjmJd8_E_pYq4rlYiXLvN_59mvz4Fd6JvRLJElXGhI,2925
+meta_subject/models/glucose_fbg.py,sha256=PPu9Nf7APN8LICkTFVs_8V_TR7asSdgylrOCxf33_jo,2448
 meta_subject/models/glucose_review.py,sha256=bCnSBe_C3LeBy1XrZpV9rv-hOk8onZ_Tl37t7dqm-sw,450
 meta_subject/models/health_economics/__init__.py,sha256=J557vTjzK1EvUAM4mx9zDVQ7Zr0W25stnWXz_zE2a-c,245
 meta_subject/models/health_economics/health_economics.py,sha256=lZE6sMmYQTPjz9QbXZ2rznlbgW61G0JYYIQ07IueJvw,9705
@@ -1158,11 +1161,11 @@ meta_visit_schedule/visit_schedules/phase_three/__init__.py,sha256=lnBC3j17W54TQ
 meta_visit_schedule/visit_schedules/phase_three/crfs.py,sha256=M1BTT-eB9B5xpElafhhcgd7N0uX8aisT1igMK0VTP2E,18690
 meta_visit_schedule/visit_schedules/phase_three/crfs_pregnancy.py,sha256=_I6IVLMC3-KlpI86eii790mlx-p2vxWxvNRKD927rXo,169
 meta_visit_schedule/visit_schedules/phase_three/requisitions.py,sha256=Noeki8zX2MCwQVmCCWfuOyh_aN4YC-cyhUmrAZP8d5g,4579
-meta_visit_schedule/visit_schedules/phase_three/schedule.py,sha256=LO9HqV6r_LUEY_7RSAKk6e9FDnUSXA7U1plmj4xG-TE,8289
+meta_visit_schedule/visit_schedules/phase_three/schedule.py,sha256=pn57uzGRmY8kWZ2LaTm5Upj4UJQ13oEzp8lA4LTvuM4,8363
 meta_visit_schedule/visit_schedules/phase_three/schedule_dm_referral.py,sha256=q12p5wXc2D7lSiJVBnoSQw8Q3vL6uDx1t3PuDJO-Z-U,1735
 meta_visit_schedule/visit_schedules/phase_three/schedule_pregnancy.py,sha256=bEpbpCX3vfZmnsqudr0z8PU5kiaX4ws1sO5Im98Mo28,1106
 meta_visit_schedule/visit_schedules/phase_three/visit_schedule.py,sha256=ak4qazeKlpIlvpqrK9hDDO0fwWuWyvb4Ec-JU31IJxc,654
-meta_edc-1.6.5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-meta_edc-1.6.5.dist-info/WHEEL,sha256=XV0cjMrO7zXhVAIyyc8aFf1VjZ33Fen4IiJk5zFlC3g,80
-meta_edc-1.6.5.dist-info/METADATA,sha256=5hB7Sx67nWaeOpC-tD1v8e1o1WbvyRfZnDEZ1HXwd44,5260
-meta_edc-1.6.5.dist-info/RECORD,,
+meta_edc-1.6.7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+meta_edc-1.6.7.dist-info/WHEEL,sha256=XV0cjMrO7zXhVAIyyc8aFf1VjZ33Fen4IiJk5zFlC3g,80
+meta_edc-1.6.7.dist-info/METADATA,sha256=EYvFxLQ2eppikad0tgdw5OWJckSh4kk-kARqtJoEw1Y,5260
+meta_edc-1.6.7.dist-info/RECORD,,

meta_lists/constants.py

@@ -0,0 +1,2 @@
+HEMACUE = "hemocue"
+ACCUCHEK = "accuchek"

meta_lists/list_data.py

@@ -5,6 +5,7 @@ from clinicedc_constants import (
     DIABETES,
     LTFU,
     NONE,
+    NOT_APPLICABLE,
     OTHER,
     PREGNANCY,
     TOXICITY,
@@ -13,6 +14,7 @@ from clinicedc_constants import (
 from edc_offstudy.constants import COMPLETED_FOLLOWUP, WITHDRAWAL
 from edc_transfer.constants import TRANSFERRED
 
+from meta_lists.constants import ACCUCHEK, HEMACUE
 from meta_prn.constants import (
     CLINICAL_WITHDRAWAL,
     COMPLETED_FOLLOWUP_48,
@@ -241,8 +243,9 @@ list_data = {
         (CLINIC, "META Study Clinic"),
     ],
     "meta_lists.diagnosticdevices": [
-        ("hemocue", "Hemocue"),
-        ("accuchek", "Accu-Chek"),
+        (HEMACUE, "Hemocue"),
+        (ACCUCHEK, "Accu-chek"),
         (OTHER, "Other not listed"),
+        (NOT_APPLICABLE, "Not applicable"),
     ],
 }

meta_subject/admin/glucose_admin.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from clinicedc_constants import NOT_APPLICABLE
 from django.contrib import admin
 from django.contrib.admin import SimpleListFilter
 from django.template.loader import render_to_string
@@ -7,6 +8,9 @@ from django_audit_fields.admin import audit_fieldset_tuple
 from edc_crf.fieldset import crf_status_fieldset
 from edc_model_admin.history import SimpleHistoryAdmin
 
+from meta_lists.constants import HEMACUE
+from meta_lists.models import DiagnosticDevices
+
 from ..admin_site import meta_subject_admin
 from ..forms import GlucoseForm
 from ..models import Glucose
@@ -36,9 +40,9 @@ class GlucoseAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
                     "fbg_performed",
                     "fbg_not_performed_reason",
                     "fbg_datetime",
+                    "fbg_diagnostic_device",
                     "fbg_value",
                     "fbg_units",
-                    "diagnostic_device",
                 )
             },
         ),
@@ -50,6 +54,7 @@ class GlucoseAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
                     "ogtt_not_performed_reason",
                     "ogtt_base_datetime",
                     "ogtt_datetime",
+                    "ogtt_diagnostic_device",
                     "ogtt_value",
                     "ogtt_units",
                 )
@@ -78,7 +83,8 @@ class GlucoseAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         "ogtt_performed": admin.VERTICAL,
         "ogtt_units": admin.VERTICAL,
         "endpoint_today": admin.VERTICAL,
-        "diagnostic_device": admin.VERTICAL,
+        "fbg_diagnostic_device": admin.VERTICAL,
+        "ogtt_diagnostic_device": admin.VERTICAL,
     }
 
     def get_list_display(self, request) -> tuple[str, ...]:
@@ -92,7 +98,8 @@ class GlucoseAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
     def get_list_filter(self, request) -> tuple[str | type[SimpleListFilter], ...]:
         list_filter = super().get_list_filter(request)
         list_filter = list(list_filter)
-        list_filter.insert(2, "diagnostic_device")
+        list_filter.insert(2, "fbg_diagnostic_device")
+        list_filter.insert(2, "ogtt_diagnostic_device")
         list_filter.insert(2, OgttListFilter)
         list_filter.insert(2, FbgListFilter)
         return tuple(list_filter)
@@ -104,3 +111,19 @@ class GlucoseAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
     @admin.display(description="OGTT", ordering="ogtt_value")
     def ogtt(self, obj):
         return obj.ogtt_value
+
+    def get_changeform_initial_data(self, request) -> dict:
+        initial_data = super().get_changeform_initial_data(request)
+        try:
+            obj = DiagnosticDevices.objects.get(name=HEMACUE)
+        except DiagnosticDevices.DoesNotExist:
+            pass
+        else:
+            initial_data["fbg_diagnostic_device"] = obj.id
+        try:
+            obj = DiagnosticDevices.objects.get(name=NOT_APPLICABLE)
+        except DiagnosticDevices.DoesNotExist:
+            pass
+        else:
+            initial_data["ogtt_diagnostic_device"] = obj.id
+        return initial_data

meta_subject/admin/glucose_fbg_admin.py

@@ -7,6 +7,9 @@ from django_audit_fields import audit_fieldset_tuple
 from edc_crf.fieldset import crf_status_fieldset
 from edc_model_admin.history import SimpleHistoryAdmin
 
+from meta_lists.constants import HEMACUE
+from meta_lists.models import DiagnosticDevices
+
 from ..admin_site import meta_subject_admin
 from ..forms import GlucoseFbgForm
 from ..models import GlucoseFbg
@@ -36,9 +39,9 @@ class GlucoseFbgAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
                     "fbg_performed",
                     "fbg_not_performed_reason",
                     "fbg_datetime",
+                    "fbg_diagnostic_device",
                     "fbg_value",
                     "fbg_units",
-                    "diagnostic_device",
                 )
             },
         ),
@@ -71,7 +74,7 @@ class GlucoseFbgAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         "fbg_units": admin.VERTICAL,
         "fbg_performed": admin.VERTICAL,
         "endpoint_today": admin.VERTICAL,
-        "diagnostic_device": admin.VERTICAL,
+        "fbg_diagnostic_device": admin.VERTICAL,
     }
 
     @admin.display(description="FBG", ordering="fbg_value")
@@ -81,6 +84,7 @@ class GlucoseFbgAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
     def get_list_display(self, request) -> tuple[str, ...]:
         list_display = super().get_list_display(request)
         list_display = list(list_display)
+        list_display.insert(3, "fbg_diagnostic_device")
         list_display.insert(3, "fbg")
         list_display = [f for f in list_display if f != "__str__"]
         return tuple(list_display)
@@ -90,3 +94,13 @@ class GlucoseFbgAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         list_filter = list(list_filter)
         list_filter.insert(2, GlucoseListFilter)
         return tuple(list_filter)
+
+    def get_changeform_initial_data(self, request) -> dict:
+        initial_data = super().get_changeform_initial_data(request)
+        try:
+            obj = DiagnosticDevices.objects.get(name=HEMACUE)
+        except DiagnosticDevices.DoesNotExist:
+            pass
+        else:
+            initial_data["fbg_diagnostic_device"] = obj.id
+        return initial_data

meta_subject/form_validators/glucose_fbg_form_validator.py

@@ -25,13 +25,21 @@ class GlucoseFbgFormValidator(
                 {"fbg_datetime": "Invalid. Must be on or after report date above"},
                 INVALID_ERROR,
             )
+        self.applicable_if(
+            YES, field="fbg_performed", field_applicable="fbg_diagnostic_device"
+        )
         self.required_if(YES, field="fbg_performed", field_required="fbg_value")
 
         self.applicable_if(YES, field="fbg_performed", field_applicable="fbg_units")
 
         # endpoint
-        self.applicable_if(YES, field="fbg_performed", field_applicable="endpoint_today")
-        self.validate_endpoint_fields()
+        self.applicable_if(
+            YES,
+            field="fbg_performed",
+            field_applicable="endpoint_today",
+            not_applicable_msg="This field is not applicable. Not performed",
+        )
+        self.validate_endpoint_fields(performed=self.cleaned_data.get("fbg_value") is not None)
 
         # repeat_fbg_date
         self.required_if(PENDING, field="endpoint_today", field_required="repeat_fbg_date")

meta_subject/form_validators/glucose_form_validator.py

@@ -1,4 +1,4 @@
-from clinicedc_constants import PENDING
+from clinicedc_constants import PENDING, YES
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_glucose.form_validators import FbgOgttFormValidatorMixin
 
@@ -13,7 +13,8 @@ class GlucoseFormValidator(
     CrfFormValidator,
 ):
     def clean(self):
-        self.validate_glucose_testing_matrix()
+        self.required_if(YES, field="fasting", field_required="fasting_duration_str")
+        self.validate_glucose_testing_matrix(include_fbg=True)
         has_results = (
             self.cleaned_data.get("fbg_value") is not None
             and self.cleaned_data.get("ogtt_value") is not None
@@ -21,6 +22,11 @@ class GlucoseFormValidator(
         )
         self.applicable_if_true(has_results, field_applicable="endpoint_today")
         if has_results:
-            self.validate_endpoint_fields()
+            self.validate_endpoint_fields(
+                performed=bool(
+                    self.cleaned_data.get("fbg_value") is not None
+                    or self.cleaned_data.get("ogtt_value") is not None
+                )
+            )
         self.required_if(PENDING, field="endpoint_today", field_required="repeat_fbg_date")
         self.validate_repeat_fbg_date()

meta_subject/form_validators/mixins.py

@@ -7,33 +7,34 @@ from meta_reports.models import GlucoseSummary
 
 
 class EndpointValidatorMixin:
-    def validate_endpoint_fields(self):
-        is_endpoint = self.is_endpoint()
-        if is_endpoint == YES and self.cleaned_data.get("endpoint_today") != YES:
-            self.raise_validation_error(
-                {
-                    "endpoint_today": (
-                        "Participant has reached a study endpoint today. Expected YES"
-                    )
-                },
-                INVALID_ERROR,
-            )
-        elif is_endpoint == PENDING and self.cleaned_data.get("endpoint_today") != PENDING:
-            self.raise_validation_error(
-                {
-                    "endpoint_today": (
-                        "Participant has not reached a study endpoint today. "
-                        "Expected to repeat FBG"
-                    )
-                },
-                INVALID_ERROR,
-            )
+    def validate_endpoint_fields(self, performed: bool):
+        if performed:
+            is_endpoint = self.is_endpoint()
+            if is_endpoint == YES and self.cleaned_data.get("endpoint_today") != YES:
+                self.raise_validation_error(
+                    {
+                        "endpoint_today": (
+                            "Participant has reached a study endpoint today. Expected YES"
+                        )
+                    },
+                    INVALID_ERROR,
+                )
+            elif is_endpoint == PENDING and self.cleaned_data.get("endpoint_today") != PENDING:
+                self.raise_validation_error(
+                    {
+                        "endpoint_today": (
+                            "Participant has not reached a study endpoint today. "
+                            "Expected to repeat FBG"
+                        )
+                    },
+                    INVALID_ERROR,
+                )
 
-        elif is_endpoint == NO and self.cleaned_data.get("endpoint_today") != NO:
-            self.raise_validation_error(
-                {"endpoint_today": "Participant has not reached a study endpoint today"},
-                INVALID_ERROR,
-            )
+            elif is_endpoint == NO and self.cleaned_data.get("endpoint_today") != NO:
+                self.raise_validation_error(
+                    {"endpoint_today": "Participant has not reached a study endpoint today"},
+                    INVALID_ERROR,
+                )
 
     def is_endpoint(self):
         value = NO

meta_subject/migrations/0241_remove_glucose_diagnostic_device_and_more.py

@@ -0,0 +1,35 @@
+# Generated by Django 5.2.10 on 2026-01-23 13:40
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_lists", "0021_diagnosticdevices"),
+        ("meta_subject", "0240_glucose_diagnostic_device_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="glucose",
+            old_name="diagnostic_device",
+            new_name="fbg_diagnostic_device",
+        ),
+        migrations.RenameField(
+            model_name="glucosefbg",
+            old_name="diagnostic_device",
+            new_name="fbg_diagnostic_device",
+        ),
+        migrations.RenameField(
+            model_name="historicalglucose",
+            old_name="diagnostic_device",
+            new_name="fbg_diagnostic_device",
+        ),
+        migrations.RenameField(
+            model_name="historicalglucosefbg",
+            old_name="diagnostic_device",
+            new_name="fbg_diagnostic_device",
+        ),
+    ]

meta_subject/migrations/0242_glucose_ogtt_diagnostic_device_and_more.py

@@ -0,0 +1,86 @@
+# Generated by Django 5.2.10 on 2026-01-23 14:00
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_lists", "0021_diagnosticdevices"),
+        ("meta_subject", "0241_remove_glucose_diagnostic_device_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="glucose",
+            name="ogtt_diagnostic_device",
+            field=models.ForeignKey(
+                limit_choices_to={"name__in": ["accuchek", "hemocue", "OTHER", "N/A"]},
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="ogtt_diagnostic_device",
+                to="meta_lists.diagnosticdevices",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalglucose",
+            name="ogtt_diagnostic_device",
+            field=models.ForeignKey(
+                blank=True,
+                db_constraint=False,
+                limit_choices_to={"name__in": ["accuchek", "hemocue", "OTHER", "N/A"]},
+                null=True,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                related_name="+",
+                to="meta_lists.diagnosticdevices",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="glucose",
+            name="fbg_diagnostic_device",
+            field=models.ForeignKey(
+                limit_choices_to={"name__in": ["accuchek", "hemocue", "OTHER", "N/A"]},
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="fbg_diagnostic_device",
+                to="meta_lists.diagnosticdevices",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="glucosefbg",
+            name="fbg_diagnostic_device",
+            field=models.ForeignKey(
+                limit_choices_to={"name__in": ["accuchek", "hemocue", "OTHER", "N/A"]},
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="meta_lists.diagnosticdevices",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalglucose",
+            name="fbg_diagnostic_device",
+            field=models.ForeignKey(
+                blank=True,
+                db_constraint=False,
+                limit_choices_to={"name__in": ["accuchek", "hemocue", "OTHER", "N/A"]},
+                null=True,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                related_name="+",
+                to="meta_lists.diagnosticdevices",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalglucosefbg",
+            name="fbg_diagnostic_device",
+            field=models.ForeignKey(
+                blank=True,
+                db_constraint=False,
+                limit_choices_to={"name__in": ["accuchek", "hemocue", "OTHER", "N/A"]},
+                null=True,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                related_name="+",
+                to="meta_lists.diagnosticdevices",
+            ),
+        ),
+    ]

meta_subject/models/glucose.py

@@ -9,6 +9,7 @@ from edc_glucose.model_mixin_factories import (
 from edc_model.models import BaseUuidModel
 from edc_utils import formatted_date
 
+from meta_lists.constants import ACCUCHEK, HEMACUE
 from meta_lists.models import DiagnosticDevices
 
 from ..choices import ENDPOINT_CHOICES
@@ -48,12 +49,13 @@ class Glucose(
         verbose_name="If NO, provide reason", max_length=150, default="", blank=True
     )
 
-    diagnostic_device = models.ForeignKey(
+    fbg_diagnostic_device = models.ForeignKey(
         DiagnosticDevices,
         on_delete=models.PROTECT,
         null=True,
         blank=False,
-        limit_choices_to={"name__in": ["accuchek", "hemocue", OTHER]},
+        limit_choices_to={"name__in": [ACCUCHEK, HEMACUE, OTHER, NOT_APPLICABLE]},
+        related_name="fbg_diagnostic_device",
     )
 
     ogtt_performed = models.CharField(
@@ -66,6 +68,15 @@ class Glucose(
         verbose_name="If NO, provide reason", max_length=150, default="", blank=True
     )
 
+    ogtt_diagnostic_device = models.ForeignKey(
+        DiagnosticDevices,
+        on_delete=models.PROTECT,
+        null=True,
+        blank=False,
+        limit_choices_to={"name__in": [ACCUCHEK, HEMACUE, OTHER, NOT_APPLICABLE]},
+        related_name="ogtt_diagnostic_device",
+    )
+
     endpoint_today = models.CharField(
         verbose_name="Has the participant reached a study endpoint today?",
         max_length=25,

meta_subject/models/glucose_fbg.py

@@ -8,6 +8,7 @@ from edc_glucose.model_mixin_factories import (
 from edc_model.models import BaseUuidModel
 from edc_utils import formatted_date
 
+from meta_lists.constants import ACCUCHEK, HEMACUE
 from meta_lists.models import DiagnosticDevices
 
 from ..choices import ENDPOINT_CHOICES
@@ -71,12 +72,12 @@ class GlucoseFbg(
         help_text="Date should be within 1 week of report date",
     )
 
-    diagnostic_device = models.ForeignKey(
+    fbg_diagnostic_device = models.ForeignKey(
         DiagnosticDevices,
         on_delete=models.PROTECT,
         null=True,
         blank=False,
-        limit_choices_to={"name__in": ["accuchek", "hemocue", OTHER]},
+        limit_choices_to={"name__in": [ACCUCHEK, HEMACUE, OTHER, NOT_APPLICABLE]},
     )
 
     class Meta(CrfModelMixin.Meta, BaseUuidModel.Meta):

meta_visit_schedule/visit_schedules/phase_three/schedule.py

@@ -291,6 +291,7 @@ visit36 = Visit(
     requisitions=requisitions_36m,
     crfs=crfs_36m,
     facility_name=FIVE_DAY_CLINIC,
+    allow_unscheduled_extended=True,
 )
 
 visit39 = Visit(
@@ -340,6 +341,7 @@ visit48 = Visit(
     requisitions=requisitions_48m,
     crfs=crfs_48m,
     facility_name=FIVE_DAY_CLINIC,
+    allow_unscheduled_extended=True,
 )
 
 visits = [