EMPRO opt out UI

portal/eproms/templates/eproms/assessment_engine.html

@@ -31,3 +31,7 @@
             <div class="error error-message"></div>
         </div>
 {% endif %}
+{%- from "eproms/assessment_engine/ae_macros.html" import empro_thankyou_modal, empro_optout_modal -%}
+{{empro_optout_modal(user)}}
+{{empro_thankyou_modal(user)}}
+

portal/eproms/templates/eproms/assessment_engine/ae_base.html

@@ -4,3 +4,4 @@
 <section class="portal-main portal-flex-container">
     {%- block body -%}{%- endblock -%}
 </section>
+<div class="loading-container  hide"><div class="content"><i class="fa fa-spinner fa-spin fa-2x"></i> Loading ...</div></div>

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 empro_script, 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" %}
 <!-- baseline due -->
 {% block head %}

portal/eproms/templates/eproms/assessment_engine/ae_macros.html

@@ -227,13 +227,19 @@ <h4>{{_("Your Support Team")}}</h4>
 
     </div>
 {%- endmacro -%}
+{%- macro empro_no_contact_notice() -%}
+    <div class="no-contact-list-wrapper hide">
+        <b>Note:</b> You have chosen not to be contacted about <span id="noContactTriggerList"></span>. Your care team will not discuss these issues this month.
+    </div>
+{%- endmacro -%}
 {%- macro empro_modal_hardTrigger_supportTeam_block(organization="") -%}
     <div class="item">
         <h4>{{_("Your Support Team")}}</h4>
         <p>{{_("You reported experiencing or feeling:")}}</p>
         <ul class="hardTriggersDisplayList">
            <!-- dynamically populated based on user trigger domain(s) -->
         </ul>
