display client name as on the tag of the resource

intrahealth · May 31, 2021 · 967774f · 967774f
1 parent 6d88f7e
commit 967774f
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 63 deletions.
diff --git a/server/config/config_cicd_template.json b/server/config/config_cicd_template.json
@@ -51,13 +51,6 @@
     ],
     "systems": {
       "CRBaseURI": "http://openclientregistry.org/fhir",
-      "internalid": {
-        "uri": [
-          "http://health.go.ug/cr/internalid",
-          "http://clientregistry.org/openmrs"
-        ],
-        "displayName": "Internal ID"
-      },
       "nationalid": {
         "uri": "http://health.go.ug/cr/natioanlid",
         "displayName": "National ID"

diff --git a/server/config/config_development_template.json b/server/config/config_development_template.json
@@ -60,16 +60,6 @@
   ],
   "systems": {
     "CRBaseURI": "http://openclientregistry.org/fhir",
-    "internalid": {
-      "uri": [
-        "http://health.go.ug/cr/internalid",
-        "http://openmrs.org/openmrs2",
-        "http://clientregistry.org/openmrs",
-        "http://clientregistry.org/dhis2",
-        "http://clientregistry.org/lims"
-      ],
-      "displayName": "Internal ID"
-    },
     "nationalid": {
       "uri": "http://clientregistry.org/cr/natioanlid",
       "displayName": "National ID"

diff --git a/server/config/config_docker_template.json b/server/config/config_docker_template.json
@@ -51,13 +51,6 @@
     ],
     "systems": {
       "CRBaseURI": "http://openclientregistry.org/fhir",
-      "internalid": {
-        "uri": [
-          "http://health.go.ug/cr/internalid",
-          "http://clientregistry.org/openmrs"
-        ],
-        "displayName": "Internal ID"
-      },
       "nationalid": {
         "uri": "http://health.go.ug/cr/natioanlid",
         "displayName": "National ID"

diff --git a/server/config/config_production_template.json b/server/config/config_production_template.json
@@ -60,16 +60,6 @@
   ],
   "systems": {
     "CRBaseURI": "http://openclientregistry.org/fhir",
-    "internalid": {
-      "uri": [
-        "http://health.go.ug/cr/internalid",
-        "http://openmrs.org/openmrs2",
-        "http://clientregistry.org/openmrs",
-        "http://clientregistry.org/dhis2",
-        "http://clientregistry.org/lims"
-      ],
-      "displayName": "Internal ID"
-    },
     "nationalid": {
       "uri": "http://clientregistry.org/cr/natioanlid",
       "displayName": "National ID"

diff --git a/server/config/config_test_template.json b/server/config/config_test_template.json
@@ -60,16 +60,6 @@
   ],
   "systems": {
     "CRBaseURI": "http://openclientregistry.org/fhir",
-    "internalid": {
-      "uri": [
-        "http://health.go.ug/cr/internalid",
-        "http://openmrs.org/openmrs2",
-        "http://clientregistry.org/openmrs",
-        "http://clientregistry.org/dhis2",
-        "http://clientregistry.org/lims"
-      ],
-      "displayName": "Internal ID"
-    },
     "nationalid": {
       "uri": "http://clientregistry.org/cr/natioanlid",
       "displayName": "National ID"

diff --git a/server/gui/index.html b/server/gui/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/crux/favicon.ico><title>crux</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css><link href=/crux/css/chunk-vendors.9eec1691.css rel=preload as=style><link href=/crux/js/app.995584c7.js rel=preload as=script><link href=/crux/js/chunk-vendors.f0edaab5.js rel=preload as=script><link href=/crux/css/chunk-vendors.9eec1691.css rel=stylesheet></head><body><noscript><strong>We're sorry but crux doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/crux/js/chunk-vendors.f0edaab5.js></script><script src=/crux/js/app.995584c7.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/crux/favicon.ico><title>crux</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css><link href=/crux/css/chunk-vendors.9eec1691.css rel=preload as=style><link href=/crux/js/app.091cb127.js rel=preload as=script><link href=/crux/js/chunk-vendors.f0edaab5.js rel=preload as=script><link href=/crux/css/chunk-vendors.9eec1691.css rel=stylesheet></head><body><noscript><strong>We're sorry but crux doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/crux/js/chunk-vendors.f0edaab5.js></script><script src=/crux/js/app.091cb127.js></script></body></html>
diff --git a/server/gui/js/app.091cb127.js b/server/gui/js/app.091cb127.js
diff --git a/server/gui/js/app.091cb127.js.map b/server/gui/js/app.091cb127.js.map
diff --git a/server/gui/js/app.995584c7.js b/server/gui/js/app.995584c7.js
diff --git a/server/gui/js/app.995584c7.js.map b/server/gui/js/app.995584c7.js.map
diff --git a/server/lib/mixins/matchMixin.js b/server/lib/mixins/matchMixin.js
@@ -976,7 +976,7 @@ const addPatient = (clientID, patientsBundle, callback) => {
 
     // Tag this patient with an ID of the system that submitted
     const tagExist = newPatient.resource.meta && newPatient.resource.meta.tag && newPatient.resource.meta.tag.find((tag) => {
-      return tag.system === URI(config.get("systems:CRBaseURI")).segment('clientid').toString();
+      return tag.system === "http://openclientregistry.org/fhir/clientid";
     });
     if (!tagExist) {
       if (!newPatient.resource.meta) {

diff --git a/server/lib/routes/match.js b/server/lib/routes/match.js
@@ -1169,7 +1169,6 @@ router.get(`/get-match-issues`, (req, res) => {
     query: `_tag=${matchIssuesURI}|potentialMatches,${matchIssuesURI}|conflictMatches`,
     noCaching: true
   }, (issues) => {
-    const internalIdURI = config.get("systems:internalid:uri");
     let reviews = [];
     for(let entry of issues.entry) {
       let name = entry.resource.name.find((name) => {

diff --git a/ui/src/views/Client.vue b/ui/src/views/Client.vue
@@ -524,15 +524,12 @@ export default {
                   let clientUserId;
                   if (patient.meta && patient.meta.tag) {
                     for (let tag of patient.meta.tag) {
-                      if (
-                        tag.system ===
-                        "http://openclientregistry.org/fhir/clientid"
-                      ) {
+                      if (tag.system === "http://openclientregistry.org/fhir/clientid") {
                         clientUserId = tag.code;
+                        systemName = tag.display;
                       }
                     }
                   }
-                  systemName = this.getClientDisplayName(clientUserId);
                   let identifiers = [];
                   if (patient.identifier) {
                     for (let id of patient.identifier) {
@@ -619,15 +616,12 @@ export default {
                   let clientUserId;
                   if (patient.meta && patient.meta.tag) {
                     for (let tag of patient.meta.tag) {
-                      if (
-                        tag.system ===
-                        "http://openclientregistry.org/fhir/clientid"
-                      ) {
+                      if (tag.system === "http://openclientregistry.org/fhir/clientid") {
                         clientUserId = tag.code;
+                        systemName = tag.display;
                       }
                     }
                   }
-                  systemName = this.getClientDisplayName(clientUserId);
                   let identifiers = [];
                   if (patient.identifier) {
                     for (let id of patient.identifier) {

diff --git a/ui/vue.config.js b/ui/vue.config.js
@@ -6,17 +6,17 @@ module.exports = {
     host: "localhost",
     proxy: {
       "/ocrux": {
-        target: "https://localhost:3000",
+        target: "http://localhost:3000",
         secure: false,
         changeOrigin: true
       },
       "/fhir": {
-        target: "https://localhost:3000",
+        target: "http://localhost:3000",
         secure: false,
         changeOrigin: true
       },
       "/tmp": {
-        target: "https://localhost:3000",
+        target: "http://localhost:3000",
         secure: false,
         changeOrigin: true
       }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/crux/favicon.ico><title>crux</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css><link href=/crux/css/chunk-vendors.9eec1691.css rel=preload as=style><link href=/crux/js/app.995584c7.js rel=preload as=script><link href=/crux/js/chunk-vendors.f0edaab5.js rel=preload as=script><link href=/crux/css/chunk-vendors.9eec1691.css rel=stylesheet></head><body><noscript><strong>We're sorry but crux doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/crux/js/chunk-vendors.f0edaab5.js></script><script src=/crux/js/app.995584c7.js></script></body></html>
		<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/crux/favicon.ico><title>crux</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css><link href=/crux/css/chunk-vendors.9eec1691.css rel=preload as=style><link href=/crux/js/app.091cb127.js rel=preload as=script><link href=/crux/js/chunk-vendors.f0edaab5.js rel=preload as=script><link href=/crux/css/chunk-vendors.9eec1691.css rel=stylesheet></head><body><noscript><strong>We're sorry but crux doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/crux/js/chunk-vendors.f0edaab5.js></script><script src=/crux/js/app.091cb127.js></script></body></html>