diff --git a/portal/eproms/templates/eproms/assessment_engine.html b/portal/eproms/templates/eproms/assessment_engine.html index aa86fd8526..43aec99d35 100644 --- a/portal/eproms/templates/eproms/assessment_engine.html +++ b/portal/eproms/templates/eproms/assessment_engine.html @@ -31,3 +31,7 @@
{% endif %} +{%- from "eproms/assessment_engine/ae_macros.html" import empro_thankyou_modal, empro_optout_modal -%} +{{empro_optout_modal(user)}} +{{empro_thankyou_modal(user)}} + diff --git a/portal/eproms/templates/eproms/assessment_engine/ae_base.html b/portal/eproms/templates/eproms/assessment_engine/ae_base.html index 58c9df09c4..4c2f8f1ac1 100644 --- a/portal/eproms/templates/eproms/assessment_engine/ae_base.html +++ b/portal/eproms/templates/eproms/assessment_engine/ae_base.html @@ -4,3 +4,4 @@
{%- block body -%}{%- endblock -%}
+
Loading ...
diff --git a/portal/eproms/templates/eproms/assessment_engine/ae_due.html b/portal/eproms/templates/eproms/assessment_engine/ae_due.html index 1352b93c85..7cf88f4ea6 100644 --- a/portal/eproms/templates/eproms/assessment_engine/ae_due.html +++ b/portal/eproms/templates/eproms/assessment_engine/ae_due.html @@ -1,4 +1,4 @@ -{%- from "eproms/assessment_engine/ae_macros.html" import render_header, render_greeting, render_card_content, render_call_to_button, due_card, completed_card, empro_due, empro_completed, empro_expired, completed_cards -%} +{%- from "eproms/assessment_engine/ae_macros.html" import render_header, render_greeting, render_card_content, render_call_to_button, due_card, completed_card, empro_due, empro_completed, empro_expired, completed_cards -%} {% extends "eproms/assessment_engine/ae_base.html" %} {% block head %} diff --git a/portal/eproms/templates/eproms/assessment_engine/ae_macros.html b/portal/eproms/templates/eproms/assessment_engine/ae_macros.html index 48ebd29e45..43e4f678bf 100644 --- a/portal/eproms/templates/eproms/assessment_engine/ae_macros.html +++ b/portal/eproms/templates/eproms/assessment_engine/ae_macros.html @@ -210,9 +210,6 @@

{{_("Completed Questionnaires")}}

{% endif %} {%- endcall -%} - {% if substudy_assessment_status.overall_status == OverallStatus.completed %} - {{empro_thankyou_modal(user)}} - {% endif %} {%- endif -%} {%- endmacro -%} {%- macro empro_thankyou_card(full_name="") -%} @@ -227,6 +224,11 @@

{{_("Your Support Team")}}

{%- endmacro -%} +{%- macro empro_no_contact_notice() -%} +
+ Note: You have chosen not to be contacted about . Your care team will not discuss these issues this month. +
+{%- endmacro -%} {%- macro empro_modal_hardTrigger_supportTeam_block(organization="") -%}

{{_("Your Support Team")}}

@@ -234,6 +236,7 @@

{{_("Your Support Team")}}

+ {{empro_no_contact_notice()}}

{{_("To help address any issues, we've informed your care team and they'll be in contact with you soon.")}}

{% if organization %}

{{_("In the meantime, if you have any questions or need assistance, please contact your team at %(organization)s directly. They're happy to help.", organization=organization)}}

@@ -270,8 +273,8 @@

{{_("Your Health Tips")}}

{%- macro empro_thankyou_modal(user) -%} -