fix text, styling fix

uwcirg · Mar 25, 2024 · d807981 · d807981
1 parent ff83aae
commit d807981
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/portal/static/js/src/profile.js b/portal/static/js/src/profile.js
@@ -6,7 +6,7 @@ import ProcApp from "./modules/Procedures.js";
 import Utility from "./modules/Utility.js";
 import ClinicalQuestions from "./modules/ClinicalQuestions.js";
 import Consent from "./modules/Consent.js";
-import {sortArrayByField} from "./modules/Utility.js";
+import {sortArrayByField, getUrlParameter} from "./modules/Utility.js";
 import {
   EPROMS_SUBSTUDY_ID,
   EPROMS_SUBSTUDY_TITLE,
@@ -1478,7 +1478,11 @@ export default (function() {
             },
             getSubStudyOptoutDomainsDisplay: function() {
                 if (!this.hasSubStudyOptOutDomains()) return "";
-                return this.subStudyTriggers.optout_domains.map((item) => item.replace(/_/g, ' ')).join(", ");
+                const arrOptoutDomains = this.subStudyTriggers.optout_domains;
+                if (!arrOptoutDomains || !arrOptoutDomains.length) return "";
+                return arrOptoutDomains.map(
+                    (item) => item.replace(/_/g, " ")
+                ).join(", ");
             },
             setPrevPostTxResponses: function(qnrId) {
                 if (!qnrId) {
@@ -1566,6 +1570,9 @@ export default (function() {
                 if (!this.subStudyTriggers.data || !this.subStudyTriggers.data.action_state) {
                     return "";
                 }
+                const paramActionState = getUrlParameter("trigger_action_state");
+                // for debugging
+                if (paramActionState) return paramActionState.toLowerCase();
                 return String(this.subStudyTriggers.data.action_state).toLowerCase();
             },
             hasMissedPostTxAction: function() {
@@ -1658,6 +1665,7 @@ export default (function() {
                              *  if the triggers are considered proccessed. check to see if they have been resolved
                              */
                             if (
+                                self.subStudyTriggers.data &&
                                 self.subStudyTriggers.data.resolution &&
                                 self.subStudyTriggers.data.resolution.qnr_id
                             ){

diff --git a/portal/static/less/eproms.less b/portal/static/less/eproms.less
@@ -3931,6 +3931,9 @@ section.header {
   #noTriggersSection {
     .item {
       margin-bottom: 8px;
+      p {
+        line-height: 1.45;
+      }
     }
     margin-bottom: 4px;
     border-bottom: 1px solid darken(@muterColor, 10%);

diff --git a/portal/templates/profile/profile_macros.html b/portal/templates/profile/profile_macros.html
@@ -874,9 +874,9 @@ <h4 class="text-muted">{% if person and person.username %}{{ _("for") + " " + pe
 {% macro postInterventionOptoutDomains() %}
     <div class="item text-warning" v-if="hasSubStudyOptOutDomains()">
         <p>
-            {{_("<b>NOTE</b>: The participant has chosen not to be contacted about some issues.")}}
+            {{_("<b>NOTE</b>: The participant has chosen <em>not</em> to be contacted about some issues.")}}
             <br/>
-            {{_("High distressed areas (<u>Do not contact</u>): ")}}
+            {{_("High distressed areas ( <em>Do not contact</em> ): ")}}
             <span v-text="getSubStudyOptoutDomainsDisplay()"></span>
         </p>
     </div>
@@ -911,7 +911,7 @@ <h5 class="muted" v-show="!isSubStudyTriggersResolved()">{{_("Actions Required (
                             <span class="text" v-text="getLastSubStudyAssessmentDate()"></span>
                         </div>
                         <!-- IF no triggers are indicated, ONLY display as such for assessment that has been COMPLETED, as triggers aren't calculated yet for assessment still in progress -->
-                        <div class="item text-muted" v-show="isSubStudyAssessmentCompleted()">{{_("No high distress areas indicated")}}</div>
+                        <div class="item text-muted" v-show="isSubStudyAssessmentCompleted()">{{_("No action required")}}</div>
                         {{postInterventionOptoutDomains()}}
                     </div>
                 </div>