From 40f19e2bfa10efd4b7b978e9cf9d1eb3f8ae7d91 Mon Sep 17 00:00:00 2001
From: mahaomolise92 <mm5666@cumc.columbia.edu>
Date: Tue, 9 Mar 2021 12:17:39 +0200
Subject: [PATCH 1/2] separated name and surname when searching patients

---
 ui/app/i18n/registration/locale_en.json             |  6 ++++--
 .../controllers/searchPatientController.js          | 13 +++++++++++--
 ui/app/registration/services/patientService.js      | 10 ++++++----
 ui/app/registration/views/search.html               |  6 +++---
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/ui/app/i18n/registration/locale_en.json b/ui/app/i18n/registration/locale_en.json
index 4835d8aa3..9cf2619f2 100644
--- a/ui/app/i18n/registration/locale_en.json
+++ b/ui/app/i18n/registration/locale_en.json
@@ -50,11 +50,13 @@
   "REGISTRATION_LABEL_VALID_PATIENT_IDENTIFIER":"Please enter a valid patient identifier",
   "REGISTRATION_LABEL_PROVIDER_AUTOCOMPLETE_LIST":"Please select a provider from the autocomplete list",
   "REGISTRATION_LABEL_PATIENT_AUTOCOMPLETE_LIST":"Please select a patient from the autocomplete list",
-  "REGISTRATION_LABEL_ENTER_NAME":"Enter Name",
+  "REGISTRATION_LABEL_ENTER_NAME":"Enter First Name",
+  "REGISTRATION_LABEL_ENTER_LAST_NAME":"Enter Last Name",
   "REGISTRATION_LABEL_PERSON_NOT_FOUND":"Person not found",
   "REGISTRATION_LABEL_PATIENT_ID":"ID",
   "REGISTRATION_LABEL_SEARCH":"Search",
-  "REGISTRATION_LABEL_NAME":"Name",
+  "REGISTRATION_LABEL_NAME":"First Name",
+  "REGISTRATION_LABEL_LAST_NAME":"Last Name",
   "REGISTRATION_LABEL_ID":"ID",
   "REGISTRATION_LABEL_NO_RESULTS":"No more results",
   "REGISTRATION_LABEL_SUMMARY":"Summary",
diff --git a/ui/app/registration/controllers/searchPatientController.js b/ui/app/registration/controllers/searchPatientController.js
index 9fd0f892d..3ac2069d1 100644
--- a/ui/app/registration/controllers/searchPatientController.js
+++ b/ui/app/registration/controllers/searchPatientController.js
@@ -55,6 +55,7 @@ angular.module('bahmni.registration')
 
             var hasSearchParameters = function () {
                 return $scope.searchParameters.name.trim().length > 0 ||
+                    $scope.searchParameters.last_name.trim().length > 0 ||
                     $scope.searchParameters.addressFieldValue.trim().length > 0 ||
                     $scope.searchParameters.customAttribute.trim().length > 0 ||
                     $scope.searchParameters.programAttributeFieldValue.trim().length > 0 ||
@@ -71,6 +72,7 @@ angular.module('bahmni.registration')
                 var searchParameters = $location.search();
                 $scope.searchParameters.addressFieldValue = searchParameters.addressFieldValue || '';
                 $scope.searchParameters.name = searchParameters.name || '';
+                $scope.searchParameters.last_name = searchParameters.last_name || '';
                 $scope.searchParameters.customAttribute = searchParameters.customAttribute || '';
                 $scope.searchParameters.programAttributeFieldValue = searchParameters.programAttributeFieldValue || '';
                 $scope.searchParameters.addressSearchResultsConfig = searchParameters.addressSearchResultsConfig || '';
@@ -83,6 +85,7 @@ angular.module('bahmni.registration')
                         searching = true;
                         var searchPromise = patientService.search(
                             $scope.searchParameters.name,
+                            $scope.searchParameters.last_name,                            
                             undefined,
                             $scope.addressSearchConfig.field,
                             $scope.searchParameters.addressFieldValue,
@@ -110,6 +113,7 @@ angular.module('bahmni.registration')
                         searching = true;
                         var searchPromise = patientService.searchHIE(
                             $scope.searchParameters.name,
+                            $scope.searchParameters.last_name,
                             undefined,
                             $scope.searchParameters.nationalId,
                             $scope.searchParameters.gender,
@@ -130,7 +134,7 @@ angular.module('bahmni.registration')
                                 $scope.noResultsMessage = null;
                                 
                             } else {
-                                $scope.noResultsMessage = 'testing not found message ';
+                                $scope.noResultsMessage = 'REGISTRATION_LABEL_COULD_NOT_FIND_PATIENT';
                             }
                         });
 
