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

meta_reports/models/endpoints.py

@@ -9,7 +9,7 @@ class Endpoints(QaReportModelMixin, models.Model):
 
     visit_code = models.IntegerField(null=True)
 
-    fasting = models.CharField(max_length=10, null=True)
+    fasting = models.CharField(max_length=10, default="")
 
     fbg_date = models.DateField(null=True)
 
@@ -17,18 +17,18 @@ class Endpoints(QaReportModelMixin, models.Model):
 
     ogtt_value = models.FloatField(null=True)
 
-    endpoint_label = models.CharField(max_length=250, null=True)
+    endpoint_label = models.CharField(max_length=250, default="")
 
     baseline_date = models.DateField(null=True)
 
     offstudy_date = models.DateField(null=True)
 
-    offstudy_reason = models.CharField(max_length=250, null=True)
+    offstudy_reason = models.CharField(max_length=250, default="")
 
     def __str__(self):
         return f"{self.subject_identifier} {self.visit_code} {self.endpoint_label}"
 
-    class Meta(QaReportModelMixin.Meta):
+    class Meta(QaReportModelMixin.Meta):  # noqa: DJ012
         verbose_name = "Endpoints (DM)"
         verbose_name_plural = "Endpoints (DM)"
         default_permissions = qa_reports_permissions

meta_reports/models/last_imp_refill.py

@@ -4,7 +4,6 @@ from edc_qareports.model_mixins import QaReportModelMixin, qa_reports_permission
 
 
 class LastImpRefill(QaReportModelMixin, models.Model):
-
     reference_date = models.DateField(null=True)
 
     imp_visit_code = models.FloatField(null=True)
@@ -15,7 +14,7 @@ class LastImpRefill(QaReportModelMixin, models.Model):
 
     next_appt_date = models.DateField(null=True)
 
-    visit_code = models.CharField(max_length=15, null=True)
+    visit_code = models.CharField(max_length=15, default="")
 
     visit_code_sequence = models.IntegerField(null=True)
 
@@ -28,7 +27,7 @@ class LastImpRefill(QaReportModelMixin, models.Model):
     def recreate_db_view(self, **kwargs):
         raise NotImplementedError()
 
-    class Meta(QaReportModelMixin.Meta):
+    class Meta(QaReportModelMixin.Meta):  # noqa: DJ012
         verbose_name = "Last IMP Refill"
         verbose_name_plural = "Last IMP Refills"
         default_permissions = qa_reports_permissions

meta_reports/pdf_report.py

@@ -20,7 +20,7 @@ def get_weight_for_timepoint(subject_identifier=None, reference_dt=None):
 
 
 class MetaCrfPdfReport(CrfPdfReport):
