From 138e891a5bae38208fa98e840a08e81e58e42b1b Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Fri, 19 Dec 2025 18:17:16 +0530 Subject: [PATCH 1/3] fix: elastic search changes added isenabled boolean variable --- Common-UI | 2 +- src/environments/environment.ci.ts.template | 4 +++- src/environments/environment.dev.ts | 4 +++- src/environments/environment.development.ts | 5 +++-- src/environments/environment.local.ts | 5 +++-- src/environments/environment.prod.ts | 5 +++-- src/environments/environment.test.ts | 8 +++++++- 7 files changed, 23 insertions(+), 10 deletions(-) diff --git a/Common-UI b/Common-UI index f4536935..20a21fc5 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit f45369358ebf0c9c57deee0a39482022a1007849 +Subproject commit 20a21fc58bac618d8acbee1453e1699176603921 diff --git a/src/environments/environment.ci.ts.template b/src/environments/environment.ci.ts.template index 85f2b1b2..99127f2d 100644 --- a/src/environments/environment.ci.ts.template +++ b/src/environments/environment.ci.ts.template @@ -55,7 +55,7 @@ export const environment = { production: true, app: `MMU`, encKey: sessionStorageEncKey, - + isEnableES: true, tracking: { platform: 'matomo', siteId: parseInt('<%= SITE_ID %>'), @@ -560,5 +560,7 @@ export const environment = { enableCHOReportBtn: enableCHOReportBtn, dhisURL:dhisURL + elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, + }; diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts index ad2353e5..25c896f9 100644 --- a/src/environments/environment.dev.ts +++ b/src/environments/environment.dev.ts @@ -70,7 +70,7 @@ const dhisURL = ''; export const environment = { production: false, encKey: sessionStorageEncKey, - + isEnableES: true, tracking: { platform: 'matomo', siteId: 1, @@ -570,4 +570,6 @@ export const environment = { enableCaptcha: enableCaptcha, enableCHOReportBtn: enableCHOReportBtn, dhisURL: dhisURL, + getUserId: `${COMMON_API}user/userName/`, + elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, }; diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts index 7fe69f6c..bed2d447 100644 --- a/src/environments/environment.development.ts +++ b/src/environments/environment.development.ts @@ -71,7 +71,7 @@ const dhisURL = ''; export const environment = { production: false, encKey: sessionStorageEncKey, - + isEnableES: true, tracking: { platform: 'matomo', siteId: 1, @@ -569,7 +569,8 @@ export const environment = { siteKey: siteKey, captchaChallengeURL: captchaChallengeURL, enableCaptcha: enableCaptcha, - + getUserId: `${COMMON_API}user/userName/`, enableCHOReportBtn: enableCHOReportBtn, dhisURL: dhisURL, + elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, }; diff --git a/src/environments/environment.local.ts b/src/environments/environment.local.ts index ea23922b..e2720712 100644 --- a/src/environments/environment.local.ts +++ b/src/environments/environment.local.ts @@ -71,7 +71,7 @@ const dhisURL = 'http://abc.xyz.org/dhis2-web-public/Reports.html?auth='; //samp export const environment = { production: false, encKey: sessionStorageEncKey, - + isEnableES: true, tracking: { platform: 'matomo', siteId: 1, @@ -568,7 +568,8 @@ export const environment = { siteKey: siteKey, captchaChallengeURL: captchaChallengeURL, enableCaptcha: enableCaptcha, - + getUserId: `${COMMON_API}user/userName/`, enableCHOReportBtn: enableCHOReportBtn, dhisURL: dhisURL, + elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, }; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 281f54e4..5a9dff22 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -71,7 +71,7 @@ const dhisURL = ''; export const environment = { production: true, encKey: sessionStorageEncKey, - + isEnableES: true, tracking: { platform: 'matomo', siteId: 1, @@ -569,7 +569,8 @@ export const environment = { siteKey: siteKey, captchaChallengeURL: captchaChallengeURL, enableCaptcha: enableCaptcha, - + getUserId: `${COMMON_API}user/userName/`, enableCHOReportBtn: enableCHOReportBtn, dhisURL: dhisURL, + elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, }; diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index ecfc00fd..e3bfbefc 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -65,11 +65,13 @@ const sessionStorageEncKey = ''; const siteKey = ''; const captchaChallengeURL = ''; const enableCaptcha = false; +const enableCHOReportBtn = true; +const dhisURL = ''; export const environment = { production: false, encKey: sessionStorageEncKey, - + isEnableES: true, tracking: { platform: 'matomo', siteId: 1, @@ -567,4 +569,8 @@ export const environment = { siteKey: siteKey, captchaChallengeURL: captchaChallengeURL, enableCaptcha: enableCaptcha, + getUserId: `${COMMON_API}user/userName/`, + enableCHOReportBtn: enableCHOReportBtn, + dhisURL: dhisURL, + elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, }; From d65cc6452e36ab7d97adf806eef3aa54cf7b7103 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Fri, 19 Dec 2025 18:45:09 +0530 Subject: [PATCH 2/3] fix: handled placeholder value --- Common-UI | 2 +- src/assets/Assamese.json | 3 ++- src/assets/English.json | 1 + src/assets/Hindi.json | 1 + src/assets/Kannada.json | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Common-UI b/Common-UI index 20a21fc5..ef7fa1a5 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 20a21fc58bac618d8acbee1453e1699176603921 +Subproject commit ef7fa1a5ae31600081b4ef11a6470e57fd8fbffa diff --git a/src/assets/Assamese.json b/src/assets/Assamese.json index ddee5bbd..908db8dc 100644 --- a/src/assets/Assamese.json +++ b/src/assets/Assamese.json @@ -38,7 +38,8 @@ "ro": { "registration": "পঞ্জীয়ণ", "benIDOrPhNo": "ইয়াত লাভগ্ৰাহী ID, ফোন নম্বৰ বা ABHA সন্ধান কৰক...", - "personalInfo": { + "benDetails": "লাভগ্ৰাহীৰ সবিশেষ তথ্য সন্ধান কৰক", + "personalInfo": { "personalInformation": "ব্যক্তিগত তথ্য", "educationalQualification": "শি‍ক্ষাগত অর্হতা", "otherOccupation": "অন্যান্য জীৱিকা", diff --git a/src/assets/English.json b/src/assets/English.json index 93215e1b..49faca17 100644 --- a/src/assets/English.json +++ b/src/assets/English.json @@ -38,6 +38,7 @@ "ro": { "registration": "Registration", "benIDOrPhNo": "Look for BeneficiaryID or Phone number or ABHA here...", + "benDetails": "Look for Beneficiary Details", "personalInfo": { "personalInformation": "Personal Information", "educationalQualification": "Educational Qualification", diff --git a/src/assets/Hindi.json b/src/assets/Hindi.json index c1eeb6d2..0ff5c42e 100644 --- a/src/assets/Hindi.json +++ b/src/assets/Hindi.json @@ -38,6 +38,7 @@ "ro": { "registration": "पंजीकरण", "benIDOrPhNo": "यहाँ लाभार्थी ID, फ़ोन नंबर या ABHA खोजें...", + "benDetails": "लाभार्थी विवरण देखें", "personalInfo": { "personalInformation": "व्यक्तिगत जानकारी", "educationalQualification": "शैक्षिक योग्यता", diff --git a/src/assets/Kannada.json b/src/assets/Kannada.json index 69fb2d67..03086ae4 100644 --- a/src/assets/Kannada.json +++ b/src/assets/Kannada.json @@ -26,6 +26,7 @@ "ro": { "registration": "ನೋಂದಣಿ", "benIDOrPhNo": "ಫಲಾನುಭವಿ ID ಅಥವಾ ಫೋನ್ ಸಂಖ್ಯೆ ಅಥವಾ ABHA ಗಾಗಿ ಇಲ್ಲಿ ನೋಡಿ...", + "benDetails": "ಫಲಾನುಭವಿ ವಿವರಗಳನ್ನು ನೋಡಿ", "personalInfo": { "personalInformation": "ವಯಕ್ತಿಕ ಮಾಹಿತಿ", "educationalQualification": "ಶೈಕ್ಷಣಿಕ ಅರ್ಹತೆ", From b623388c6b70fae1c5804aac9c5971b3904f7c75 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Fri, 19 Dec 2025 18:53:52 +0530 Subject: [PATCH 3/3] fix: common ui code --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index ef7fa1a5..09f42028 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit ef7fa1a5ae31600081b4ef11a6470e57fd8fbffa +Subproject commit 09f42028ac5f9fc8ec307ade87da13fe4ef53818