meta-edc 0.3.39__py3-none-any.whl → 1.4.0__py3-none-any.whl

meta_subject/admin/mnsi_admin.py

@@ -28,11 +28,13 @@ def get_fieldsets():
         },
     )
 
-    fieldsets = (fieldset,) + get_mnsi_fieldsets()
-    fieldsets += (crf_status_fieldset_tuple,)
-    fieldsets += (calculated_values_fieldset,)
-    fieldsets += (audit_fieldset_tuple,)
-    return fieldsets
+    return (
+        fieldset,
+        *get_mnsi_fieldsets(),
+        crf_status_fieldset_tuple,
+        calculated_values_fieldset,
+        audit_fieldset_tuple,
+    )
 
 
 edc_mnsi_admin.unregister(DefaultMnsi)

meta_subject/admin/next_appointment_admin.py

@@ -0,0 +1,19 @@
+from __future__ import annotations
+
+from django.contrib import admin
+from edc_appointment.modeladmin_mixins import NextAppointmentCrfModelAdminMixin
+from edc_model_admin.history import SimpleHistoryAdmin
+
+from ..admin_site import meta_subject_admin
+from ..forms import NextAppointmentForm
+from ..models import NextAppointment
+from .modeladmin import CrfModelAdminMixin
+
+__all__ = ["NextAppointmentAdmin"]
+
+
+@admin.register(NextAppointment, site=meta_subject_admin)
+class NextAppointmentAdmin(
+    CrfModelAdminMixin, NextAppointmentCrfModelAdminMixin, SimpleHistoryAdmin
+):
+    form = NextAppointmentForm

meta_subject/admin/other_arv_regimens_admin.py

@@ -15,7 +15,7 @@ class OtherArvRegimensInlineAdmin(TabularInlineMixin, admin.TabularInline):
     form = OtherArvRegimensDetailForm
     extra = 1
     view_on_site = False