-    logo_data = {
+    logo_data = {  # noqa: RUF012
         "app_label": "meta_edc",
         "filename": "meta_logo.png",
         "first_page": (4.0 * cm, 0.83 * cm),
@@ -34,7 +34,7 @@ class MetaCrfPdfReport(CrfPdfReport):
             subject_identifier=self.subject_identifier
         ).get_drug_assignment_display()
 
-    def draw_demographics(self, story, **kwargs):
+    def draw_demographics(self, story, **kwargs):  # noqa: ARG002
         model_obj = getattr(self, self.model_attr)
         weight = get_weight_for_timepoint(
             subject_identifier=self.subject_identifier,

meta_reports/tasks.py

@@ -3,7 +3,7 @@ from celery import shared_task
 
 @shared_task
 def update_endpoints_table(subject_identifiers: list[str] | None = None):
-    from meta_analytics.dataframes import GlucoseEndpointsByDate
+    from meta_analytics.dataframes import GlucoseEndpointsByDate  # noqa: PLC0415
 
     if len(subject_identifiers) > 5:
         cls = GlucoseEndpointsByDate()

meta_screening/admin/__init__.py

@@ -3,3 +3,11 @@ from .screening_part_three_admin import ScreeningPartThreeAdmin
 from .screening_part_two_admin import ScreeningPartTwoAdmin
 from .subject_refusal_admin import SubjectRefusalAdmin
 from .subject_screening_admin import SubjectScreeningAdmin
+
+__all__ = [
+    "ScreeningPartOneAdmin",
+    "ScreeningPartThreeAdmin",
+    "ScreeningPartTwoAdmin",
+    "SubjectRefusalAdmin",
+    "SubjectScreeningAdmin",
+]

meta_screening/admin/fieldsets.py

@@ -1,4 +1,3 @@
-from typing import Tuple
 
 from django.utils.safestring import mark_safe
 
@@ -20,7 +19,7 @@ from ..forms.field_lists import (
 )
 
 
-def get_part_one_fieldset(collapse=None) -> Tuple[str, dict]:
+def get_part_one_fieldset(collapse=None) -> tuple[str, dict]:
     dct = {
         "description": mark_safe(  # nosec B308
             "To be completed by the <u>study clinician</u> or the "
@@ -33,7 +32,7 @@ def get_part_one_fieldset(collapse=None) -> Tuple[str, dict]:
     return "Part 1", dct
 
 
-def get_part_two_fieldset(collapse=None) -> Tuple[str, dict]:
+def get_part_two_fieldset(collapse=None) -> tuple[str, dict]:
     dct = {
         "description": mark_safe(  # nosec B308
             "To be completed by the <u>study clinician</u> or the "
@@ -48,7 +47,7 @@ def get_part_two_fieldset(collapse=None) -> Tuple[str, dict]:
 
 def get_part_three_fieldset(
     collapse=None,
-) -> Tuple[str, dict]:
+) -> tuple[str, dict]:
     dct = {
         "description": mark_safe(  # nosec B308
             "To be completed by the <u>study clinician</u>"
@@ -67,7 +66,7 @@ def get_part_three_glucose_fieldset(collapse=None):
     return "Part 3c:  Glucose Measurements (FBG / OGTT)", dct
 
 
-def get_part_three_repeat_glucose_fieldset(collapse=None) -> Tuple[str, dict]:
+def get_part_three_repeat_glucose_fieldset(collapse=None) -> tuple[str, dict]:
     fields = [
         "repeat_glucose_performed",
         "repeat_fasting",
@@ -87,47 +86,47 @@ def get_part_three_repeat_glucose_fieldset(collapse=None) -> Tuple[str, dict]:
     return "Part 3d: Repeat Glucose Measurements (FBG / OGTT)", dct
 
 
-def get_part_three_other_fieldset(collapse=None) -> Tuple[str, dict]:
+def get_part_three_other_fieldset(collapse=None) -> tuple[str, dict]:
     dct = {"fields": part_three_other_fields}
     if collapse:
         dct.update(classes=("collapse",))
     return "Part 3e: Creatinine / HbA1c", dct
 
 
-def get_part_three_creatinine_fieldset(collapse=None) -> Tuple[str, dict]:
+def get_part_three_creatinine_fieldset(collapse=None) -> tuple[str, dict]:
     dct = {"fields": part_three_creatinine_fields}
     if collapse:
         dct.update(classes=("collapse",))
     return "Part 3e: Creatinine", dct
 
 
-def get_part_three_hba1c_fieldset(collapse=None) -> Tuple[str, dict]:
+def get_part_three_hba1c_fieldset(collapse=None) -> tuple[str, dict]:
     dct = {"fields": part_three_hba1c_fields}
     if collapse:
         dct.update(classes=("collapse",))
     return "Part 3f: HbA1c", dct
 
 
-def get_part_three_report_datetime_fieldset() -> Tuple[str, dict]:
+def get_part_three_report_datetime_fieldset() -> tuple[str, dict]:
     dct = {"fields": ["part_three_report_datetime"]}
     return "Part 3", dct
 
 
-def get_part_three_vitals_fieldset(collapse=None) -> Tuple[str, dict]:
+def get_part_three_vitals_fieldset(collapse=None) -> tuple[str, dict]:
     dct = {"fields": part_three_vitals_fields}
     if collapse:
         dct.update(classes=("collapse",))
     return "Part 3a: Vitals", dct
 
 
-def get_part_three_pregnancy_fieldset(collapse=None) -> Tuple[str, dict]:
+def get_part_three_pregnancy_fieldset(collapse=None) -> tuple[str, dict]:
     dct = {"fields": part_three_pregnancy_fields}
     if collapse:
         dct.update(classes=("collapse",))
     return "Part 3b: Pregnancy", dct
 
 
-def get_p3_screening_appt_update_fields(collapse=None) -> Tuple[str, dict]:
+def get_p3_screening_appt_update_fields(collapse=None) -> tuple[str, dict]:
     dct = {
         "description": mark_safe(  # nosec B308
             '<span style="color:orange;font-weight:bold">IMPORTANT:</span>'
@@ -144,14 +143,14 @@ def get_p3_screening_appt_update_fields(collapse=None) -> Tuple[str, dict]:
     return "Part 3 screening appointment update", dct
 
 
-comments_fieldset: Tuple[str, dict] = (
+comments_fieldset: tuple[str, dict] = (
     "Additional Comments",
     {
         "fields": (*part_three_comment_fields,),
     },
 )
 
-calculated_values_fieldset: Tuple[str, dict] = (
+calculated_values_fieldset: tuple[str, dict] = (
     "Calculated values",
     {
         "classes": ("collapse",),

meta_screening/admin/list_filters.py

@@ -11,13 +11,13 @@ class EligibilityPending(admin.SimpleListFilter):
 
     parameter_name = "eligibility_pending"
 
-    def lookups(self, request, model_admin):
+    def lookups(self, request, model_admin):  # noqa: ARG002
         return (
             (PENDING, "Pending"),
             (PENDING_REPEAT, "Pending repeat GLU"),
         )
 
-    def queryset(self, request, queryset):
+    def queryset(self, request, queryset):  # noqa: ARG002
         if self.value() == PENDING_REPEAT:
             return queryset.filter(
                 eligible_part_one=YES,
@@ -35,6 +35,7 @@ class EligibilityPending(admin.SimpleListFilter):
                 p3_ltfu=NOT_APPLICABLE,
                 part_three_report_datetime__isnull=True,
             )
+        return queryset
 
 
 class P3LtfuListFilter(admin.SimpleListFilter):
@@ -42,13 +43,13 @@ class P3LtfuListFilter(admin.SimpleListFilter):
 
     parameter_name = "p3_ltfu_custom"
 
-    def lookups(self, request, model_admin):
+    def lookups(self, request, model_admin):  # noqa: ARG002
         return (
             (YES, "Yes"),
             (NO, "No, lost contact"),
         )
 
-    def queryset(self, request, queryset):
+    def queryset(self, request, queryset):  # noqa: ARG002
         if self.value() == YES:
             return queryset.filter(
                 eligible_part_one=YES,
@@ -69,6 +70,7 @@ class P3LtfuListFilter(admin.SimpleListFilter):
                 | Q(eligible_part_two=TBD)
                 | Q(eligible_part_three=TBD)
             )
+        return queryset
 
 
 class P3ApptListFilter(AppointmentListFilter):

meta_screening/admin/screening_part_one_admin.py

@@ -1,4 +1,3 @@
-from typing import Tuple
 
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
@@ -35,7 +34,7 @@ class ScreeningPartOneAdmin(SiteModelAdminMixin, SubjectScreeningAdmin):
 
     fieldsets = get_fieldsets()
 
-    readonly_fields: Tuple[str, ...] = (
+    readonly_fields: tuple[str, ...] = (
         *part_two_fields,
         *part_three_fields,
         *calculated_fields,

meta_screening/admin/screening_part_three_admin.py

@@ -1,5 +1,4 @@
 from copy import deepcopy
-from typing import Tuple
 
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
@@ -30,7 +29,7 @@ from .list_filters import EligibilityPending, P3ApptListFilter, P3LtfuListFilter
 from .subject_screening_admin import SubjectScreeningAdmin
 
 
-def get_part_two_fieldset_without_contact_number() -> Tuple[str, dict]:
+def get_part_two_fieldset_without_contact_number() -> tuple[str, dict]:
     """Remove contact number from the part 2 fields"""
     part_two_name, part_two_dct = get_part_two_fieldset(collapse=True)
     part_two_dct = deepcopy(part_two_dct)
@@ -76,7 +75,7 @@ class ScreeningPartThreeAdmin(SiteModelAdminMixin, SubjectScreeningAdmin):
         "refused",
     )
 
-    readonly_fields: Tuple[str, ...] = (
+    readonly_fields: tuple[str, ...] = (
         *part_one_fields,
         *(f for f in part_two_fields if f != "contact_number"),
         *calculated_fields,

meta_screening/admin/screening_part_two_admin.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
 from edc_sites.admin import SiteModelAdminMixin
@@ -21,12 +19,12 @@ from .fieldsets import (
 from .subject_screening_admin import SubjectScreeningAdmin
 
 
-def get_fieldsets() -> Tuple[
-    Tuple[str, dict],
-    Tuple[str, dict],
-    Tuple[str, dict],
-    Tuple[str, dict],
-    Tuple[str, dict],
+def get_fieldsets() -> tuple[
+    tuple[str, dict],
+    tuple[str, dict],
+    tuple[str, dict],
+    tuple[str, dict],
+    tuple[str, dict],
 ]:
     return (
         get_part_one_fieldset(collapse=True),
@@ -39,12 +37,11 @@ def get_fieldsets() -> Tuple[
 
 @admin.register(ScreeningPartTwo, site=meta_screening_admin)
 class ScreeningPartTwoAdmin(SiteModelAdminMixin, SubjectScreeningAdmin):
-
     form = ScreeningPartTwoForm
 
     fieldsets = get_fieldsets()
 
-    readonly_fields: Tuple[str, ...] = (
+    readonly_fields: tuple[str, ...] = (
         *part_one_fields,
         *part_three_fields,
         *calculated_fields,

meta_screening/admin/subject_refusal_admin.py

@@ -17,7 +17,7 @@ class SubjectRefusalAdmin(
 ):
     form = SubjectRefusalForm
 
-    autocomplete_fields = ["subject_screening"]
+    autocomplete_fields = ("subject_screening",)
 
     post_url_on_delete_name = "screening_listboard_url"
     subject_listboard_url_name = "screening_listboard_url"
@@ -54,7 +54,7 @@ class SubjectRefusalAdmin(
         "subject_screening__initials",
     )
 
-    radio_fields = {"reason": admin.VERTICAL}
+    radio_fields = {"reason": admin.VERTICAL}  # noqa: RUF012
 
     def get_subject_dashboard_url_kwargs(self, obj):
         return dict(screening_identifier=obj.screening_identifier)
@@ -69,5 +69,7 @@ class SubjectRefusalAdmin(
             if callable(super().view_on_site):
                 url = super().view_on_site(obj)
             else:
-                raise NoReverseMatch(f"{e}. See subject_dashboard_url_name for {repr(self)}.")
+                raise NoReverseMatch(
+                    f"{e}. See subject_dashboard_url_name for {self!r}."
+                ) from e
         return url

meta_screening/admin/subject_screening_admin.py

@@ -97,7 +97,7 @@ class SubjectScreeningAdmin(ModelAdminSubjectDashboardMixin, SimpleHistoryAdmin)
         "inclusion_d",
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "acute_condition": admin.VERTICAL,
         "acute_metabolic_acidosis": admin.VERTICAL,
         "advised_to_fast": admin.VERTICAL,
@@ -145,11 +145,11 @@ class SubjectScreeningAdmin(ModelAdminSubjectDashboardMixin, SimpleHistoryAdmin)
         "vl_undetectable": admin.VERTICAL,
     }
 
-    def post_url_on_delete_kwargs(self, request, obj):
+    def post_url_on_delete_kwargs(self, request, obj):  # noqa: ARG002
         return {}
 
     # TODO: this is a hack!
-    def get_post_url_on_delete_name(self, request) -> str:
+    def get_post_url_on_delete_name(self, request) -> str:  # noqa: ARG002
         return url_names.get(self.post_url_on_delete_name)
 
     @staticmethod
@@ -163,7 +163,7 @@ class SubjectScreeningAdmin(ModelAdminSubjectDashboardMixin, SimpleHistoryAdmin)
             data.append(f"Contact #: {obj.contact_number or '--'}")
         return format_html(
             "{}",
-            mark_safe("<BR>".join(data)),  # nosec B703, B308
+            mark_safe("<BR>".join(data)),  # noqa: S308
         )
 
     def reasons(self, obj=None):

meta_screening/baker_recipes.py

@@ -1,8 +1,8 @@
 from dateutil.relativedelta import relativedelta
 from django.contrib.sites.models import Site
-from edc_constants.constants import BLACK, FEMALE, NO, NOT_APPLICABLE, YES
+from django.utils import timezone
+from edc_constants.constants import BLACK, FEMALE, NO, NOT_APPLICABLE, NULL_STRING, YES
 from edc_reportable.units import MILLIGRAMS_PER_DECILITER, MILLIMOLES_PER_LITER
-from edc_utils import get_utcnow
 from faker import Faker
 from model_bakery.recipe import Recipe
 
@@ -13,11 +13,11 @@ fake = Faker()
 
 subjectscreening = Recipe(
     SubjectScreening,
-    report_datetime=get_utcnow() - relativedelta(days=1),
+    report_datetime=timezone.now() - relativedelta(days=1),
     screening_consent=YES,
     hospital_identifier="111",
     initials="ZZ",
-    subject_identifier=None,
+    subject_identifier=NULL_STRING,
     gender=FEMALE,
     age_in_years=40,
     ethnicity=BLACK,
@@ -29,7 +29,7 @@ subjectscreening = Recipe(
     staying_nearby_12=YES,
     pregnant=NO,
     site=Site.objects.get_current(),
-    part_two_report_datetime=get_utcnow() - relativedelta(days=1),
+    part_two_report_datetime=timezone.now() - relativedelta(days=1),
     congestive_heart_failure=NO,
     liver_disease=NO,
     alcoholism=NO,
@@ -39,8 +39,8 @@ subjectscreening = Recipe(
     acute_condition=NO,
     metformin_sensitivity=NO,
     advised_to_fast=YES,
-    appt_datetime=get_utcnow() + relativedelta(days=1),
-    part_three_report_datetime=get_utcnow(),
+    appt_datetime=timezone.now() + relativedelta(days=1),
+    part_three_report_datetime=timezone.now(),
     weight=65,
     height=120,
     fasting=YES,
@@ -51,8 +51,8 @@ subjectscreening = Recipe(
     creatinine_units=MILLIGRAMS_PER_DECILITER,
     fbg_value=6.9,
     fbg_units=MILLIMOLES_PER_LITER,
-    fbg_datetime=get_utcnow(),
-    ogtt_base_datetime=get_utcnow(),
+    fbg_datetime=timezone.now(),
+    ogtt_base_datetime=timezone.now(),
     unsuitable_for_study=NO,
     unsuitable_agreed=NOT_APPLICABLE,
     vl_undetectable=YES,

meta_screening/eligibility/__init__.py

@@ -6,3 +6,12 @@ from .eligibility import (
 from .eligibility_part_one import EligibilityPartOne
 from .eligibility_part_three import EligibilityPartThreePhaseThree
 from .eligibility_part_two import EligibilityPartTwo
+
+__all__ = [
+    "EligibilityPartOne",
+    "EligibilityPartThreePhaseThree",
+    "EligibilityPartTwo",
+    "MetaEligibility",
+    "SubjectScreeningEligibilityError",
+    "get_display_label",
+]

meta_screening/eligibility/eligibility.py

@@ -16,7 +16,7 @@ class SubjectScreeningEligibilityError(Exception):
     pass
 
 
-def get_eligible_as_word(
+def get_eligible_as_word(  # noqa: PLR0913
     obj=None,
     eligible_part_one=None,
     eligible_part_two=None,
@@ -90,8 +90,8 @@ class MetaEligibility:
 
     """
 
-    eligibility_values = [YES, NO, TBD]
-    default_options = dict(
+    eligibility_values = (YES, NO, TBD)
+    default_options = dict(  # noqa: RUF012
         eligible_value_default=TBD,
         eligible_values_list=[YES, NO, TBD],
         is_eligible_value=YES,
@@ -99,8 +99,8 @@ class MetaEligibility:
 
     def __init__(
         self,
-        model_obj: models.Model = None,
-        defaults: dict = None,
+        model_obj: models.Model | None = None,
+        defaults: dict | None = None,
         update_model=None,
     ):
         self.part_one = None
@@ -162,7 +162,7 @@ class MetaEligibility:
     @property
     def is_eligible(self: Any) -> bool:
         """Returns True if eligible else False"""
-        return True if self.eligible == YES else False
+        return self.eligible == YES
 
     def check_eligibility_values_or_raise(self: Any):
         for response in [
@@ -207,7 +207,7 @@ class MetaEligibility:
             )
         else:
             status_str = format_html(
-                "P1: {p1_eligible}<BR>" "P2: {p2_eligible}<BR>" "P3: {p3_eligible}<BR>",
+                "P1: {p1_eligible}<BR>P2: {p2_eligible}<BR>P3: {p3_eligible}<BR>",
                 p1_eligible=self.part_one.eligible.upper(),
                 p2_eligible=self.part_two.eligible.upper(),
                 p3_eligible=self.part_three.eligible.upper(),

meta_screening/eligibility/eligibility_part_three/__init__.py

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

meta_screening/eligibility/eligibility_part_three/base_eligibility_part_three.py

@@ -1,3 +1,5 @@
+import contextlib
+
 from edc_constants.constants import NEG, NO, NOT_APPLICABLE
 from edc_egfr import EgfrCkdEpi
 from edc_egfr.calculators import EgfrCalculatorError
@@ -37,7 +39,7 @@ class BaseEligibilityPartThree(ScreeningEligibility):
     def assess_eligibility(self) -> None:
         if self.weight and self.height:
             self.bmi = calculate_bmi(weight_kg=self.weight, height_cm=self.height)
-        try:
+        with contextlib.suppress(EgfrCalculatorError):
             self.calculated_egfr_value = EgfrCkdEpi(
                 gender=self.model_obj.gender,
                 age_in_years=self.model_obj.age_in_years,
@@ -45,8 +47,6 @@ class BaseEligibilityPartThree(ScreeningEligibility):
                 creatinine_value=self.model_obj.creatinine_value,
                 creatinine_units=self.model_obj.creatinine_units,
             ).value
-        except EgfrCalculatorError:
-            pass
 
     def set_fld_attrs_on_model(self) -> None:
         self.model_obj.converted_creatinine_value = self.converted_creatinine_value
@@ -89,7 +89,7 @@ class BaseEligibilityPartThree(ScreeningEligibility):
                     units_to=MICROMOLES_PER_LITER,
                 )
             except ConversionNotHandled as e:
-                raise ConversionNotHandled(f"Creatinine. {e}")
+                raise ConversionNotHandled(f"Creatinine. {e}") from e
         if value and float(value) > 999999.9999:
             raise ConversionNotHandled("Creatinine value is absurd.")
         return value
@@ -106,7 +106,7 @@ class BaseEligibilityPartThree(ScreeningEligibility):
                     units_to=MILLIMOLES_PER_LITER,
                 )
             except ConversionNotHandled as e:
-                raise ConversionNotHandled(f"FBG. {e}")
+                raise ConversionNotHandled(f"FBG. {e}") from e
         return value
 
     @property
@@ -121,7 +121,7 @@ class BaseEligibilityPartThree(ScreeningEligibility):
                     units_to=MILLIMOLES_PER_LITER,
                 )
             except ConversionNotHandled as e:
-                raise ConversionNotHandled(f"FBG2. {e}")
+                raise ConversionNotHandled(f"FBG2. {e}") from e
         return value
 
     @property
@@ -136,7 +136,7 @@ class BaseEligibilityPartThree(ScreeningEligibility):
                     units_to=MILLIMOLES_PER_LITER,
                 )
             except ConversionNotHandled as e:
-                raise ConversionNotHandled(f"OGTT. {e}")
+                raise ConversionNotHandled(f"OGTT. {e}") from e
         return value
 
     @property
@@ -151,7 +151,7 @@ class BaseEligibilityPartThree(ScreeningEligibility):
                     units_to=MILLIMOLES_PER_LITER,
                 )
             except ConversionNotHandled as e:
-                raise ConversionNotHandled(f"OGTT2. {e}")
+                raise ConversionNotHandled(f"OGTT2. {e}") from e
         return value
 
     def set_eligible_model_field(self):

meta_screening/eligibility/eligibility_part_three/eligibility_part_three_phase_three.py

@@ -52,20 +52,19 @@ class EligibilityPartThreePhaseThree(BaseEligibilityPartThree):
         ):
             self.eligible = TBD
             self.reasons_ineligible.update(fbg_ogtt_incomplete=FBG_OGTT_INCOMPLETE)
-        else:
-            if self.ogtt_category == PRE_DM:
-                self.eligible = YES
-            elif self.ogtt_category == DM:
-                self.eligible = NO
-                self.reasons_ineligible.update(hi_ogtt=HI_OGTT)
-            elif self.fbg_category == PRE_DM and self.ogtt_category == NORMAL:
-                self.eligible = YES
-            elif self.fbg_category == NORMAL and self.ogtt_category == NORMAL:
-                self.eligible = NO
-                self.reasons_ineligible.update(normal_fbg_ogtt=NORMAL_FBG_OGTT)
-            elif self.fbg_category == DM and self.ogtt_category == NORMAL:
-                self.eligible = NO
-                self.reasons_ineligible.update(hi_fbg=HI_FBG)
+        elif self.ogtt_category == PRE_DM:
+            self.eligible = YES
+        elif self.ogtt_category == DM:
+            self.eligible = NO
+            self.reasons_ineligible.update(hi_ogtt=HI_OGTT)
+        elif self.fbg_category == PRE_DM and self.ogtt_category == NORMAL:
+            self.eligible = YES
+        elif self.fbg_category == NORMAL and self.ogtt_category == NORMAL:
+            self.eligible = NO
+            self.reasons_ineligible.update(normal_fbg_ogtt=NORMAL_FBG_OGTT)
+        elif self.fbg_category == DM and self.ogtt_category == NORMAL:
+            self.eligible = NO
+            self.reasons_ineligible.update(hi_fbg=HI_FBG)
         if self.calculated_egfr_value and self.calculated_egfr_value < 45.0:
             self.reasons_ineligible.update(egfr_low=EGFR_LT_45)
             self.eligible = NO

meta_screening/form_validators/__init__.py

@@ -3,3 +3,11 @@ from .screening_part_three import ScreeningPartThreeFormValidator
 from .screening_part_two import ScreeningPartTwoFormValidator
 from .subject_refusal import SubjectRefusalFormValidator
 from .subject_screening import SubjectScreeningFormValidator
+
+__all__ = [
+    "ScreeningPartOneFormValidator",
+    "ScreeningPartThreeFormValidator",
+    "ScreeningPartTwoFormValidator",
+    "SubjectRefusalFormValidator",
+    "SubjectScreeningFormValidator",
+]

meta_screening/forms/__init__.py

@@ -16,3 +16,23 @@ from .screening_part_three_form import ScreeningPartThreeForm
 from .screening_part_two_form import ScreeningPartTwoForm
 from .subject_refusal_form import SubjectRefusalForm
 from .subject_screening_form import SubjectScreeningForm
+
+__all__ = [
+    "ScreeningPartOneForm",
+    "ScreeningPartThreeForm",
+    "ScreeningPartTwoForm",
+    "SubjectRefusalForm",
+    "SubjectScreeningForm",
+    "calculated_fields",
+    "field_lists",
+    "part_one_fields",
+    "part_three_comment_fields",
+    "part_three_fbg_fields",
+    "part_three_fields",
+    "part_three_glucose_fields",
+    "part_three_ogtt_fields",
+    "part_three_other_fields",
+    "part_three_pregnancy_fields",
+    "part_three_vitals_fields",
+    "part_two_fields",
+]