+        {{empro_no_contact_notice()}}
         <p><b>{{_("To help address any issues, we've informed your care team and they'll be in contact with you soon.")}}</b></p>
         {% if organization  %}
             <p>{{_("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)}}</p>
@@ -270,8 +276,8 @@ <h4>{{_("Your Health Tips")}}</h4>
 <!--sub-study macro -->
 {%- macro empro_thankyou_modal(user) -%}
     <!-- sub-study modal for display domain topic(s), resources link and summary report link to the user -->
-    <div class="modal fade" tabindex="-1" role="dialog" id="emproModal" {% if user and user.current_encounter().auth_method == 'url_authenticated'%}data-url-authenticated="true"{% endif %}>
-        <div class="modal-dialog">
+    <div class="modal fade" role="dialog" id="emproModal" tabindex="-1" aria-hidden="true" {% if user and user.current_encounter().auth_method == 'url_authenticated'%}data-url-authenticated="true"{% endif %}>
+        <div class="modal-dialog modal-xl">
             <div class="modal-content">
                 <button type="button" class="close" data-dismiss="modal" aria-label="{{_('Close')}}">
                     <span aria-hidden="true">&times;</span>
@@ -311,6 +317,84 @@ <h2 class="title">
     </div>
     {{empro_script()}}
 {%- endmacro -%}
+<!--sub-study optout modal macro -->
+{%- macro empro_optout_modal(user) -%}
+    <!-- sub-study modal for display domain topic(s), resources link and summary report link to the user -->
+    <div class="modal fade" role="dialog" id="emproOptOutModal" data-backdrop="static" tabindex="-1" aria-hidden="true" {% if user and user.current_encounter().auth_method == 'url_authenticated'%}data-url-authenticated="true"{% endif %}>
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <button type="button" class="close btn-dismiss" data-dismiss="modal" aria-label="{{_('Close')}}">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                <div class="modal-body">
+                    <div class="header-section">
+                        <h2 class="title">{{_("We want to check with you ...")}}</h2>
+                        <div class="subtitle" style="margin-bottom: 8px">
+                            {{_("About your preference to be contacted by your care team for these ongoing issues.")}}
+                        </div>
+                    </div>
+                    <!-- <div class="items-section">
+                        <div class="item wrap">
+                            <ul>
+                                <li>anxious</li>
+                                <li>discouraged</li>
+                                <li>fatigue</li>
+                            </ul>
+                            <ul>
+                                <li>general pain</li>
+                                <li>insomnia</li>
+                            </ul>
+                        </div>
+                    </div> -->
+                    <p>{{_("We’ve noticed you’re continuing to experience challenges with the issues listed below.")}}</p>
+                    <p class="text-warning">
+                        <b>{{_("If you prefer not to be contacted by your care team for any (or all) of these issues, please check the box(es) below.")}}</b>
+                    </p>
+                    <p>
+                        {{_("Your care team will continue to contact you as usual for other identified issues.")}}<br/>
+                        {{_("If you have any questions or need assistance, please contact your team directly at  %(organization)s. They'll be happy to help.", organization=user.organizations[0].name if user else "")}}
+                    </p>
+                    <div class="items-wrapper">
+                        <p><b>{{_("Please do not contact me about:")}}</b></p>
+                        <div class="items optout-domains-checkbox-list">
+                            <!-- <div class="item">
+                                <input type="checkbox">
+                                <span>anxious</span>
+                            </div>
+                            <div class="item">
+                                <input type="checkbox">
+                                <span>discouraged</span>
+                            </div>
+                            <div class="item">
+                                <input type="checkbox">
+                                <span>fatigue</span>
+                            </div>
+                            <div class="item">
+                                <input type="checkbox">
+                                <span>general pain</span>
+                            </div>
+                            <div class="item">
+                                <input type="checkbox">
+                                <span>insomnia</span>
+                            </div> -->
+                        </div>
+                    </div>
+                    <div class="error-message"></div>
+                    <div class="continue-container hide">
+                        <button class="btn btn-default continue-button">Continue</button>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <div>
+                        <button class="btn btn-empro-primary btn-submit">Submit</button>
+                        <button class="btn btn-default btn-dismiss">Dismiss</button>
+                    </div>
+                    <div class="saving-indicator-container hide"><i class="fa fa-spinner fa-spin"></i> {{_("Saving data...")}}</div>
+                </div>
+            </div>
+        </div>
+    </div>
+{%- endmacro -%}
 {%- macro empro_script() -%}
     <script src="{{ url_for('static', filename='js/dist/empro.bundle.js') }}" defer></script>
 {%- endmacro -%}

portal/migrations/versions/80c3b1e96c45_.py

@@ -1,14 +1,16 @@
 """Add sequential hard trigger count to EMPRO trigger_states.triggers domains.
 
 Revision ID: 80c3b1e96c45
-Revises: 2e9b9e696bb8
+Revises: 3c871e710277
 Create Date: 2023-07-24 17:08:35.128975
 
 """
 from collections import defaultdict
 from copy import deepcopy
 from alembic import op
 from io import StringIO
+from flask import current_app
+import logging
 from sqlalchemy.orm import sessionmaker
 from portal.database import db
 from portal.trigger_states.empro_domains import (
@@ -19,12 +21,48 @@
 
 # revision identifiers, used by Alembic.
 revision = '80c3b1e96c45'
-down_revision = '2e9b9e696bb8'
+down_revision = '3c871e710277'
 
 Session = sessionmaker()
 
+log = logging.getLogger("alembic.runtime.migration")
+log.setLevel(logging.DEBUG)
+
+
+def validate_users_trigger_states(session, patient_id):
+    """Confirm user has sequential visits in trigger states table.
+
+    Due to allowance of moving EMPRO consents and no previous checks,
+    some users on test have invalid overlapping trigger states rows.
+    """
+    ts_rows = session.query(TriggerState).filter(
+        TriggerState.user_id == patient_id).order_by(TriggerState.id)
+    month_counter = -1
+    for row in ts_rows:
+        if row.state == 'due':
+            # skipping months is okay, but every due should be sequentially greater than previous
+            if month_counter >= row.visit_month:
+                raise ValueError(f"{patient_id} expected month > {month_counter}, got {row.visit_month}")
+            month_counter = row.visit_month
+        else:
+            # states other than 'due' should be grouped together with same visit_month
+            if month_counter != row.visit_month:
+                raise ValueError(f"{patient_id} expected month {month_counter}, got {row.visit_month}")
+
+def purge_trigger_states(session, patient_id):
+    """Clean up test system problems from moving consent dates"""
+    log.info(f"Purging trigger states for {patient_id}")
+    session.query(TriggerState).filter(TriggerState.user_id == patient_id).delete()
+
 
 def upgrade():
+    # Add sequential counts to appropriate trigger_states rows.
+
+    # this migration was applied once before, but the code wasn't correctly
+    # maintaining the sequential counts.  start by removing all for a clean
+    # slate via the same `downgrade()` step
+    downgrade()
+
     # for each active EMPRO patient with at least 1 hard triggered domain,
     # walk through their monthly reports, adding the sequential count for
     # the opt-out feature.
@@ -42,6 +80,15 @@ def upgrade():
         # can't just send through current process, as it'll attempt to
         # insert undesired rows in the trigger_states table.  need to
         # add the sequential count to existing rows.
+        try:
+            validate_users_trigger_states(session, pid)
+        except ValueError as e:
+            if current_app.config.get('SYSTEM_TYPE') in ('development', 'test'):
+                purge_trigger_states(session, pid)
+                continue
+            else:
+                raise e
+
         output.write(f"\n\nPatient: {pid}  storing all zeros for sequential hard triggers except:\n")
         output.write("  (visit month : domain : # hard sequential)\n")
         sequential_by_domain = defaultdict(list)
@@ -54,9 +101,10 @@ def upgrade():
             for d in EMPRO_DOMAINS:
                 sequential_hard_for_this_domain = 0
                 if d not in improved_triggers["domain"]:
-                    # only seen on test, fill in the missing domain
-                    print(f"missing {d} in {pid}:{ts.visit_month}?")
-                    improved_triggers["domain"][d] = {}
+                    # shouldn't happen, SDC typically includes all domains
+                    # but a few records are lacking
+                    log.warning(f"{pid} missing domain {d} in {ts.visit_month} response")
+                    continue
 
                 if any(v == "hard" for v in improved_triggers["domain"][d].values()):
                     sequential_by_domain[d].append(ts.visit_month)
@@ -81,4 +129,36 @@ def upgrade():
 
 
 def downgrade():
-    pass  # no value in removing
+    # for each active EMPRO patient with at least 1 hard triggered domain,
+    # remove any sequential counts found
+    bind = op.get_bind()
+    session = Session(bind=bind)
+
+    patient_ids = []
+    for patient_id in session.execute(
+            "SELECT DISTINCT(user_id) FROM trigger_states JOIN users"
+            " ON users.id = user_id WHERE deleted_id IS NULL"):
+        patient_ids.append(patient_id[0])
+
+    output = StringIO()
+    for pid in patient_ids:
+        output.write(f"\n\nPatient: {pid}\n")
+        trigger_states = db.session.query(TriggerState).filter(
+            TriggerState.user_id == pid).filter(
+            TriggerState.state == "resolved").order_by(
+            TriggerState.timestamp.asc())
+        for ts in trigger_states:
+            improved_triggers = deepcopy(ts.triggers)
+            for d in EMPRO_DOMAINS:
+                if d not in improved_triggers["domain"]:
+                    log.warning(f"{d} missing from {ts.id}(month: {ts.visit_month}) for {pid}")
+                    continue
+                if sequential_hard_trigger_count_key in improved_triggers["domain"][d]:
+                    del improved_triggers["domain"][d][sequential_hard_trigger_count_key]
+                    output.write(f"  removed sequential from {ts.visit_month}:{d} {improved_triggers['domain'][d]}\n")
+
+            # retain triggers now containing sequential counts
+            ts.triggers = improved_triggers
+
+        db.session.commit()
+        print(output.getvalue())

portal/migrations/versions/d1f3ed8d16ef_.py

@@ -11,7 +11,7 @@
 
 # revision identifiers, used by Alembic.
 revision = 'd1f3ed8d16ef'
-down_revision = '80c3b1e96c45'
+down_revision = '2e9b9e696bb8'
 
 
 def upgrade():

portal/models/qb_status.py

@@ -520,7 +520,8 @@ def warn_on_duplicate_request(self, requested_set):
                 f" {requested_indef} already!")
 
 
-def patient_research_study_status(patient, ignore_QB_status=False):
+def patient_research_study_status(
+        patient, ignore_QB_status=False, as_of_date=None, skip_initiate=False):
     """Returns details regarding patient readiness for available studies
 
     Wraps complexity of checking multiple QB_Status and ResearchStudy
@@ -532,6 +533,8 @@ def patient_research_study_status(patient, ignore_QB_status=False):
     :param patient: subject to check
     :param ignore_QB_status: set to prevent recursive call, if used during
       process of evaluating QB_status.  Will restrict results to eligible
+    :param as_of_date: set to check status at alternative time
+    :param skip_initiate: set only when rebuilding to avoid state change
     :returns: dictionary of applicable studies keyed by research_study_id.
       Each contains a dictionary with keys:
      - eligible: set True if assigned to research study and pre-requisites
@@ -546,7 +549,8 @@ def patient_research_study_status(patient, ignore_QB_status=False):
     """
     from datetime import datetime
     from .research_study import EMPRO_RS_ID, ResearchStudy
-    as_of_date = datetime.utcnow()
+    if as_of_date is None:
+        as_of_date = datetime.utcnow()
 
     results = {}
     # check studies in required order - first found with pending work
@@ -601,7 +605,8 @@ def patient_research_study_status(patient, ignore_QB_status=False):
             elif rs_status['ready']:
                 # As user may have just entered ready status on EMPRO
                 # move trigger_states.state to due
-                from ..trigger_states.empro_states import initiate_trigger
-                initiate_trigger(patient.id)
+                if not skip_initiate:
+                    from ..trigger_states.empro_states import initiate_trigger
+                    initiate_trigger(patient.id)
 
     return results

portal/models/qb_timeline.py

@@ -374,7 +374,8 @@ def qbds_for_rp(rp, classification, trigger_date):
             )
             if curRPD.retired == nextRPD.retired:
                 raise ValueError(
-                    "Invalid state: multiple RPs w/ same retire date")
+                    "Invalid state: multiple RPs w/ same retire date: "
+                    f"{next_rp} : {curRPD.retired}")
         else:
             nextRPD = None
         yield curRPD, nextRPD