Merge branch 'release/v18.3.28'

uwcirg · Mar 30, 2018 · 44da866 · 44da866
2 parents be1de52 + 7f17b06
commit 44da866
Show file tree

Hide file tree

Showing 89 changed files with 7,010 additions and 2,793 deletions.
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
@@ -48,6 +48,7 @@ services:
     image: "${DOCKER_REPOSITORY-uwcirg-portal-docker.jfrog.io/}${DOCKER_IMAGE_NAME:-portal_web}:${DOCKER_IMAGE_TAG:-latest}"
     command: bash -c '
       env &&
+      wait-for-it --timeout=120 --host="web" --port="$$PORT" --strict &&
       celery beat
         --app portal.celery_worker.celery
         --schedule=/tmp/celerybeat-schedule.db
@@ -56,6 +57,10 @@ services:
       '
     environment:
       - REDIS_URL=${REDIS_URL:-redis://redis:6379/0}
+      - PGUSER=${PGUSER:-postgres}
+      - PGPASSWORD=${PGPASSWORD:-""}
+      - PGHOST=${PGHOST:-db}
+      - PGDATABASE=${PGDATABASE:-portaldb}
     volumes:
       - source: ../instance
         target: "${PROJECT_DIR:-/opt/venvs/portal}/var/portal-instance/"

diff --git a/portal/config/eproms/AccessStrategy.json b/portal/config/eproms/AccessStrategy.json
@@ -9,6 +9,54 @@
       "intervention_name": "assessment_engine",
       "name": "fix assessment_engine link_url and update on completion",
       "resourceType": "AccessStrategy"
+    },
+    {
+      "description": "Confirm patient associated with an org with self_management identifier",
+      "function_details": {
+        "function": "combine_strategies",
+        "kwargs": [
+          {
+            "name": "combinator",
+            "value": "all"
+          },
+          {
+            "name": "strategy_1",
+            "value": "in_role_list"
+          },
+          {
+            "name": "strategy_1_kwargs",
+            "value": [
+              {
+                "name": "role_list",
+                "value": [
+                  "patient"
+                ]
+              }
+            ]
+          },
+          {
+            "name": "strategy_2",
+            "value": "limit_by_clinic_w_id"
+          },
+          {
+            "name": "strategy_2_kwargs",
+            "value": [
+              {
+                "name": "identifier_value",
+                "value": "self_management"
+              },
+              {
+                "name": "identifier_system",
+                "value": "http://us.truenth.org/identity-codes/symptom-tracker-group"
+              }
+            ]
+          }
+        ]
+      },
+      "id": 1001,
+      "intervention_name": "self_management",
+      "name": "Self Management Strategy",
+      "resourceType": "AccessStrategy"
     }
   ],
   "id": "SitePersistence v0.2",
@@ -21,4 +69,4 @@
   },
   "resourceType": "Bundle",
   "type": "document"
-}
+}
diff --git a/portal/config/eproms/AppText.json b/portal/config/eproms/AppText.json
@@ -157,17 +157,22 @@
     },
     {
       "custom_text": "{config[LR_ORIGIN]}/c/portal/truenth/asset/mail?version=latest&uuid=9d2bc012-aca4-975b-6f3c-1c6ddfb66c82",
-      "name": "profileSendEmail invite email",
+      "name": "patient invite email",
       "resourceType": "AppText"
     },
     {
       "custom_text": "{config[LR_ORIGIN]}/c/portal/truenth/asset/mail?version=latest&uuid=d6b8a195-b34e-8c0f-c611-d990f9c42f23",
-      "name": "profileSendEmail invite email IRONMAN",
+      "name": "patient invite email IRONMAN",
       "resourceType": "AppText"
     },
     {
       "custom_text": "{config[LR_ORIGIN]}/c/portal/truenth/asset/mail?version=latest&uuid=9d2bc012-aca4-975b-6f3c-1c6ddfb66c82",
-      "name": "profileSendEmail invite email TrueNTH Global Registry",
+      "name": "patient invite email TrueNTH Global Registry",
+      "resourceType": "AppText"
+    },
+    {
+      "custom_text": "{config[LR_ORIGIN]}/c/portal/truenth/asset/mail?version=latest&uuid=8e562c71-e77e-8eb3-7716-152da4a59a32",
+      "name": "patient reminder email",
       "resourceType": "AppText"
     },
     {
@@ -231,4 +236,4 @@
   },
   "resourceType": "Bundle",
   "type": "document"
