Merge branch 'feat/836-add-additional-sisx' into develop

Author: JonathanWillitts

CHANGES

@@ -6,6 +6,8 @@ unreleased
 - fix issues where addition of some unscheduled visits could result in
   a server error when trying to render subject's dashboard
   (#798, #807, #824, #827, #829, #830, #831)
+- add additional symptom choices to Signs and Symptoms form, update
+  rm792 sx 'other' field reports (#836)
 - fix Signs and Symptoms and Vital Signs forms unavailable with
   Auditor/read-only role (#839)
 - update use of format_html for DJ6

effect_lists/list_data.py

@@ -213,6 +213,7 @@
     "effect_lists.sisx": [
         (NOT_APPLICABLE, "--Not applicable"),
         ("abdominal_cramps", "Abdominal cramps"),
+        ("abdominal_distention", "Abdominal distention"),
         ("abdominal_pain", "Abdominal pain"),
         ("back_pain_lp_site", "Back pain at LP site"),
         ("backache", "Backache"),
@@ -224,13 +225,18 @@
         ("dizziness", "Dizziness"),
         ("double_vision", "Double vision"),
         ("drowsiness", "Drowsiness"),
+        ("dry_mouth", "Dry mouth"),
+        ("dry_skin", "Dry skin"),
         ("fatigue_malaise", "Fatigue/malaise"),
         ("fever", "Fever"),
         ("focal_weakness", "Focal weakness"),
         ("general_weakness", "General weakness"),
         (HEADACHE, "Headache"),
         ("hearing_loss", "Hearing loss"),
+        ("increased_appetite", "Increased appetite"),
+        ("insomnia", "Insomnia"),
         ("itching", "Itching"),
+        ("itchy_eyes", "Itchy eyes"),
         ("jaundice", "Jaundice"),
         ("loss_appetite", "Loss of appetite"),
         ("luts", "Lower urinary tract symptoms (LUTS)"),
@@ -260,9 +266,11 @@
             "Neuro - Other focal neurologic deficit, please specify below ...",
         ),
         ("neuromuscular_weakness", "Neuromuscular weakness"),
+        ("palpitations", "Palpitations"),
         ("peripheral_neuropathy", "Peripheral neuropathy"),
         ("pleuritic_chest_pain", "Pleuritic chest pain"),
         ("rash", "Rash"),
+        ("rhinorrhoea", "Rhinorrhoea (runny nose)"),
         ("shortness_of_breath", "Shortness of breath"),
         ("skin_lesions", "Skin lesions"),
         (VISUAL_LOSS, "Visual loss"),

effect_reports/admin/unmanaged/rm792_kw_in_current_sx_gte_g3_other_admin.py

@@ -32,7 +32,8 @@ class Rm792KwInCurrentSxGteG3OtherAdmin(
         "{html}",
         html=mark_safe(
             render_to_string(
-                "effect_reports/in_current_sx_gte_g3_other/changelist_note.html", {}
+                "effect_reports/rm792_kw_in_sx_other/changelist_note.html",
+                context=dict(other_field="current_sx_gte_g3_other"),
             )
         ),  # nosec #B703 # B308
     )

effect_reports/admin/unmanaged/rm792_kw_in_current_sx_other_admin.py

@@ -31,7 +31,10 @@ class Rm792KwInCurrentSxOtherAdmin(
     change_list_note = format_html(
         "{html}",
         html=mark_safe(
-            render_to_string("effect_reports/in_current_sx_other/changelist_note.html", {})
+            render_to_string(
+                "effect_reports/rm792_kw_in_sx_other/changelist_note.html",
+                context=dict(other_field="current_sx_other"),
+            )
         ),  # nosec #B703 # B308
     )
 

effect_reports/admin/unmanaged/rm792_si_sx_list_candidates.py

@@ -21,7 +21,10 @@ class Rm792SiSxListCandidatesAdmin(
     change_list_note = format_html(
         "{html}",
         html=mark_safe(
-            render_to_string("effect_reports/sisx_list_candidates/changelist_note.html", {})
+            render_to_string(
+                "effect_reports/rm792_kw_in_sx_other/changelist_note.html",
+                context=dict(other_field="current_sx_other"),
+            )
         ),  # nosec #B703 # B308
     )
 

effect_reports/migrations/0012_update_rm792_views.py

@@ -25,4 +25,11 @@ class Migration(migrations.Migration):
                 app_name="effect_reports",
             )
         ),
+        migrations.RunSQL("drop view if exists rm792_si_sx_list_candidates"),
+        migrations.RunSQL(
+            read_unmanaged_model_sql(
+                "rm792_si_sx_list_candidates.sql",
+                app_name="effect_reports",
+            )
+        ),
     ]

effect_reports/models/unmanaged/rm792_kw_in_current_sx_gte_g3_other.sql

@@ -24,13 +24,21 @@ where
     or `current_sx_gte_g3_other` like '%conf%'
     or `current_sx_gte_g3_other` like '%consti%'
     or `current_sx_gte_g3_other` like '%diar%'
+    or `current_sx_gte_g3_other` like '%disten%'
     or `current_sx_gte_g3_other` like '%diz%'
+    or `current_sx_gte_g3_other` like '%dry%'
     or `current_sx_gte_g3_other` like '%fatig%'
-    or `current_sx_gte_g3_other` like '%itchy%'
+    or `current_sx_gte_g3_other` like '%insom%'
+    or `current_sx_gte_g3_other` like '%itch%'
     or `current_sx_gte_g3_other` like '%mala%'
+    or `current_sx_gte_g3_other` like '%nasal%'
     or `current_sx_gte_g3_other` like '%neuro%'
+    or `current_sx_gte_g3_other` like '%nose%'
+    or `current_sx_gte_g3_other` like '%palp%'
     or `current_sx_gte_g3_other` like '%pleur%'
     or `current_sx_gte_g3_other` like '%rash%'
+    or `current_sx_gte_g3_other` like '%rhin%'
+    or `current_sx_gte_g3_other` like '%run%'
     or `current_sx_gte_g3_other` like '%urin%'
     or `current_sx_gte_g3_other` like '%weak%'
 order by

effect_reports/models/unmanaged/rm792_kw_in_current_sx_other.sql

@@ -24,13 +24,21 @@ where
     or `current_sx_other` like '%conf%'
     or `current_sx_other` like '%consti%'
     or `current_sx_other` like '%diar%'
+    or `current_sx_other` like '%disten%'
     or `current_sx_other` like '%diz%'
+    or `current_sx_other` like '%dry%'
     or `current_sx_other` like '%fatig%'
-    or `current_sx_other` like '%itchy%'
+    or `current_sx_other` like '%insom%'
+    or `current_sx_other` like '%itch%'
     or `current_sx_other` like '%mala%'
+    or `current_sx_other` like '%nasal%'
     or `current_sx_other` like '%neuro%'
+    or `current_sx_other` like '%nose%'
+    or `current_sx_other` like '%palp%'
     or `current_sx_other` like '%pleur%'
     or `current_sx_other` like '%rash%'
+    or `current_sx_other` like '%rhin%'
+    or `current_sx_other` like '%run%'
     or `current_sx_other` like '%urin%'
     or `current_sx_other` like '%weak%'
 order by

effect_reports/models/unmanaged/rm792_si_sx_list_candidates.sql

@@ -11,16 +11,29 @@ from
     effect_subject_signsandsymptoms as crf
         left join effect_subject_subjectvisit as sv on crf.subject_visit_id = sv.id
 where
-    current_sx_other like '%abdom%'
-    or current_sx_other like '%appet%'
-    or current_sx_other like '%back%'
-    or current_sx_other like '%behav%'
-    or current_sx_other like '%conf%'
-    or current_sx_other like '%diz%'
-    or current_sx_other like '%itchy%'
-    or current_sx_other like '%neuro%'
-    or current_sx_other like '%pleur%'
-    or current_sx_other like '%rash%'
-    or current_sx_other like '%urin%'
+    `current_sx_other` like '%abdom%'
+    or `current_sx_other` like '%appet%'
+    or `current_sx_other` like '%back%'
+    or `current_sx_other` like '%behav%'
+    or `current_sx_other` like '%conf%'
+    or `current_sx_other` like '%consti%'
+    or `current_sx_other` like '%diar%'
+    or `current_sx_other` like '%disten%'
+    or `current_sx_other` like '%diz%'
+    or `current_sx_other` like '%dry%'
+    or `current_sx_other` like '%fatig%'
+    or `current_sx_other` like '%insom%'
+    or `current_sx_other` like '%itch%'
+    or `current_sx_other` like '%mala%'
+    or `current_sx_other` like '%nasal%'
+    or `current_sx_other` like '%neuro%'
+    or `current_sx_other` like '%nose%'
+    or `current_sx_other` like '%palp%'
+    or `current_sx_other` like '%pleur%'
+    or `current_sx_other` like '%rash%'
+    or `current_sx_other` like '%rhin%'
+    or `current_sx_other` like '%run%'
+    or `current_sx_other` like '%urin%'
+    or `current_sx_other` like '%weak%'
 order by
     current_sx_other);

effect_reports/templates/effect_reports/in_current_sx_gte_g3_other/changelist_note.html

@@ -0,0 +1,31 @@
+<p>
+    Dynamic report listing <strong>Signs and Symptoms</strong> CRFs
+    where <em>`{{ other_field }}`</em> contains one or more of the
+    following terms:
+</p>
+<ul style='columns: 4; -webkit-columns: 4; -moz-columns: 4; max-width: 250px;'>
+    <li>abdom</li>
+    <li>appet</li>
+    <li>back</li>
+    <li>behav</li>
+    <li>conf</li>
+    <li>consti</li>
+    <li>diar</li>
+    <li>disten</li>
+    <li>diz</li>
+    <li>dry</li>
+    <li>fatig</li>
+    <li>insom</li>
+    <li>itch</li>
+    <li>mala</li>
+    <li>nasal</li>
+    <li>neuro</li>
+    <li>nose</li>
+    <li>palp</li>
+    <li>pleur</li>
+    <li>rash</li>
+    <li>rhin</li>
+    <li>run</li>
+    <li>urin</li>
+    <li>weak</li>
+</ul>