-    autocomplete_fields = ["arv_regimen"]
+    autocomplete_fields = ("arv_regimen",)
 
     fieldsets = (
         (
@@ -40,7 +40,7 @@ class OtherArvRegimensInlineAdmin(TabularInlineMixin, admin.TabularInline):
 class OtherArvRegimensAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
     form = OtherArvRegimensForm
 
-    inlines = [OtherArvRegimensInlineAdmin]
+    inlines = (OtherArvRegimensInlineAdmin,)
 
     fieldsets = (
         (None, {"fields": ("subject_visit", "report_datetime", "has_other_regimens")}),
@@ -48,6 +48,6 @@ class OtherArvRegimensAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "has_other_regimens": admin.VERTICAL,
     }

meta_subject/admin/patient_history_admin.py

@@ -14,8 +14,8 @@ from .modeladmin import CrfModelAdminMixin
 class PatientHistoryAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
     form = PatientHistoryForm
 
-    autocomplete_fields = ["current_arv_regimen", "previous_arv_regimen"]
-    fieldsets = [
+    autocomplete_fields = ("current_arv_regimen", "previous_arv_regimen")
+    fieldsets = (
         (None, {"fields": ("subject_visit", "report_datetime")}),
         ("Part 1: Symptoms", {"fields": ("symptoms", "other_symptoms")}),
         get_hiv_fieldset(part="2"),
@@ -23,9 +23,9 @@ class PatientHistoryAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         get_other_history_fieldset(part="4"),
         crf_status_fieldset,
         audit_fieldset_tuple,
-    ]
+    )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "current_arv_regimen": admin.VERTICAL,
         "current_smoker": admin.VERTICAL,
         "dm_in_family": admin.VERTICAL,

meta_subject/admin/physical_exam_admin.py

@@ -52,7 +52,7 @@ class PhysicalExamAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "abdominal_tenderness": admin.VERTICAL,
         "enlarged_liver": admin.VERTICAL,
         "irregular_heartbeat": admin.VERTICAL,

meta_subject/admin/pregnancy_update_admin.py

@@ -28,6 +28,6 @@ class PregnancyUpdateAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "contact": admin.VERTICAL,
     }

meta_subject/admin/study_medication_admin.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from decimal import Decimal
-from typing import Type
 
 from django.contrib import admin, messages
 from django.contrib.admin import SimpleListFilter
@@ -30,15 +29,14 @@ from .modeladmin import CrfModelAdminMixin
 
 @admin.register(StudyMedication, site=meta_subject_admin)
 class StudyMedicationAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
-
-    actions = ["create_or_update_rx_refills"]
+    actions = ("create_or_update_rx_refills",)
 
     form = StudyMedicationForm
 
-    autocomplete_fields = [
+    autocomplete_fields = (
         "dosage_guideline",
         "formulation",
-    ]
+    )
 
     fieldsets = (
         (
@@ -78,20 +76,19 @@ class StudyMedicationAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "formulation": admin.VERTICAL,
         "refill": admin.VERTICAL,
         "refill_to_next_visit": admin.VERTICAL,
     }
 
-    def get_list_filter(self, request) -> tuple[str | Type[SimpleListFilter], ...]:
+    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(4, "dosage_guideline")
         list_filter.insert(4, RefillEndDateListFilter)
         list_filter.insert(4, RefillStartDateListFilter)
-        list_filter = tuple(list_filter)
-        return list_filter
+        return tuple(list_filter)
 
     def get_list_display(self, request) -> tuple[str, ...]:
         list_display = super().get_list_display(request)
@@ -100,8 +97,7 @@ class StudyMedicationAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         list_display.insert(4, "refill_end_date")
         list_display.insert(4, "refill_start_date")
         list_display.insert(4, "dosage_guideline")
-        list_display = tuple(list_display)
-        return list_display
+        return tuple(list_display)
 
     @admin.display(description="days", ordering="number_of_days")
     def refill_days(self, obj):
@@ -156,10 +152,7 @@ class StudyMedicationAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
             messages.add_message(
                 request,
                 ERROR,
-                (
-                    f"ObjectDoesNotExist: {obj.subject_identifier}, "
-                    f"{obj.related_visit}, {str(e)}"
-                ),
+                (f"ObjectDoesNotExist: {obj.subject_identifier}, {obj.related_visit}, {e!s}"),
             )
             errors += 1
         except StudyMedicationError as e:

meta_subject/admin/subject_requisition_admin.py

@@ -1,8 +1,8 @@
 from urllib.parse import parse_qs, urlsplit
 
+from clinicedc_constants import YES
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
-from edc_constants.constants import YES
 from edc_lab.admin import (
     RequisitionAdminMixin,
     requisition_fieldset,
@@ -31,7 +31,7 @@ class SubjectRequisitionAdmin(RequisitionAdminMixin, CrfModelAdminMixin, SimpleH
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "is_drawn": admin.VERTICAL,
         "reason_not_drawn": admin.VERTICAL,
         "item_type": admin.VERTICAL,

meta_subject/admin/subject_visit_admin.py

@@ -39,7 +39,7 @@ class SubjectVisitAdmin(
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "reason": admin.VERTICAL,
         "reason_unscheduled": admin.VERTICAL,
         "info_source": admin.VERTICAL,

meta_subject/admin/subject_visit_missed_admin.py

@@ -38,7 +38,7 @@ class SubjectVisitMissedAdmin(
 
     filter_horizontal = ("missed_reasons",)
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "survival_status": admin.VERTICAL,
         "contact_attempted": admin.VERTICAL,
         "contact_made": admin.VERTICAL,

meta_subject/admin/urine_dipstick_test_admin.py

@@ -32,7 +32,7 @@ class UrineDipstickTestAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "performed": admin.VERTICAL,
         "ketones": admin.VERTICAL,
         "protein": admin.VERTICAL,

meta_subject/admin/urine_pregnancy_admin.py

@@ -31,7 +31,7 @@ class UrinePregnancyAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "performed": admin.VERTICAL,
         "bhcg_value": admin.VERTICAL,
     }

meta_subject/baker_recipes.py

@@ -1,5 +1,5 @@
-from edc_constants.constants import NO, NOT_APPLICABLE, PATIENT, POS, YES
-from edc_utils import get_utcnow
+from clinicedc_constants import NO, NOT_APPLICABLE, NULL_STRING, PATIENT, POS, YES
+from django.utils import timezone
 from edc_visit_tracking.constants import SCHEDULED
 from faker import Faker
 from model_bakery.recipe import Recipe
@@ -26,22 +26,22 @@ subjectrequisition = Recipe(SubjectRequisition)
 
 medicationadherence = Recipe(
     MedicationAdherence,
-    report_datetime=get_utcnow(),
+    report_datetime=timezone.now(),
     visual_score_slider=90,
     visual_score_confirmed=90,
     last_missed_pill=NO,
     pill_count_performed=YES,
     pill_count=3,
     missed_pill_reason=[],
-    other_missed_pill_reason=None,
+    other_missed_pill_reason=NULL_STRING,
 )
 
 urinepregnancy = Recipe(
     UrinePregnancy,
-    action_identifier=None,
-    report_datetime=get_utcnow(),
+    action_identifier=NULL_STRING,
+    report_datetime=timezone.now(),
     performed=YES,
-    not_performed_reason=None,
+    not_performed_reason=NULL_STRING,
     bhcg_value=POS,
     notified=False,
     notified_datetime=None,
@@ -79,16 +79,16 @@ followupexamination = Recipe(
 delivery = Recipe(
     Delivery,
     # site=None,
-    action_identifier=None,
-    report_datetime=get_utcnow(),
+    action_identifier=NULL_STRING,
+    report_datetime=timezone.now(),
     info_available=YES,
     info_source=PATIENT,
     informant_relation=NOT_APPLICABLE,
-    informant_relation_other=None,
-    delivery_datetime=get_utcnow(),
+    informant_relation_other=NULL_STRING,
+    delivery_datetime=timezone.now(),
     delivery_time_estimated=NO,
     delivery_location=HOSPITAL_CLINIC,
-    delivery_location_other=None,
+    delivery_location_other=NULL_STRING,
     delivery_location_name="Big hospital",
     delivery_ga=40,
     gm_treated=NO,
@@ -98,8 +98,8 @@ delivery = Recipe(
 birthoutcomes = Recipe(
     BirthOutcomes,
     delivery=None,
-    action_identifier=None,
-    report_datetime=get_utcnow(),
+    action_identifier=NULL_STRING,
+    report_datetime=timezone.now(),
     birth_order=1,
     birth_outcome=LIVE_AT_TERM,
     birth_weight=320,
@@ -107,5 +107,5 @@ birthoutcomes = Recipe(
 
 healtheconomicsupdate = Recipe(
     HealthEconomicsUpdate,
-    report_datetime=get_utcnow(),
+    report_datetime=timezone.now(),
 )

meta_subject/choices.py

@@ -1,8 +1,9 @@
-from django.utils.translation import gettext_lazy as _
-from edc_constants.constants import (
+from clinicedc_constants import (
     ABSENT,
     CLOSED,
     DEAD,
+    GRADE3,
+    GRADE4,
     NEW,
     NO,
     NO_EXAM,
@@ -15,7 +16,7 @@ from edc_constants.constants import (
     PRESENT_WITH_REINFORCEMENT,
     YES,
 )
-from edc_reportable.constants import GRADE3, GRADE4
+from django.utils.translation import gettext_lazy as _
 from edc_visit_tracking.constants import MISSED_VISIT, SCHEDULED, UNSCHEDULED
 
 from meta_ae.choices import INFORMANT_RELATIONSHIP

meta_subject/form_validators/__init__.py

@@ -4,5 +4,20 @@ from .dm_endpoint_form_validator import DmEndpointFormValidator
 from .dm_followup_form_validator import DmFollowupFormValidator
 from .egfr_drop_notification_form_validator import EgfrDropNotificationFormValidator
 from .followup_examination_form_validator import FollowupExaminationFormValidator
+from .glucose_fbg_form_validator import GlucoseFbgFormValidator
 from .glucose_form_validator import GlucoseFormValidator
 from .health_economics_form_validator import HealthEconomicsFormValidator
+from .hiv_exit_review_form_validator import HivExitReviewFormValidator
+
+__all__ = [
+    "BirthOutcomesFormValidator",
+    "DeliveryFormValidator",
+    "DmEndpointFormValidator",
+    "DmFollowupFormValidator",
+    "EgfrDropNotificationFormValidator",
+    "FollowupExaminationFormValidator",
+    "GlucoseFbgFormValidator",
+    "GlucoseFormValidator",
+    "HealthEconomicsFormValidator",
+    "HivExitReviewFormValidator",
+]

meta_subject/form_validators/delivery_form_validator.py

@@ -1,6 +1,6 @@
+from clinicedc_constants import NO, OTHER
 from django import forms
 from django.core.exceptions import ObjectDoesNotExist
-from edc_constants.constants import NO, OTHER
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_form_validators import INVALID_ERROR
 from edc_utils import formatted_date
@@ -15,10 +15,10 @@ class DeliveryFormValidator(CrfFormValidator):
             pregnancy_notification = PregnancyNotification.objects.get(
                 subject_identifier=self.cleaned_data.get("subject_visit").subject_identifier
             )
-        except ObjectDoesNotExist:
+        except ObjectDoesNotExist as e:
             raise forms.ValidationError(
                 f"{PregnancyNotification._meta.verbose_name} not found."
-            )
+            ) from e
 
         self.required_if(
             NO, field="info_available", field_required="info_not_available_reason"

meta_subject/form_validators/dm_endpoint_form_validator.py

@@ -2,6 +2,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.html import format_html
+from django.utils.safestring import mark_safe
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_form_validators import INVALID_ERROR
 
@@ -28,7 +29,8 @@ class DmEndpointFormValidator(CrfFormValidator):
             self.raise_validation_error(
                 {
                     "__all__": format_html(
-                        f"Subject has not reached the protocol endpoint. See {link}"
+                        "Subject has not reached the protocol endpoint. See {link}",
+                        link=mark_safe(link),  # noqa: S308
                     )
                 },
                 INVALID_ERROR,

meta_subject/form_validators/dm_followup_form_validator.py

@@ -1,6 +1,6 @@
+from clinicedc_constants import NO, OTHER, YES
 from django import forms
 from django.core.exceptions import ObjectDoesNotExist
-from edc_constants.constants import NO, OTHER, YES
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_form_validators import INVALID_ERROR
 from edc_utils import formatted_date
@@ -11,7 +11,6 @@ from meta_prn.models import DmReferral
 
 class DmFollowupFormValidator(CrfFormValidator):
     def clean(self):
-
         # referral_date must be before report datetime
         if (
             self.report_datetime
@@ -228,8 +227,10 @@ class DmFollowupFormValidator(CrfFormValidator):
             and self.cleaned_data.get("on_dm_medications") == YES
         ):
             confirmed = self.cleaned_data.get("visual_score_confirmed")
-            if confirmed is not None:
-                if int(self.cleaned_data.get("visual_score_slider", "0")) != confirmed:
-                    raise forms.ValidationError(
-                        {"visual_score_confirmed": "Does not match visual score above."}
-                    )
+            if (
+                confirmed is not None
+                and int(self.cleaned_data.get("visual_score_slider", "0")) != confirmed
+            ):
+                raise forms.ValidationError(
+                    {"visual_score_confirmed": "Does not match visual score above."}
+                )

meta_subject/form_validators/egfr_drop_notification_form_validator.py

@@ -1,4 +1,4 @@
-from edc_constants.constants import CLOSED, NEW, OPEN
+from clinicedc_constants import CLOSED, NEW, OPEN
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_form_validators import INVALID_ERROR
 

meta_subject/form_validators/followup_examination_form_validator.py

@@ -1,5 +1,5 @@
+from clinicedc_constants import NONE, OTHER, YES
 from django import forms
-from edc_constants.constants import NONE, OTHER, YES
 from edc_crf.crf_form_validator import CrfFormValidator
 
 

meta_subject/form_validators/glucose_fbg_form_validator.py

@@ -0,0 +1,76 @@
+from decimal import Decimal
+
+from clinicedc_constants import MILLIMOLES_PER_LITER, NO, PENDING, YES
+from clinicedc_utils import convert_units
+from edc_crf.crf_form_validator import CrfFormValidator
+from edc_form_validators import INVALID_ERROR
+from edc_glucose.utils import validate_glucose_as_millimoles_per_liter
+
+from meta_reports.models import GlucoseSummary
+
+from .mixins import EndpointValidatorMixin, RepeatFbgDateValidatorMixin
+
+
+class GlucoseFbgFormValidator(
+    EndpointValidatorMixin, RepeatFbgDateValidatorMixin, CrfFormValidator
+):
+    def clean(self):
+        self.required_if(YES, field="fasting", field_required="fasting_duration_str")
+        self.required_if(NO, field="fbg_performed", field_required="fbg_not_performed_reason")
+        self.required_if(YES, field="fbg_performed", field_required="fbg_datetime")
+        if self.cleaned_data.get("fbg_datetime") and self.cleaned_data.get(
+            "fbg_datetime"
+        ) < self.cleaned_data.get("report_datetime"):
+            self.raise_validation_error(
+                {"fbg_datetime": "Invalid. Must be on or after report date above"},
+                INVALID_ERROR,
+            )
+        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()
+
+        # repeat_fbg_date
+        self.required_if(PENDING, field="endpoint_today", field_required="repeat_fbg_date")
+        self.validate_repeat_fbg_date()
+
+    @property
+    def converted_fbg_value(self):
+        if self.cleaned_data.get("fbg_value") is not None:
+            return validate_glucose_as_millimoles_per_liter("fbg", self.cleaned_data)
+        return None
+
+    def is_endpoint(self):
+        value = NO
+        if self.converted_fbg_value and self.converted_fbg_value >= Decimal("7.0"):
+            # is there a previous FBG>=7.0 in sequence or do you need to repeat?
+            previous_obj = (
+                GlucoseSummary.objects.filter(
+                    subject_identifier=self.subject_identifier,
+                    fbg_datetime__lt=self.cleaned_data.get("fbg_datetime"),
+                )
+                .order_by("fbg_datetime")
+                .last()
+            )
+            previous_fbg_value = convert_units(
+                label="fbg",
+                value=float(previous_obj.fbg_value),
+                units_from=previous_obj.fbg_units,
+                units_to=MILLIMOLES_PER_LITER,
+            )
+            previous_ogtt_value = convert_units(
+                label="ogtt",
+                value=float(previous_obj.ogtt_value),
+                units_from=previous_obj.ogtt_units,
+                units_to=MILLIMOLES_PER_LITER,
+            )
+
+            if previous_obj and previous_fbg_value >= 7.0 and previous_ogtt_value <= 11.1:
+                value = YES
+            else:
+                # you need to schedule a repeat
+                value = PENDING
+        return value

meta_subject/form_validators/glucose_form_validator.py

@@ -1,14 +1,17 @@
-from decimal import Decimal
-
-from edc_constants.constants import NO, PENDING, YES
+from clinicedc_constants import PENDING
 from edc_crf.crf_form_validator import CrfFormValidator
-from edc_form_validators import INVALID_ERROR
 from edc_glucose.form_validators import FbgOgttFormValidatorMixin
 
 from ..constants import AMENDMENT_DATE
+from .mixins import EndpointValidatorMixin, RepeatFbgDateValidatorMixin
 
 
-class GlucoseFormValidator(FbgOgttFormValidatorMixin, CrfFormValidator):
+class GlucoseFormValidator(
+    EndpointValidatorMixin,
+    RepeatFbgDateValidatorMixin,
+    FbgOgttFormValidatorMixin,
+    CrfFormValidator,
+):
     def clean(self):
         self.validate_glucose_testing_matrix()
         has_results = (
@@ -18,66 +21,6 @@ class GlucoseFormValidator(FbgOgttFormValidatorMixin, CrfFormValidator):
         )
         self.applicable_if_true(has_results, field_applicable="endpoint_today")
         if has_results:
-            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,
-                )
-
+            self.validate_endpoint_fields()
         self.required_if(PENDING, field="endpoint_today", field_required="repeat_fbg_date")
-        if self.cleaned_data.get("repeat_fbg_date"):
-            delta = (
-                self.cleaned_data.get("repeat_fbg_date")
-                - self.cleaned_data.get("fbg_datetime").date()
-            )
-            if delta.days < 7:
-                self.raise_validation_error(
-                    {"repeat_fbg_date": "Must be at least 7 days from the FBG date above"},
-                    INVALID_ERROR,
-                )
-            if delta.days > 10:
-                self.raise_validation_error(
-                    {
-                        "repeat_fbg_date": (
-                            "Must be no more than 10 days from the FBG date above"
-                        )
-                    },
-                    INVALID_ERROR,
-                )
-
-    def is_endpoint(self):
-        value = NO
-        if self.cleaned_data.get("fbg_value") >= Decimal("7.0") and self.cleaned_data.get(
-            "ogtt_value"
-        ) >= Decimal("11.1"):
-            value = YES
-        elif self.cleaned_data.get("fbg_value") < Decimal("7.0") and self.cleaned_data.get(
-            "ogtt_value"
-        ) >= Decimal("11.1"):
-            value = YES
-        elif self.cleaned_data.get("fbg_value") >= Decimal("7.0") and self.cleaned_data.get(
-            "ogtt_value"
-        ) < Decimal("11.1"):
-            value = PENDING
-        return value
+        self.validate_repeat_fbg_date()

meta_subject/form_validators/hiv_exit_review_form_validator.py

@@ -0,0 +1,18 @@
+from clinicedc_constants import NO, OTHER
+from edc_crf.crf_form_validator import CrfFormValidator
+
+
+class HivExitReviewFormValidator(CrfFormValidator):
+    def clean(self):
+        self.required_if(NO, field="available", field_required="not_available_reason")
+        self.required_if_not_none(
+            "viral_load", "viral_load_date", field_required_evaluate_as_int=True
+        )
+
+        self.required_if_not_none("cd4", "cd4_date", field_required_evaluate_as_int=True)
+
+        self.required_if(
+            OTHER,
+            field="current_arv_regimen",
+            field_required="other_current_arv_regimen",
+        )