From 7169cf49e723c033cc10532883254bf717225dc2 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Mon, 29 Dec 2025 18:12:18 +0530 Subject: [PATCH 1/5] fix: 2038 integrated elastic search and advance es --- src/environments/environment.ci.ts.template | 1 + src/environments/environment.dev.ts | 1 + src/environments/environment.development.ts | 1 + src/environments/environment.local.ts | 1 + src/environments/environment.prod.ts | 1 + 5 files changed, 5 insertions(+) diff --git a/src/environments/environment.ci.ts.template b/src/environments/environment.ci.ts.template index 8a99f35..c2ccfb8 100644 --- a/src/environments/environment.ci.ts.template +++ b/src/environments/environment.ci.ts.template @@ -561,6 +561,7 @@ export const environment = { enableCHOReportBtn: enableCHOReportBtn, dhisURL:dhisURL, elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, + advanceElasticSearchUrl: `${HWC_API}registrar/advanceSearchES`, }; diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts index 25c896f..6fef8cb 100644 --- a/src/environments/environment.dev.ts +++ b/src/environments/environment.dev.ts @@ -572,4 +572,5 @@ export const environment = { dhisURL: dhisURL, getUserId: `${COMMON_API}user/userName/`, elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, + advanceElasticSearchUrl: `${HWC_API}registrar/advanceSearchES`, }; diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts index bed2d44..acfd68f 100644 --- a/src/environments/environment.development.ts +++ b/src/environments/environment.development.ts @@ -148,6 +148,7 @@ export const environment = { externalSearchIdentityUrl: `${FHIR_API}patient/data/profile/search/demographic`, patientRevisitSubmitToNurse: `${HWC_API}common/update/benDetailsAndSubmitToNurse`, identityPatientRevisitSubmitToNurseURL: `${HWC_API}registrar/create/BenReVisitToNurse`, + advanceElasticSearchUrl: `${HWC_API}registrar/advanceSearchES`, /** * Master Data Urls */ diff --git a/src/environments/environment.local.ts b/src/environments/environment.local.ts index e272071..9c0cde6 100644 --- a/src/environments/environment.local.ts +++ b/src/environments/environment.local.ts @@ -572,4 +572,5 @@ export const environment = { enableCHOReportBtn: enableCHOReportBtn, dhisURL: dhisURL, elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, + advanceElasticSearchUrl: `${HWC_API}registrar/advanceSearchES`, }; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 5a9dff2..4371c27 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -148,6 +148,7 @@ export const environment = { externalSearchIdentityUrl: `${FHIR_API}patient/data/profile/search/demographic`, patientRevisitSubmitToNurse: `${HWC_API}common/update/benDetailsAndSubmitToNurse`, identityPatientRevisitSubmitToNurseURL: `${HWC_API}registrar/create/BenReVisitToNurse`, + advanceElasticSearchUrl: `${HWC_API}registrar/advanceSearchES`, /** * Master Data Urls */ From 5439c437a921d17e810d8e4d779762f657403427 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Mon, 29 Dec 2025 18:14:29 +0530 Subject: [PATCH 2/5] fix: 2038 pushed common ui changes related to es --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index 09f4202..fb6b49b 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 09f42028ac5f9fc8ec307ade87da13fe4ef53818 +Subproject commit fb6b49b0eb2789803931fc72eee1ccc1f7c75e08 From 2ac0ef8f6aa0d820cae4aeb095fa09a795e08dc1 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Tue, 30 Dec 2025 15:07:16 +0530 Subject: [PATCH 3/5] fix: pushed common ui changes to hwc ui --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index fb6b49b..063e6e3 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit fb6b49b0eb2789803931fc72eee1ccc1f7c75e08 +Subproject commit 063e6e347418f804e5df9ee0be9f3df82fb04fe1 From 7bfcdfa43625efd7b5cdc098b97055a365164205 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Tue, 30 Dec 2025 16:08:20 +0530 Subject: [PATCH 4/5] fix: resolved common-ui submodule conflict --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index 063e6e3..f453693 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 063e6e347418f804e5df9ee0be9f3df82fb04fe1 +Subproject commit f45369358ebf0c9c57deee0a39482022a1007849 From 60e55a92b47bb213667aa3bd8457fd7032a1f4fd Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Wed, 31 Dec 2025 14:59:58 +0530 Subject: [PATCH 5/5] fix: pushing the common ui code of 3.6.1 --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index f453693..f2aceff 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit f45369358ebf0c9c57deee0a39482022a1007849 +Subproject commit f2acefffe6be43aa2445bd9936059233362cfc92