From 07521915be34cd1407d03cd4206c666cf666a8c5 Mon Sep 17 00:00:00 2001 From: Karyamsetty Helen Grace Date: Fri, 20 Jun 2025 13:06:58 +0530 Subject: [PATCH 1/6] fix(bug): saving abdm facilityid in session storage --- Common-UI | 2 +- .../nurse-doctor/workarea/workarea.component.ts | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index 3ec7e814..e3f16c52 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 3ec7e81443c830c7784bb39ad1fe34af1a939858 +Subproject commit e3f16c52c07253e18aa964cda51266398cbb3ee6 diff --git a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts index a23f3d07..2bcf4596 100644 --- a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts +++ b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts @@ -4418,12 +4418,19 @@ export class WorkareaComponent if (data.abdmFacilityID && data.abdmFacilityName) { this.abdmFacilityId = data.abdmFacilityID; this.abdmFacilityName = data.abdmFacilityName; + this.sessionstorage.setItem('abdmFacilityId', data.abdmFacilityID); + this.sessionstorage.setItem( + 'abdmFacilityName', + data.abdmFacilityName, + ); this.saveAbdmFacilityForVisit(); } } else { this.confirmationService.confirm(res.errorMessage, 'info'); this.abdmFacilityId = null; this.abdmFacilityName = null; + this.sessionstorage.setItem('abdmFacilityId', null); + this.sessionstorage.setItem('abdmFacilityName', null); this.saveAbdmFacilityForVisit(); } }, From d64aff39d3675365fae0128a7ebf09f2112168ae Mon Sep 17 00:00:00 2001 From: Karyamsetty Helen Grace Date: Fri, 20 Jun 2025 13:18:44 +0530 Subject: [PATCH 2/6] fix(bug): saving abdm facilityid in session storage --- Common-UI | 2 +- .../nurse-doctor/workarea/workarea.component.ts | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index 0c71b24c..e3f16c52 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 0c71b24ce2567446a260c53017c7b304b77c5457 +Subproject commit e3f16c52c07253e18aa964cda51266398cbb3ee6 diff --git a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts index a23f3d07..2bcf4596 100644 --- a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts +++ b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts @@ -4418,12 +4418,19 @@ export class WorkareaComponent if (data.abdmFacilityID && data.abdmFacilityName) { this.abdmFacilityId = data.abdmFacilityID; this.abdmFacilityName = data.abdmFacilityName; + this.sessionstorage.setItem('abdmFacilityId', data.abdmFacilityID); + this.sessionstorage.setItem( + 'abdmFacilityName', + data.abdmFacilityName, + ); this.saveAbdmFacilityForVisit(); } } else { this.confirmationService.confirm(res.errorMessage, 'info'); this.abdmFacilityId = null; this.abdmFacilityName = null; + this.sessionstorage.setItem('abdmFacilityId', null); + this.sessionstorage.setItem('abdmFacilityName', null); this.saveAbdmFacilityForVisit(); } }, From a4887d919f400e1275a592f02556dc1c0fd83ccb Mon Sep 17 00:00:00 2001 From: helenKaryamsetty Date: Mon, 6 Oct 2025 12:07:40 +0530 Subject: [PATCH 3/6] feat: abdm M2 V3 --- Common-UI | 2 +- src/assets/Assamese.json | 4 +++- src/assets/English.json | 3 ++- src/assets/Hindi.json | 3 ++- src/assets/Kannada.json | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Common-UI b/Common-UI index e3f16c52..e48f5797 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit e3f16c52c07253e18aa964cda51266398cbb3ee6 +Subproject commit e48f5797abbbd0816468bbdff2ee0d01fe249fa8 diff --git a/src/assets/Assamese.json b/src/assets/Assamese.json index d0c18e13..aa8db0e2 100644 --- a/src/assets/Assamese.json +++ b/src/assets/Assamese.json @@ -2095,7 +2095,9 @@ "verifyMobileOtp": "Verify Mobile OTP", "enterMobileOtp": "Enter Mobile OTP", "verify": "Verify", - "sessionExpiredPleaseLogin": "Session expired. Please log in again to continue" + "sessionExpiredPleaseLogin": "Session expired. Please log in again to continue", + "continueButton": "Continue", + "pleaseWaitWhileLinkingCareContext": "Please wait while linking care context" } } diff --git a/src/assets/English.json b/src/assets/English.json index da2c24a0..53776314 100644 --- a/src/assets/English.json +++ b/src/assets/English.json @@ -2114,7 +2114,8 @@ "abhaNumberAlreadyWith": "The Abha number is already linked with beneficiary ID - ", "issueInFetchinglinkedBeneficiaryId": "Issue in fetching Beneficiary Id linked to ABHA ID", "sessionExpiredPleaseLogin": "Session expired. Please log in again to continue", - "continueButton": "Continue" + "continueButton": "Continue", + "pleaseWaitWhileLinkingCareContext": "Please wait while linking care context" } diff --git a/src/assets/Hindi.json b/src/assets/Hindi.json index b44ef009..aabb8363 100644 --- a/src/assets/Hindi.json +++ b/src/assets/Hindi.json @@ -2109,6 +2109,7 @@ "abhaNumberAlreadyWith": "The Abha number is already linked with beneficiary ID - ", "issueInFetchinglinkedBeneficiaryId": "Issue in fetching Beneficiary Id linked to ABHA ID", "sessionExpiredPleaseLogin": "Session expired. Please log in again to continue", - "continueButton": "जारी रखें" + "continueButton": "जारी रखें", + "pleaseWaitWhileLinkingCareContext": "Please wait while linking care context" } } diff --git a/src/assets/Kannada.json b/src/assets/Kannada.json index a7b51eb8..82103c36 100644 --- a/src/assets/Kannada.json +++ b/src/assets/Kannada.json @@ -2130,7 +2130,8 @@ "abhaNumberAlreadyWith": "The Abha number is already linked with beneficiary ID - ", "issueInFetchinglinkedBeneficiaryId": "Issue in fetching Beneficiary Id linked to ABHA ID", "sessionExpiredPleaseLogin": "Session expired. Please log in again to continue", - "continueButton": "ಮುಂದುವರಿಸಿ" + "continueButton": "ಮುಂದುವರಿಸಿ", + "pleaseWaitWhileLinkingCareContext": "Please wait while linking care context" } From f6c4e63cfdaa43de79278c1b22704ae5b14040e0 Mon Sep 17 00:00:00 2001 From: helenKaryamsetty Date: Tue, 18 Nov 2025 17:27:41 +0530 Subject: [PATCH 4/6] feat: latest common-ui commit --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index e48f5797..f9d6245f 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit e48f5797abbbd0816468bbdff2ee0d01fe249fa8 +Subproject commit f9d6245f5198b66f40051b39f668f917b69b74fe From 84c799dd82501cebb7bd189ccb9f9b7d6b85c3cb Mon Sep 17 00:00:00 2001 From: helenKaryamsetty Date: Tue, 18 Nov 2025 20:56:52 +0530 Subject: [PATCH 5/6] feat: added abha m2 APIs --- src/environments/environment.ci.ts.template | 5 +++++ src/environments/environment.dev.ts | 4 ++++ src/environments/environment.development.ts | 4 ++++ src/environments/environment.local.ts | 4 ++++ src/environments/environment.prod.ts | 4 ++++ src/environments/environment.test.ts | 4 ++++ 6 files changed, 25 insertions(+) diff --git a/src/environments/environment.ci.ts.template b/src/environments/environment.ci.ts.template index 6c0a6834..61208f58 100644 --- a/src/environments/environment.ci.ts.template +++ b/src/environments/environment.ci.ts.template @@ -538,6 +538,11 @@ export const environment = { verifyOtpForLogin: `${FHIR_API}abhaLogin/verifyAbhaLogin`, printPngCard: `${FHIR_API}abhaCreation/printAbhaCard`, printWebLoginPhrCard: `${FHIR_API}abhaLogin/printWebLoginPhrCard`, + + /* Abha M2 V3 APIs */ + generateLinkTokenForCareContext: `${FHIR_API}careContext/generateCareContextToken`, + linkCareContext: `${FHIR_API}careContext/linkCareContext`, + getBenIdForhealthID: `${FHIR_API}healthID/getBenIdForhealthID`, siteKey: siteKey, diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts index 83998f99..9b9b193e 100644 --- a/src/environments/environment.dev.ts +++ b/src/environments/environment.dev.ts @@ -553,6 +553,10 @@ export const environment = { printPngCard: `${FHIR_API}abhaCreation/printAbhaCard`, printWebLoginPhrCard: `${FHIR_API}abhaLogin/printWebLoginPhrCard`, + /* Abha M2 V3 APIs */ + generateLinkTokenForCareContext: `${FHIR_API}careContext/generateCareContextToken`, + linkCareContext: `${FHIR_API}careContext/linkCareContext`, + getBenIdForhealthID: `${FHIR_API}healthID/getBenIdForhealthID`, siteKey: siteKey, diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts index f489f9e5..ec22636d 100644 --- a/src/environments/environment.development.ts +++ b/src/environments/environment.development.ts @@ -554,6 +554,10 @@ export const environment = { printPngCard: `${FHIR_API}abhaCreation/printAbhaCard`, printWebLoginPhrCard: `${FHIR_API}abhaLogin/printWebLoginPhrCard`, + /* Abha M2 V3 APIs */ + generateLinkTokenForCareContext: `${FHIR_API}careContext/generateCareContextToken`, + linkCareContext: `${FHIR_API}careContext/linkCareContext`, + getBenIdForhealthID: `${FHIR_API}healthID/getBenIdForhealthID`, siteKey: siteKey, diff --git a/src/environments/environment.local.ts b/src/environments/environment.local.ts index bc67f400..dc9f3ffc 100644 --- a/src/environments/environment.local.ts +++ b/src/environments/environment.local.ts @@ -554,6 +554,10 @@ export const environment = { printPngCard: `${FHIR_API}abhaCreation/printAbhaCard`, printWebLoginPhrCard: `${FHIR_API}abhaLogin/printWebLoginPhrCard`, + /* Abha M2 V3 APIs */ + generateLinkTokenForCareContext: `${FHIR_API}careContext/generateCareContextToken`, + linkCareContext: `${FHIR_API}careContext/linkCareContext`, + getBenIdForhealthID: `${FHIR_API}healthID/getBenIdForhealthID`, siteKey: siteKey, captchaChallengeURL: captchaChallengeURL, diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index cc914700..7f72534e 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -556,6 +556,10 @@ export const environment = { getBenIdForhealthID: `${FHIR_API}healthID/getBenIdForhealthID`, + /* Abha M2 V3 APIs */ + generateLinkTokenForCareContext: `${FHIR_API}careContext/generateCareContextToken`, + linkCareContext: `${FHIR_API}careContext/linkCareContext`, + siteKey: siteKey, captchaChallengeURL: captchaChallengeURL, enableCaptcha: enableCaptcha, diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index f489f9e5..ec22636d 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -554,6 +554,10 @@ export const environment = { printPngCard: `${FHIR_API}abhaCreation/printAbhaCard`, printWebLoginPhrCard: `${FHIR_API}abhaLogin/printWebLoginPhrCard`, + /* Abha M2 V3 APIs */ + generateLinkTokenForCareContext: `${FHIR_API}careContext/generateCareContextToken`, + linkCareContext: `${FHIR_API}careContext/linkCareContext`, + getBenIdForhealthID: `${FHIR_API}healthID/getBenIdForhealthID`, siteKey: siteKey, From dae1f60d6fee55e628d355bf7e321779c84271c2 Mon Sep 17 00:00:00 2001 From: helenKaryamsetty Date: Thu, 18 Dec 2025 01:30:55 +0530 Subject: [PATCH 6/6] fix: closed dialog after linking --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index 6690777f..c2e8804a 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 6690777fbc8ec9b60eb16031cb143035fdd69e77 +Subproject commit c2e8804ac10ee8f4e336ea1ab3e685c89760866e