-}
+}
diff --git a/portal/config/eproms/Coding.json b/portal/config/eproms/Coding.json
@@ -6050,31 +6050,37 @@
     },
     {
       "code": "en_AU",
-      "display": "Australian English",
+      "display": "English (Australia)",
+      "resourceType": "Coding",
+      "system": "urn:ietf:bcp:47"
+    },
+    {
+      "code": "en_GB",
+      "display": "English (United Kingdom)",
       "resourceType": "Coding",
       "system": "urn:ietf:bcp:47"
     },
     {
       "code": "en_US",
-      "display": "American English",
+      "display": "English (United States)",
       "resourceType": "Coding",
       "system": "urn:ietf:bcp:47"
     },
     {
       "code": "de_CH",
-      "display": "Swiss German",
+      "display": "German (Switzerland)",
       "resourceType": "Coding",
       "system": "urn:ietf:bcp:47"
     },
     {
       "code": "es_US",
-      "display": "American Spanish",
+      "display": "Spanish (United States)",
       "resourceType": "Coding",
       "system": "urn:ietf:bcp:47"
     },
     {
       "code": "fr_CA",
-      "display": "Canadian French",
+      "display": "French (Canada)",
       "resourceType": "Coding",
       "system": "urn:ietf:bcp:47"
     },

diff --git a/portal/config/eproms/Intervention.json b/portal/config/eproms/Intervention.json
@@ -7,6 +7,7 @@
       "name": "assessment_engine",
       "public_access": true,
       "resourceType": "Intervention",
+      "subscribed_events": 1,
       "status_text": ""
     },
     {
@@ -15,13 +16,15 @@
       "link_label": "Care Plan",
       "name": "care_plan",
       "public_access": false,
+      "subscribed_events": 1,
       "resourceType": "Intervention"
     },
     {
       "card_html": "Community of Wellness",
       "description": "Community of Wellness",
       "name": "community_of_wellness",
       "public_access": false,
+      "subscribed_events": 1,
       "resourceType": "Intervention"
     },
     {
@@ -31,13 +34,15 @@
       "link_label": "Go to Decision Support",
       "name": "decision_support_p3p",
       "public_access": false,
+      "subscribed_events": 1,
       "resourceType": "Intervention"
     },
     {
       "card_html": "Decision Support WiserCare",
       "description": "Decision Support WiserCare",
       "name": "decision_support_wisercare",
       "public_access": false,
+      "subscribed_events": 1,
       "resourceType": "Intervention"
     },
     {
@@ -46,6 +51,7 @@
       "name": "default",
       "public_access": false,
       "resourceType": "Intervention",
+      "subscribed_events": 1,
       "status_text": ""
     },
     {
@@ -56,6 +62,7 @@
       "name": "self_management",
       "public_access": false,
       "resourceType": "Intervention",
+      "subscribed_events": 1,
       "status_text": ""
     },
     {
@@ -65,13 +72,22 @@
       "name": "sexual_recovery",
       "public_access": false,
       "resourceType": "Intervention",
+      "subscribed_events": 1,
       "status_text": ""
     },
     {
       "card_html": "Social Support Network",
       "description": "Social Support Network",
       "name": "social_support",
       "public_access": false,
+      "subscribed_events": 1,
+      "resourceType": "Intervention"
+    },
+    {
+      "description": "MUSIC Integration",
+      "name": "music",
+      "public_access": false,
+      "subscribed_events": 3,
       "resourceType": "Intervention"
     }
   ],
@@ -85,4 +101,4 @@
   },
   "resourceType": "Bundle",
   "type": "document"
-}
+}