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

meta_subject/admin/delivery_admin.py

@@ -2,11 +2,8 @@ from django.contrib import admin
 from django.template.loader import render_to_string
 from django.urls import reverse
 from django_audit_fields.admin import audit_fieldset_tuple
-from edc_action_item import (
-    ActionItemModelAdminMixin,
-    action_fields,
-    action_fieldset_tuple,
-)
+from edc_action_item.fieldsets import action_fields, action_fieldset_tuple
+from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
 from edc_crf.fieldset import crf_status_fieldset
 from edc_form_label import FormLabelModelAdminMixin
 from edc_model_admin.history import SimpleHistoryAdmin
@@ -22,11 +19,11 @@ class BirthOutcomesInlineAdmin(TabularInlineMixin, admin.TabularInline):
     model = BirthOutcomes
     form = BirthOutcomesForm
     extra = 1
-    fields = [
+    fields = (
         "birth_order",
         "birth_outcome",
         "birth_weight",
-    ]
+    )
 
 
 @admin.register(Delivery, site=meta_subject_admin)
@@ -38,7 +35,7 @@ class DeliveryAdmin(
 ):
     form = DeliveryForm
 
-    inlines = [BirthOutcomesInlineAdmin]
+    inlines = (BirthOutcomesInlineAdmin,)
 
     fieldsets = (
         (None, {"fields": ("subject_visit", "report_datetime")}),
@@ -94,7 +91,7 @@ class DeliveryAdmin(
         "maternal_outcome",
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "info_available": admin.VERTICAL,
         "info_source": admin.VERTICAL,
         "informant_relation": admin.VERTICAL,
@@ -112,7 +109,7 @@ class DeliveryAdmin(
     )
 
     @admin.display
-    def birth_outcomes(self, obj=None, label=None):
+    def birth_outcomes(self, obj=None, label=None):  # noqa: ARG002
         url = reverse("meta_subject_admin:meta_subject_birthoutcomes_changelist")
         url = f"{url}?q={obj.subject_identifier}"
         context = dict(title="Outcomes", url=url, label="Outcomes")

meta_subject/admin/diabetes/__init__.py

@@ -1,2 +1,4 @@
 from .dm_endpoint_admin import DmEndpointAdmin
 from .dm_followup_admin import DmFollowupAdmin
+
+__all__ = ["DmEndpointAdmin", "DmFollowupAdmin"]

meta_subject/admin/diabetes/dm_endpoint_admin.py

@@ -30,6 +30,6 @@ class DmEndpointAdmin(
         audit_fieldset_tuple,
     )
 
-    list_filter = ["endpoint_reached"]
+    list_filter = ("endpoint_reached",)
 
-    radio_fields = {"endpoint_reached": admin.VERTICAL}
+    radio_fields = {"endpoint_reached": admin.VERTICAL}  # noqa: RUF012

meta_subject/admin/diabetes/dm_followup_admin.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
-from edc_action_item import ActionItemModelAdminMixin, action_fieldset_tuple
+from edc_action_item.fieldsets import action_fieldset_tuple
+from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
 from edc_adherence.model_admin_mixin import get_visual_score_fieldset_tuple
 from edc_crf.fieldset import crf_status_fieldset
 from edc_form_label.form_label_modeladmin_mixin import FormLabelModelAdminMixin
@@ -86,7 +87,7 @@ class DmFollowupAdmin(
         "missed_referral_reasons",
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "attended": admin.VERTICAL,
         "investigations_performed": admin.VERTICAL,
         "on_dm_medications": admin.VERTICAL,

meta_subject/admin/egfr_drop_notification_admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from edc_action_item import ActionItemModelAdminMixin
+from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
 from edc_egfr.admin import EgfrDropNotificationAdminMixin
 from edc_model_admin.history import SimpleHistoryAdmin
 

meta_subject/admin/followup_examination_admin.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
-from edc_action_item import ActionItemModelAdminMixin, action_fieldset_tuple
+from edc_action_item.fieldsets import action_fieldset_tuple
+from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
 from edc_constants.constants import NONE, YES
 from edc_crf.fieldset import crf_status_fieldset
 from edc_form_label.form_label_modeladmin_mixin import FormLabelModelAdminMixin
@@ -16,17 +17,18 @@ class GradedEventFilter(admin.SimpleListFilter):
     title = "Graded events"
     parameter_name = "grade"
 
-    def lookups(self, request, model_admin):
+    def lookups(self, request, model_admin):  # noqa: ARG002
         return (
             ("g3", "Grade 3"),
             ("g4", "Grade 4"),
         )
 
-    def queryset(self, request, queryset):
+    def queryset(self, request, queryset):  # noqa: ARG002
         if self.value() == "g3":
             return queryset.exclude(symptoms_g3__name=NONE)
         if self.value() == "g4":
             return queryset.exclude(symptoms_g4__name=NONE)
+        return queryset
 
 
 @admin.register(FollowupExamination, site=meta_subject_admin)
@@ -36,14 +38,13 @@ class FollowupExaminationAdmin(
     ActionItemModelAdminMixin,
     SimpleHistoryAdmin,
 ):
-
     form = FollowupExaminationForm
 
-    autocomplete_fields = ["art_new_regimen"]
+    autocomplete_fields = ("art_new_regimen",)
 
-    additional_instructions = [
-        "If participant is pregnant, complete the action linked CRF `Pregnancy notification`."
-    ]
+    additional_instructions = (
+        "If participant is pregnant, complete the action linked CRF `Pregnancy notification`.",
+    )
 
     fieldsets = (
         (None, {"fields": ("subject_visit", "report_datetime")}),
@@ -128,7 +129,7 @@ class FollowupExaminationAdmin(
 
     # readonly_fields = action_fields
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "abdominal_tenderness": admin.VERTICAL,
         "admitted_hospital": admin.VERTICAL,
         "any_other_problems": admin.VERTICAL,

meta_subject/admin/followup_vitals_admin.py

@@ -15,10 +15,9 @@ from .modeladmin import CrfModelAdminMixin
 class FollowupVitalsAdmin(CrfModelAdminMixin, FormLabelModelAdminMixin, SimpleHistoryAdmin):
     form = FollowupVitalsForm
 
-    additional_instructions = [
-        "If participant is pregnant, complete the action "
-        "linked CRF `Pregnancy notification`."
-    ]
+    additional_instructions = (
+        "If participant is pregnant, complete the action linked CRF `Pregnancy notification`."
+    )
 
     fieldsets = (
         (None, {"fields": ("subject_visit", "report_datetime")}),
@@ -68,7 +67,7 @@ class FollowupVitalsAdmin(CrfModelAdminMixin, FormLabelModelAdminMixin, SimpleHi
 
     filter_horizontal = ()
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "waist_circumference_measured": admin.VERTICAL,
         "severe_htn": admin.VERTICAL,
     }

meta_subject/admin/glucose_admin.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Type
-
 from django.contrib import admin
 from django.contrib.admin import SimpleListFilter
 from django.template.loader import render_to_string
@@ -72,7 +70,7 @@ class GlucoseAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "fasting": admin.VERTICAL,
         "fbg_units": admin.VERTICAL,
         "fbg_performed": admin.VERTICAL,
@@ -89,7 +87,7 @@ class GlucoseAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         list_display = tuple(list_display)
         return list_display
 
-    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(2, OgttListFilter)

meta_subject/admin/glucose_fbg_admin.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Type
-
 from django.contrib import admin
 from django.contrib.admin import SimpleListFilter
 from django_audit_fields import audit_fieldset_tuple
@@ -74,7 +72,7 @@ class GlucoseFbgAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         list_display = tuple(list_display)
         return list_display
 
-    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(2, GlucoseListFilter)

meta_subject/admin/health_economics/__init__.py

@@ -1,2 +1,4 @@
 from .health_economics_simple_admin import HealthEconomicsSimpleAdmin
 from .health_economics_update_admin import HealthEconomicsUpdateAdmin
+
+__all__ = ["HealthEconomicsSimpleAdmin", "HealthEconomicsUpdateAdmin"]

meta_subject/admin/health_economics/health_economics_simple_admin.py

@@ -31,4 +31,4 @@ class HealthEconomicsSimpleAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         audit_fieldset_tuple,
     )
 
-    radio_fields = {**education_radio_fields}
+    radio_fields = {**education_radio_fields}  # noqa: RUF012

meta_subject/admin/health_economics/health_economics_update_admin.py

@@ -92,7 +92,7 @@ class HealthEconomicsUpdateAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "hoh": admin.VERTICAL,
         "relationship_to_hoh": admin.VERTICAL,
         "avg_income": admin.VERTICAL,

meta_subject/admin/hepatitis_test_admin.py

@@ -47,7 +47,7 @@ class HepatitisTestAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         audit_fieldset_tuple,
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "hbsag_performed": admin.VERTICAL,
         "hbsag": admin.VERTICAL,
         "hcv_performed": admin.VERTICAL,

meta_subject/admin/list_filters.py

@@ -46,7 +46,7 @@ class OgttListFilter(SimpleListFilter):
     parameter_name = "ogtt_value"
     model_cls = Glucose
 
-    def lookups(self, request, model_admin):
+    def lookups(self, request, model_admin):  # noqa: ARG002
         return (
             (NORMAL, "Normal"),
             (HIGH, "High"),

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/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

@@ -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 django.utils import timezone
+from edc_constants.constants import NO, NOT_APPLICABLE, NULL_STRING, PATIENT, POS, YES
 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/form_validators/__init__.py

@@ -6,3 +6,14 @@ from .egfr_drop_notification_form_validator import EgfrDropNotificationFormValid
 from .followup_examination_form_validator import FollowupExaminationFormValidator
 from .glucose_form_validator import GlucoseFormValidator
 from .health_economics_form_validator import HealthEconomicsFormValidator
+
+__all__ = [
+    "BirthOutcomesFormValidator",
+    "DeliveryFormValidator",
+    "DmEndpointFormValidator",
+    "DmFollowupFormValidator",
+    "EgfrDropNotificationFormValidator",
+    "FollowupExaminationFormValidator",
+    "GlucoseFormValidator",
+    "HealthEconomicsFormValidator",
+]

meta_subject/form_validators/delivery_form_validator.py

@@ -10,16 +10,15 @@ from meta_prn.models import PregnancyNotification
 
 
 class DeliveryFormValidator(CrfFormValidator):
-
     def clean(self):
         try:
             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

@@ -30,7 +30,7 @@ class DmEndpointFormValidator(CrfFormValidator):
                 {
                     "__all__": format_html(
                         "Subject has not reached the protocol endpoint. See {link}",
-                        link=mark_safe(link),  # nosec B703, B308
+                        link=mark_safe(link),  # noqa: S308
                     )
                 },
                 INVALID_ERROR,

meta_subject/form_validators/dm_followup_form_validator.py

@@ -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/glucose_form_validator.py

@@ -70,13 +70,11 @@ class GlucoseFormValidator(FbgOgttFormValidatorMixin, CrfFormValidator):
 
     def is_endpoint(self):
         value = NO
-        if self.cleaned_data.get("fbg_value") >= Decimal("7.0") and self.cleaned_data.get(
+        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(
+        ) >= Decimal("11.1")) or (self.cleaned_data.get("fbg_value") < Decimal("7.0") and self.cleaned_data.get(
             "ogtt_value"
-        ) >= Decimal("11.1"):
+        ) >= Decimal("11.1")):
             value = YES
         elif self.cleaned_data.get("fbg_value") >= Decimal("7.0") and self.cleaned_data.get(
             "ogtt_value"