From 528e938e454f6c11ec6b620ce651cc6fb634ec2a Mon Sep 17 00:00:00 2001 From: Wikum Weerakutti Date: Thu, 3 Oct 2024 00:58:08 +0530 Subject: [PATCH] Prevent 'null' from displaying in the 'Found similar people' table. (#203) --- .../scripts/dojo/src/widget/openmrs/OpenmrsSearch.js | 4 +--- .../scripts/dojo/src/widget/openmrs/PersonSearch.js | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/omod/src/main/webapp/resources/scripts/dojo/src/widget/openmrs/OpenmrsSearch.js b/omod/src/main/webapp/resources/scripts/dojo/src/widget/openmrs/OpenmrsSearch.js index a20a45ca..717aa7ca 100644 --- a/omod/src/main/webapp/resources/scripts/dojo/src/widget/openmrs/OpenmrsSearch.js +++ b/omod/src/main/webapp/resources/scripts/dojo/src/widget/openmrs/OpenmrsSearch.js @@ -475,9 +475,7 @@ dojo.widget.defineWidget( noCell: function() { - var td = document.createElement("td"); - td.style.display = "none"; - return td; + return document.createElement("td"); }, getNumber: function(searchHit) { diff --git a/omod/src/main/webapp/resources/scripts/dojo/src/widget/openmrs/PersonSearch.js b/omod/src/main/webapp/resources/scripts/dojo/src/widget/openmrs/PersonSearch.js index 89b66ad3..1361fec0 100644 --- a/omod/src/main/webapp/resources/scripts/dojo/src/widget/openmrs/PersonSearch.js +++ b/omod/src/main/webapp/resources/scripts/dojo/src/widget/openmrs/PersonSearch.js @@ -67,9 +67,9 @@ dojo.widget.defineWidget( } }, - getGiven : function(p) { return p.givenName == null ? this.noCell() : p.givenName; }, - getMiddle: function(p) { return p.middleName == null ? this.noCell() : p.middleName; }, - getFamily: function(p) { return p.familyName == null ? this.noCell() : p.familyName; }, + getGiven : function(p) { return p.givenName == null || p.givenName === "null" ? this.noCell() : p.givenName; }, + getMiddle: function(p) { return p.middleName == null || p.middleName === "null" ? this.noCell() : p.middleName; }, + getFamily: function(p) { return p.familyName == null || p.familyName === "null" ? this.noCell() : p.familyName; }, getGender: function(p) { if (p.gender == null) { return this.noCell(); }