meta-edc 0.3.53__py3-none-any.whl → 1.0.0__py3-none-any.whl

meta_screening/eligibility/eligibility.py

@@ -195,15 +195,22 @@ class MetaEligibility:
                 args=(self.part_three.model_obj.id,),
             )
             status_str = format_html(
-                f'<A href="{url_p1}">P1: {self.part_one.eligible.upper()}</A><BR>'
-                f'<A href="{url_p2}">P2: {self.part_two.eligible.upper()}</A><BR>'
-                f'<A href="{url_p3}">P3: {self.part_three.eligible.upper()}</A><BR>'
+                '<A href="{url_p1}">P1: {p1_eligible}</A>'
+                '<BR><A href="{url_p2}">P2: {p2_eligible}</A>'
+                '<BR><A href="{url_p3}">P3: {p3_eligible}</A><BR>',
+                url_p1=url_p1,
+                p1_eligible=self.part_one.eligible.upper(),
+                url_p2=url_p2,
+                p2_eligible=self.part_two.eligible.upper(),
+                url_p3=url_p3,
+                p3_eligible=self.part_three.eligible.upper(),
             )
         else:
-            status_str = (
-                f"P1: {self.part_one.eligible.upper()}<BR>"
-                f"P2: {self.part_two.eligible.upper()}<BR>"
-                f"P3: {self.part_three.eligible.upper()}<BR>"
+            status_str = format_html(
+                "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(),
             )
         display_label = self.display_label
         if "PENDING" in display_label:

meta_screening/model_mixins/part_one_fields_model_mixin.py

@@ -1,5 +1,4 @@
 from django.db import models
-from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 from django_crypto_fields.fields import EncryptedCharField
 from edc_constants.choices import SELECTION_METHOD, YES_NO, YES_NO_NA, YESDEFAULT_NO
@@ -11,10 +10,10 @@ from ..constants import PREG_YES_NO_NA
 
 class PartOneFieldsModelMixin(models.Model):
     screening_consent = models.CharField(
-        verbose_name=format_html(
+        verbose_name=mark_safe(
             "Has the subject given his/her verbal consent to be screened for "
             "the <u>META Phase 3</u> trial?"
-        ),
+        ),  # nosec B308
         max_length=15,
         choices=YES_NO,
     )
@@ -26,7 +25,9 @@ class PartOneFieldsModelMixin(models.Model):
     )
 
     meta_phase_two = models.CharField(
-        verbose_name=format_html("Was the subject enrolled in the <u>META Phase 2</u> trial?"),
+        verbose_name=mark_safe(
+            "Was the subject enrolled in the <u>META Phase 2</u> trial?"
+        ),  # nosec B308
         max_length=15,
         choices=YES_NO,
         null=True,
@@ -44,9 +45,9 @@ class PartOneFieldsModelMixin(models.Model):
     )
 
     art_six_months = models.CharField(
-        verbose_name=format_html(
+        verbose_name=mark_safe(
             "Has the patient been on anti-retroviral therapy for <u>at least 6 months</u>"
-        ),
+        ),  # nosec B308
         max_length=15,
         choices=YES_NO_NA,
     )
@@ -59,10 +60,10 @@ class PartOneFieldsModelMixin(models.Model):
     )
 
     vl_undetectable = models.CharField(
-        verbose_name=format_html(
+        verbose_name=mark_safe(
             "Does the patient have a viral load measure of less than 1000 copies per ml "
             "taken <u>within the last 12 months</u>"
-        ),
+        ),  # nosec B308
         max_length=15,
         choices=YES_NO_NA,
     )