@@ -305,11 +309,14 @@ angular.module('bahmni.registration')
 
                 if ($scope.option.selected == "national") {
                     disabled = !$scope.searchParameters.name && !$scope.searchParameters.addressFieldValue
+                    && !$scope.searchParameters.last_name
+                    && !$scope.searchParameters.addressFieldValue
                     && !$scope.searchParameters.customAttribute
                     && !$scope.searchParameters.programAttributeFieldValue
                     && !$scope.searchParameters.nationalIdNumber;
                 } else if ($scope.option.selected == "local") {
                     disabled = !$scope.searchParameters.name && !$scope.searchParameters.addressFieldValue
+                    && !$scope.searchParameters.last_name
                     && !$scope.searchParameters.customAttribute
                     && !$scope.searchParameters.programAttributeFieldValue;
                 }
@@ -334,7 +341,6 @@ angular.module('bahmni.registration')
                 $scope.hieresults = [];
 
                 var patientIdentifier = $scope.searchParameters.registrationNumber;
-                debugger;
                 $location.search({
                     registrationNumber: $scope.searchParameters.registrationNumber,
                     programAttributeFieldName: $scope.programAttributesSearchConfig.field,
@@ -434,6 +440,9 @@ angular.module('bahmni.registration')
                 if ($scope.searchParameters.name) {
                     queryParams.name = $scope.searchParameters.name;
                 }
+                if ($scope.searchParameters.last_name) {
+                    queryParams.last_name = $scope.searchParameters.last_name;
+                }
                 if ($scope.searchParameters.addressFieldValue) {
                     queryParams.addressFieldValue = $scope.searchParameters.addressFieldValue;
                 }
diff --git a/ui/app/registration/services/patientService.js b/ui/app/registration/services/patientService.js
index f216d3f69..b3ef3cac3 100644
--- a/ui/app/registration/services/patientService.js
+++ b/ui/app/registration/services/patientService.js
@@ -5,12 +5,13 @@ angular.module('bahmni.registration')
         var openmrsUrl = Bahmni.Registration.Constants.openmrsUrl;
         var baseOpenMRSRESTURL = Bahmni.Registration.Constants.baseOpenMRSRESTURL;
 
-        var search = function (query, identifier, addressFieldName, addressFieldValue, customAttributeValue,
+        var search = function (query, surname, identifier, addressFieldName,  addressFieldValue, customAttributeValue,
                                offset, customAttributeFields, programAttributeFieldName, programAttributeFieldValue, addressSearchResultsConfig,
                                patientSearchResultsConfig, filterOnAllIdentifiers) {
             var config = {
                 params: {
-                    q: query,
+                    q: query + " " + surname,
+                    surname: surname,
                     identifier: identifier,
                     s: "byIdOrNameOrVillage",
                     addressFieldName: addressFieldName,
@@ -29,13 +30,14 @@ angular.module('bahmni.registration')
             };
             return patientServiceStrategy.search(config);
         };
-        var searchHIE = function (query, identifier, nationalId, gender, addressFieldName, addressFieldValue, customAttributeValue,
+        var searchHIE = function (query, surname, identifier, nationalId, gender, addressFieldName, addressFieldValue, customAttributeValue,
                                offset, customAttributeFields, programAttributeFieldName, programAttributeFieldValue, addressSearchResultsConfig,
                                patientSearchResultsConfig, filterOnAllIdentifiers) {
 
             var config = {
                 params: {
-                    q: query,
+                    q: query + " " + surname,
+                    surname: surname,
                     identifier: identifier,
                     nationalId: nationalId,
                     gender: gender,
diff --git a/ui/app/registration/views/search.html b/ui/app/registration/views/search.html
index c59cc3274..8671e18de 100644
--- a/ui/app/registration/views/search.html
+++ b/ui/app/registration/views/search.html
@@ -43,9 +43,9 @@ <h2 class="section-title">Location</h2>
                     <label for="name"><strong>{{ ::'REGISTRATION_LABEL_NAME' | translate}}</strong></label>
                     <input tabindex="4" type="text" id="name" ng-model="searchParameters.name" placeholder="{{ ::'REGISTRATION_LABEL_ENTER_NAME' | translate}}">
                 </article>
-                <article class="fl" ng-if="::customAttributesSearchConfig.show">
-                    <label for="name"><strong>{{::customAttributesSearchConfig.label}}</strong></label>
-                    <input tabindex="5" type="text" id="customAttribute" ng-model="searchParameters.customAttribute" placeholder="{{::customAttributesSearchConfig.placeholder}}">
+                <article class="fl">
+                    <label for="last_name"><strong>{{ ::'REGISTRATION_LABEL_LAST_NAME' | translate}}</strong></label>
+                    <input tabindex="4" type="text" id="last_name" ng-model="searchParameters.last_name" placeholder="{{ ::'REGISTRATION_LABEL_ENTER_LAST_NAME' | translate}}">
                 </article>
 
                 <article class="fl" ng-show="showNationalId()">

From 3580871bfd032d842121cb98549313d11c753438 Mon Sep 17 00:00:00 2001
From: mahaomolise92 <mm5666@cumc.columbia.edu>
Date: Tue, 9 Mar 2021 13:21:38 +0200
Subject: [PATCH 2/2] error fix

---
 .tx/config                                    | 52 -------------------
 ui/app/i18n/registration/locale_en.json       |  6 ++-
 .../controllers/searchPatientController.js    | 13 ++++-
 .../registration/services/patientService.js   | 10 ++--
 ui/app/registration/views/search.html         |  6 +--
 5 files changed, 24 insertions(+), 63 deletions(-)
 delete mode 100644 .tx/config

diff --git a/.tx/config b/.tx/config
deleted file mode 100644
index 03fc72dbd..000000000
--- a/.tx/config
+++ /dev/null
@@ -1,52 +0,0 @@
-[main]
-host = https://www.transifex.com
-
-[bahmni.admin-app]
-file_filter = ui/app/i18n/admin/locale_<lang>.json
-source_file = ui/app/i18n/admin/locale_en.json
-source_lang = en
-type = KEYVALUEJSON
-
-[bahmni.adt-app]
-file_filter = ui/app/i18n/adt/locale_<lang>.json
-source_file = ui/app/i18n/adt/locale_en.json
-source_lang = en
-type = KEYVALUEJSON
-
-[bahmni.clinical-app]
-file_filter = ui/app/i18n/clinical/locale_<lang>.json
-source_file = ui/app/i18n/clinical/locale_en.json
-source_lang = en
-type = KEYVALUEJSON
-
-[bahmni.home-app]
-file_filter = ui/app/i18n/home/locale_<lang>.json
-source_file = ui/app/i18n/home/locale_en.json
-source_lang = en
-type = KEYVALUEJSON
-
-[bahmni.orders-app]
-file_filter = ui/app/i18n/orders/locale_<lang>.json
-source_file = ui/app/i18n/orders/locale_en.json
-source_lang = en
-type = KEYVALUEJSON
-
-[bahmni.registration-app]
-file_filter = ui/app/i18n/registration/locale_<lang>.json
-source_file = ui/app/i18n/registration/locale_en.json
-source_lang = en
-type = KEYVALUEJSON
-
-[bahmni.reports-app]
-file_filter = ui/app/i18n/reports/locale_<lang>.json
-source_file = ui/app/i18n/reports/locale_en.json
-source_lang = en
-type = KEYVALUEJSON
-
-
-[bahmni.appointments-app]
-file_filter = ui/app/i18n/appointments/locale_<lang>.json
-source_file = ui/app/i18n/appointments/locale_en.json
-source_lang = en
-type = KEYVALUEJSON
-
diff --git a/ui/app/i18n/registration/locale_en.json b/ui/app/i18n/registration/locale_en.json
index 4835d8aa3..9cf2619f2 100644
--- a/ui/app/i18n/registration/locale_en.json
+++ b/ui/app/i18n/registration/locale_en.json
@@ -50,11 +50,13 @@
   "REGISTRATION_LABEL_VALID_PATIENT_IDENTIFIER":"Please enter a valid patient identifier",
   "REGISTRATION_LABEL_PROVIDER_AUTOCOMPLETE_LIST":"Please select a provider from the autocomplete list",
   "REGISTRATION_LABEL_PATIENT_AUTOCOMPLETE_LIST":"Please select a patient from the autocomplete list",
-  "REGISTRATION_LABEL_ENTER_NAME":"Enter Name",
+  "REGISTRATION_LABEL_ENTER_NAME":"Enter First Name",
+  "REGISTRATION_LABEL_ENTER_LAST_NAME":"Enter Last Name",
   "REGISTRATION_LABEL_PERSON_NOT_FOUND":"Person not found",
   "REGISTRATION_LABEL_PATIENT_ID":"ID",
   "REGISTRATION_LABEL_SEARCH":"Search",
-  "REGISTRATION_LABEL_NAME":"Name",
+  "REGISTRATION_LABEL_NAME":"First Name",
+  "REGISTRATION_LABEL_LAST_NAME":"Last Name",
   "REGISTRATION_LABEL_ID":"ID",
   "REGISTRATION_LABEL_NO_RESULTS":"No more results",
   "REGISTRATION_LABEL_SUMMARY":"Summary",
diff --git a/ui/app/registration/controllers/searchPatientController.js b/ui/app/registration/controllers/searchPatientController.js
index 9fd0f892d..3ac2069d1 100644
--- a/ui/app/registration/controllers/searchPatientController.js
+++ b/ui/app/registration/controllers/searchPatientController.js
@@ -55,6 +55,7 @@ angular.module('bahmni.registration')
 
             var hasSearchParameters = function () {
                 return $scope.searchParameters.name.trim().length > 0 ||
+                    $scope.searchParameters.last_name.trim().length > 0 ||
                     $scope.searchParameters.addressFieldValue.trim().length > 0 ||
                     $scope.searchParameters.customAttribute.trim().length > 0 ||
                     $scope.searchParameters.programAttributeFieldValue.trim().length > 0 ||
@@ -71,6 +72,7 @@ angular.module('bahmni.registration')
                 var searchParameters = $location.search();
                 $scope.searchParameters.addressFieldValue = searchParameters.addressFieldValue || '';
                 $scope.searchParameters.name = searchParameters.name || '';
+                $scope.searchParameters.last_name = searchParameters.last_name || '';
                 $scope.searchParameters.customAttribute = searchParameters.customAttribute || '';
                 $scope.searchParameters.programAttributeFieldValue = searchParameters.programAttributeFieldValue || '';
                 $scope.searchParameters.addressSearchResultsConfig = searchParameters.addressSearchResultsConfig || '';
@@ -83,6 +85,7 @@ angular.module('bahmni.registration')
                         searching = true;
                         var searchPromise = patientService.search(
                             $scope.searchParameters.name,
+                            $scope.searchParameters.last_name,                            
                             undefined,
                             $scope.addressSearchConfig.field,
                             $scope.searchParameters.addressFieldValue,
@@ -110,6 +113,7 @@ angular.module('bahmni.registration')
                         searching = true;
                         var searchPromise = patientService.searchHIE(
                             $scope.searchParameters.name,
+                            $scope.searchParameters.last_name,
                             undefined,
                             $scope.searchParameters.nationalId,
                             $scope.searchParameters.gender,
@@ -130,7 +134,7 @@ angular.module('bahmni.registration')
                                 $scope.noResultsMessage = null;
                                 
                             } else {
-                                $scope.noResultsMessage = 'testing not found message ';
+                                $scope.noResultsMessage = 'REGISTRATION_LABEL_COULD_NOT_FIND_PATIENT';
                             }
                         });
 
@@ -305,11 +309,14 @@ angular.module('bahmni.registration')
 
                 if ($scope.option.selected == "national") {
                     disabled = !$scope.searchParameters.name && !$scope.searchParameters.addressFieldValue
+                    && !$scope.searchParameters.last_name
+                    && !$scope.searchParameters.addressFieldValue
                     && !$scope.searchParameters.customAttribute
                     && !$scope.searchParameters.programAttributeFieldValue
                     && !$scope.searchParameters.nationalIdNumber;
                 } else if ($scope.option.selected == "local") {
                     disabled = !$scope.searchParameters.name && !$scope.searchParameters.addressFieldValue
+                    && !$scope.searchParameters.last_name
                     && !$scope.searchParameters.customAttribute
                     && !$scope.searchParameters.programAttributeFieldValue;
                 }
@@ -334,7 +341,6 @@ angular.module('bahmni.registration')
                 $scope.hieresults = [];
 
                 var patientIdentifier = $scope.searchParameters.registrationNumber;
-                debugger;
                 $location.search({
                     registrationNumber: $scope.searchParameters.registrationNumber,
                     programAttributeFieldName: $scope.programAttributesSearchConfig.field,
@@ -434,6 +440,9 @@ angular.module('bahmni.registration')
                 if ($scope.searchParameters.name) {
                     queryParams.name = $scope.searchParameters.name;
                 }
+                if ($scope.searchParameters.last_name) {
+                    queryParams.last_name = $scope.searchParameters.last_name;
+                }
                 if ($scope.searchParameters.addressFieldValue) {
                     queryParams.addressFieldValue = $scope.searchParameters.addressFieldValue;
                 }
diff --git a/ui/app/registration/services/patientService.js b/ui/app/registration/services/patientService.js
index f216d3f69..b3ef3cac3 100644
--- a/ui/app/registration/services/patientService.js
+++ b/ui/app/registration/services/patientService.js
@@ -5,12 +5,13 @@ angular.module('bahmni.registration')
         var openmrsUrl = Bahmni.Registration.Constants.openmrsUrl;
         var baseOpenMRSRESTURL = Bahmni.Registration.Constants.baseOpenMRSRESTURL;
 
-        var search = function (query, identifier, addressFieldName, addressFieldValue, customAttributeValue,
+        var search = function (query, surname, identifier, addressFieldName,  addressFieldValue, customAttributeValue,
                                offset, customAttributeFields, programAttributeFieldName, programAttributeFieldValue, addressSearchResultsConfig,
                                patientSearchResultsConfig, filterOnAllIdentifiers) {
             var config = {
                 params: {
-                    q: query,
+                    q: query + " " + surname,
+                    surname: surname,
                     identifier: identifier,
                     s: "byIdOrNameOrVillage",
                     addressFieldName: addressFieldName,
@@ -29,13 +30,14 @@ angular.module('bahmni.registration')
             };
             return patientServiceStrategy.search(config);
         };
-        var searchHIE = function (query, identifier, nationalId, gender, addressFieldName, addressFieldValue, customAttributeValue,
+        var searchHIE = function (query, surname, identifier, nationalId, gender, addressFieldName, addressFieldValue, customAttributeValue,
                                offset, customAttributeFields, programAttributeFieldName, programAttributeFieldValue, addressSearchResultsConfig,
                                patientSearchResultsConfig, filterOnAllIdentifiers) {
 
             var config = {
                 params: {
-                    q: query,
+                    q: query + " " + surname,
+                    surname: surname,
                     identifier: identifier,
                     nationalId: nationalId,
                     gender: gender,
diff --git a/ui/app/registration/views/search.html b/ui/app/registration/views/search.html
index c59cc3274..8671e18de 100644
--- a/ui/app/registration/views/search.html
+++ b/ui/app/registration/views/search.html
@@ -43,9 +43,9 @@ <h2 class="section-title">Location</h2>
                     <label for="name"><strong>{{ ::'REGISTRATION_LABEL_NAME' | translate}}</strong></label>
                     <input tabindex="4" type="text" id="name" ng-model="searchParameters.name" placeholder="{{ ::'REGISTRATION_LABEL_ENTER_NAME' | translate}}">
                 </article>
-                <article class="fl" ng-if="::customAttributesSearchConfig.show">
-                    <label for="name"><strong>{{::customAttributesSearchConfig.label}}</strong></label>
-                    <input tabindex="5" type="text" id="customAttribute" ng-model="searchParameters.customAttribute" placeholder="{{::customAttributesSearchConfig.placeholder}}">
+                <article class="fl">
+                    <label for="last_name"><strong>{{ ::'REGISTRATION_LABEL_LAST_NAME' | translate}}</strong></label>
+                    <input tabindex="4" type="text" id="last_name" ng-model="searchParameters.last_name" placeholder="{{ ::'REGISTRATION_LABEL_ENTER_LAST_NAME' | translate}}">
                 </article>
 
                 <article class="fl" ng-show="showNationalId()">