@@ -86,10 +87,10 @@ class PartOneFieldsModelMixin(models.Model):
     )
 
     staying_nearby_12 = models.CharField(
-        verbose_name=format_html(
+        verbose_name=mark_safe(
             "Is the patient planning to remain in the catchment area "
             "for <u>at least 12 months</u>"
-        ),
+        ),  # nosec B308
         max_length=15,
         choices=YES_NO,
         null=True,
@@ -101,18 +102,18 @@ class PartOneFieldsModelMixin(models.Model):
     )
 
     continue_part_two = models.CharField(
-        verbose_name=mark_safe(  # nosec B308
+        verbose_name=mark_safe(
             "Continue with <U>part two</U> of the screening process?"
-        ),
+        ),  # nosec B308
         max_length=15,
         choices=YESDEFAULT_NO,
         default=YES,
-        help_text=mark_safe(  # nosec B308
+        help_text=mark_safe(
             "<B>Important</B>: This response will be be automatically "
             "set to YES if:<BR><BR>"
             "- the participant meets the eligibility criteria for part one, or;<BR><BR>"
             "- the eligibility criteria for part two is already complete.<BR>"
-        ),
+        ),  # nosec B308
     )
 
     class Meta:

meta_subject/admin/birth_outcome_admin.py

@@ -72,7 +72,7 @@ class BirthOutcomesAdmin(
         url = reverse("meta_subject_admin:meta_subject_delivery_changelist")
         url = f"{url}?q={obj.subject_identifier}"
         context = dict(title="Delivery", url=url, label="Delivery")
-        return render_to_string("dashboard_button.html", context=context)
+        return render_to_string("edc_subject_dashboard/dashboard_button.html", context=context)
 
     def get_subject_dashboard_url_kwargs(self, obj):
         return dict(subject_identifier=obj.subject_identifier)

meta_subject/admin/delivery_admin.py

@@ -116,4 +116,4 @@ class DeliveryAdmin(
         url = reverse("meta_subject_admin:meta_subject_birthoutcomes_changelist")
         url = f"{url}?q={obj.subject_identifier}"
         context = dict(title="Outcomes", url=url, label="Outcomes")
-        return render_to_string("dashboard_button.html", context=context)
+        return render_to_string("edc_subject_dashboard/dashboard_button.html", context=context)

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),  # nosec B703, B308
                     )
                 },
                 INVALID_ERROR,

meta_subject/models/diabetes/dm_followup.py

@@ -1,6 +1,6 @@
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
-from django.utils.html import format_html
+from django.utils.safestring import mark_safe
 from edc_action_item.models import ActionItem
 from edc_adherence.choices import MISSED_PILLS
 from edc_constants.choices import YES_NO, YES_NO_NA
@@ -186,10 +186,10 @@ class DmFollowup(CrfWithActionModelMixin, BaseUuidModel):
     )
 
     visual_score_confirmed = models.IntegerField(
-        verbose_name=format_html(
+        verbose_name=mark_safe(
             "<B><font color='orange'>Interviewer</font></B>: "
             "please transcribe the score indicated from above."
-        ),
+        ),  # nosec B308
         validators=[MinValueValidator(0), MaxValueValidator(100)],
         help_text="%",
         null=True,

tests/test_settings.py

@@ -74,7 +74,6 @@ project_settings = DefaultTestSettings(
         subject_dashboard_template="meta_dashboard/subject/dashboard.html",
         subject_review_listboard_template="edc_review_dashboard/subject_review_listboard.html",
     ),
-    EDC_BOOTSTRAP=3,
     EMAIL_BACKEND="django.core.mail.backends.locmem.EmailBackend",
     EMAIL_CONTACTS={
         "ae_reports": "someone@example.com",

meta_dashboard/templates/meta_dashboard/bootstrap3/subject/dashboard.html

@@ -1,14 +0,0 @@
-{% extends 'edc_subject_dashboard/bootstrap3/dashboard.html' %}
-
-{% load static %}
-
-{% block locator_information %}{% endblock locator_information %}
-
-{% block top_bar %}
-
-    {% include "meta_dashboard/bootstrap3/subject/dashboard/top_bar.html" %}
-
-{% endblock top_bar %}
-
-
-{% block side_bar %}{% include 'meta_dashboard/bootstrap3/subject/dashboard/sidebar.html' %}{% endblock side_bar %}