From 0ada54409ae7968a1a7b529afb1dd9dd7b6552ee Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Tue, 16 Dec 2025 16:20:10 +0530 Subject: [PATCH 01/13] fix: amm-1990, 1985, 1972, 1982, 1989, 1983, 1987,1986 --- .../create-family-tagging.component.html | 2 +- .../consent-form/consent-form.component.html | 6 +-- .../location-information.component.html | 49 ++++++++++++------- .../registration/registration.component.html | 26 +++++----- .../search-dialog.component.html | 2 +- 5 files changed, 48 insertions(+), 37 deletions(-) diff --git a/src/registrar/family-tagging/create-family-tagging/create-family-tagging.component.html b/src/registrar/family-tagging/create-family-tagging/create-family-tagging.component.html index 95fcea8..15d51de 100644 --- a/src/registrar/family-tagging/create-family-tagging/create-family-tagging.component.html +++ b/src/registrar/family-tagging/create-family-tagging/create-family-tagging.component.html @@ -114,7 +114,7 @@

{{ currentLanguageSet?.createFamilyTagging }}

- + diff --git a/src/registrar/registration/location-information/location-information.component.html b/src/registrar/registration/location-information/location-information.component.html index 726cfc5..6e45106 100644 --- a/src/registrar/registration/location-information/location-information.component.html +++ b/src/registrar/registration/location-information/location-information.component.html @@ -7,15 +7,16 @@ *ngIf="item?.fieldType?.toLowerCase() === 'text'" > - {{ item.fieldTitle }} + {{ item.fieldTitle | titlecase }} + formControlName="{{ item.fieldName }}" + /> @@ -75,16 +76,16 @@ - {{ item.fieldTitle }} + {{ item.fieldTitle | titlecase }} - {{ option }} + {{ option | titlecase }} @@ -110,18 +111,22 @@ *ngFor="let option of item.options" [value]="option" > - {{ option }} + {{ option | titlecase }} -
- - - {{ item.fieldTitle }} +
+ + {{ item.fieldTitle | titlecase }} - - - - {{ option }} + + + {{ option | titlecase }}
- +
diff --git a/src/registrar/registration/registration.component.html b/src/registrar/registration/registration.component.html index ee5612e..f15623e 100644 --- a/src/registrar/registration/registration.component.html +++ b/src/registrar/registration/registration.component.html @@ -18,15 +18,16 @@ - Personal Information + {{currentLanguageSet?.ro?.personalInfo?.personalInformation}} - Personal Information + {{currentLanguageSet?.ro?.personalInfo?.personalInformation}} + [formData]="personalInfoData" [patientRevisit]="patientRevisit" [revisitData]="revisitData" + [currentLanguageSet]="currentLanguageSet">
@@ -41,15 +42,15 @@ - Location Information + {{currentLanguageSet?.ro?.locInfo?.locInformation}} - Location Information + {{currentLanguageSet?.ro?.locInfo?.locInformation}} + [formData]="locationInfoData" [currentLanguageSet]="currentLanguageSet">
@@ -66,15 +67,15 @@ - Other Information + {{currentLanguageSet?.ro?.otherInfo?.otherInformation}} - Other Information + {{currentLanguageSet?.ro?.otherInfo?.otherInformation}} + [formData]="otherInfoData" [currentLanguageSet]="currentLanguageSet">
@@ -92,14 +93,15 @@ - ABHA Information + {{currentLanguageSet?.ro?.abhaInfo?.abhaInformation}} - ABHA Information + {{currentLanguageSet?.ro?.abhaInfo?.abhaInformation}} - +
diff --git a/src/registrar/search-dialog/search-dialog.component.html b/src/registrar/search-dialog/search-dialog.component.html index d870741..57f388d 100644 --- a/src/registrar/search-dialog/search-dialog.component.html +++ b/src/registrar/search-dialog/search-dialog.component.html @@ -135,7 +135,7 @@

{{ currentLanguageSet?.common?.advanceBeneficiarySearch }}

- {{ currentLanguageSet?.village }} + {{ currentLanguageSet?.ro?.locInfo?.village }} From f45369358ebf0c9c57deee0a39482022a1007849 Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Thu, 18 Dec 2025 14:11:39 +0530 Subject: [PATCH 02/13] remove langauge input which the components were not expecting --- src/registrar/registration/registration.component.html | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/registrar/registration/registration.component.html b/src/registrar/registration/registration.component.html index f15623e..ed7d4a9 100644 --- a/src/registrar/registration/registration.component.html +++ b/src/registrar/registration/registration.component.html @@ -27,7 +27,7 @@ + >
@@ -50,7 +50,7 @@ + [formData]="locationInfoData">
@@ -75,7 +75,7 @@ + [formData]="otherInfoData">
@@ -100,8 +100,7 @@ {{currentLanguageSet?.ro?.abhaInfo?.abhaInformation}} - +
From 20a21fc58bac618d8acbee1453e1699176603921 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Fri, 19 Dec 2025 14:51:46 +0530 Subject: [PATCH 03/13] fix: elastic search changes --- src/registrar/search/search.component.html | 9 +- src/registrar/search/search.component.ts | 177 +++++++++++++++++++- src/registrar/services/registrar.service.ts | 8 + 3 files changed, 185 insertions(+), 9 deletions(-) diff --git a/src/registrar/search/search.component.html b/src/registrar/search/search.component.html index 083e407..7622138 100644 --- a/src/registrar/search/search.component.html +++ b/src/registrar/search/search.component.html @@ -9,12 +9,13 @@
-
+
\ No newline at end of file diff --git a/src/registrar/search/search.component.ts b/src/registrar/search/search.component.ts index 814ea12..ade2baf 100644 --- a/src/registrar/search/search.component.ts +++ b/src/registrar/search/search.component.ts @@ -27,6 +27,7 @@ import { ViewChild, DoCheck, AfterViewChecked, + OnDestroy, } from '@angular/core'; import { Router, ActivatedRoute } from '@angular/router'; import { SearchDialogComponent } from '../search-dialog/search-dialog.component'; @@ -45,6 +46,8 @@ import * as moment from 'moment'; import { environment } from 'src/environments/environment'; import { SessionStorageService } from '../services/session-storage.service'; import { HealthIdDisplayModalComponent } from '../abha-components/health-id-display-modal/health-id-display-modal.component'; +import { Subject } from 'rxjs'; +import { debounceTime, distinctUntilChanged, switchMap } from 'rxjs/operators'; export interface Consent { consentGranted: string; @@ -55,7 +58,7 @@ export interface Consent { templateUrl: './search.component.html', styleUrls: ['./search.component.css'], }) -export class SearchComponent implements OnInit, DoCheck, AfterViewChecked { +export class SearchComponent implements OnInit, DoCheck, AfterViewChecked, OnDestroy { rowsPerPage = 5; activePage = 1; pagedList = []; @@ -69,6 +72,7 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked { currentLanguageSet: any; searchPattern!: string; consentGranted: any; + isEnableES: boolean = false; displayedColumns: string[] = [ 'edit', 'beneficiaryID', @@ -86,6 +90,10 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked { dataSource = new MatTableDataSource(); searchCategory: any; + // Add these for debounced search + private searchSubject$ = new Subject(); + private searchSubscription: any; + constructor( private changeDetectorRef: ChangeDetectorRef, private dialog: MatDialog, @@ -94,20 +102,178 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked { private registrarService: RegistrarService, private cameraService: CameraService, private router: Router, - private sessionstorage:SessionStorageService, + private sessionstorage: SessionStorageService, private beneficiaryDetailsService: BeneficiaryDetailsService, ) {} ngOnInit() { this.fetchLanguageResponse(); - this.searchPattern = '/^[a-zA-Z0-9](.|@|-)*$/;'; + this.isEnableES = environment.isEnableES || false; + console.log("IsEnable:", this.isEnableES); + + + this.searchPattern = this.isEnableES ? '/^[a-zA-Z0-9]*$/;' : '/^[a-zA-Z0-9](.|@|-)*$/;'; + if (this.isEnableES) { + this.setupDebouncedSearch(); + } } ngAfterViewChecked() { this.changeDetectorRef.detectChanges(); } + ngOnDestroy() { + if (this.searchSubscription) { + this.searchSubscription.unsubscribe(); + } + } + + // Setup debounced search for typing + setupDebouncedSearch() { + this.searchSubscription = this.searchSubject$ + .pipe( + debounceTime(500), // 500ms delay after typing stops + distinctUntilChanged(), // Only emit if value changed + switchMap((searchTerm: string) => { + console.log('switchMap called with:', searchTerm); // Debug log + // Validate alphanumeric + const alphanumericPattern = /^[a-zA-Z0-9]*$/; + if (!alphanumericPattern.test(searchTerm)) { + this.confirmationService.alert( + 'Please enter valid alphanumeric input', + 'info' + ); + return []; + } + console.log('Calling API with:', { search: searchTerm }); // Debug log + // Call new ES API + return this.registrarService.identityQuickSearchES({ search: searchTerm }); + }) + ) + .subscribe( + (response: any) => { + console.log('API Response:', response); // Debug log + this.handleESSearchResponse(response); + }, + (error: any) => { + console.error('API Error:', error); // Debug log + this.confirmationService.alert(error, 'error'); + } + ); + } + + // Method to handle input changes with debounce (for typing) + onSearchInputChange(searchTerm: string) { + console.log('common UI onSearchInputChange called with:', searchTerm); // Debug log + const trimmed = searchTerm?.trim() || ''; + console.log('Trimmed length:', trimmed.length); // Debug log + if (trimmed.length >= 3) { + console.log('Emitting to searchSubject$'); // Debug log + this.searchSubject$.next(trimmed); + } else if (trimmed.length === 0) { + this.resetWorklist(); + } + } + + // Method for search button click (immediate search, no debounce) + onSearchButtonClick(searchTerm: any) { + if (this.isEnableES) { + // ES Flow: Immediate search with alphanumeric validation + console.log('ES: Button click with:', searchTerm); + if (!searchTerm || searchTerm.trim().length < 3) { + this.confirmationService.alert( + 'Please enter at least 3 characters', + 'info' + ); + this.resetWorklist(); + return; + } + + const trimmed = searchTerm.trim(); + const alphanumericPattern = /^[a-zA-Z0-9]*$/; + if (!alphanumericPattern.test(trimmed)) { + this.confirmationService.alert( + 'Please enter valid alphanumeric input', + 'info' + ); + return; + } + + console.log('ES: Calling API directly with:', { search: trimmed }); + this.registrarService.identityQuickSearchES({ search: trimmed }) + .subscribe( + (response: any) => { + console.log('ES: Button API Response:', response); + this.handleESSearchResponse(response); + }, + (error: any) => { + console.error('ES: Button API Error:', error); + this.confirmationService.alert(error, 'error'); + } + ); + } else { + // Old Flow: Use existing identityQuickSearch method + console.log('Old API: Button click with:', searchTerm); + this.identityQuickSearch(searchTerm); + } + } + + + // Common method to handle ES API response + handleESSearchResponse(response: any) { + if (!response?.data || response.data.length === 0) { + this.resetWorklist(); + this.confirmationService.alert( + this.currentLanguageSet?.alerts?.info?.beneficiarynotfound || 'Beneficiary not found', + 'info' + ); + } else { + this.beneficiaryList = this.searchRestructES(response.data); + this.filteredBeneficiaryList = this.beneficiaryList; + this.dataSource.data = this.beneficiaryList; + this.dataSource.paginator = this.paginator; + console.log('Updated dataSource:', this.dataSource.data); // Debug log + this.changeDetectorRef.detectChanges(); + } + } + + // Restructure ES API response + searchRestructES(benList: any[]) { + const requiredBenData: any[] = []; + benList.forEach((element: any) => { + requiredBenData.push({ + beneficiaryID: element.beneficiaryID, + beneficiaryRegID: element.beneficiaryRegID, + benName: `${element.firstName} ${element.lastName || ''}`, + genderName: element.m_gender?.genderName || element.genderName || 'Not Available', + fatherName: element.fatherName || 'Not Available', + districtName: element.i_bendemographics?.districtName || 'Not Available', + villageName: element.i_bendemographics?.villageName || + element.i_bendemographics?.districtBranchName || 'Not Available', + phoneNo: element.benPhoneMaps?.[0]?.phoneNo || 'Not Available', + age: moment(element.dob || element.dOB).fromNow(true) === 'a few seconds' + ? 'Not Available' + : moment(element.dob || element.dOB).fromNow(true), + registeredOn: moment(element.createdDate).format('DD-MM-YYYY'), + benObject: element, + }); + }); + console.log('Restructured data:', requiredBenData); // Debug log + return requiredBenData; + } + + // Reset worklist + resetWorklist() { + this.beneficiaryList = []; + this.filteredBeneficiaryList = []; + this.dataSource.data = []; + this.pagedList = []; + } + + // Keep old method for backward compatibility (used in advanced search, etc.) identityQuickSearch(searchTerm: any) { + console.log("Entered old search"); + const searchObject = { beneficiaryRegID: null, beneficiaryID: null, @@ -242,7 +408,7 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked { } getCorrectPhoneNo(phoneMaps: any[], benObject: any): string { - if (!phoneMaps.length) { + if (!phoneMaps || !phoneMaps.length) { return 'Not Available'; } @@ -429,6 +595,7 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked { } }); } + navigateTORegistrar() { const link = '/registrar/registration'; const currentRoute = this.router.routerState.snapshot.url; @@ -469,4 +636,4 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked { this.currentLanguageSet = this.languageComponent.currentLanguageObject; } //--End-- -} +} \ No newline at end of file diff --git a/src/registrar/services/registrar.service.ts b/src/registrar/services/registrar.service.ts index 640429f..aa55910 100644 --- a/src/registrar/services/registrar.service.ts +++ b/src/registrar/services/registrar.service.ts @@ -121,6 +121,14 @@ export class RegistrarService { return this.http.post(environment.identityQuickSearchUrl, searchTerm); } + identityQuickSearchES(searchTerm: any) { + // const requestBody = { + // search: searchTerm + // }; + console.log("entered elastic search"); + + return this.http.post(environment.elasticSearchUrl, searchTerm); + } clearBeneficiaryEditDetails() { this.beneficiaryEditDetails.next(null); } From ef7fa1a5ae31600081b4ef11a6470e57fd8fbffa Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Fri, 19 Dec 2025 18:44:43 +0530 Subject: [PATCH 04/13] fix: handled placeholder value --- src/registrar/search/search.component.html | 2 +- src/registrar/services/registrar.service.ts | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/registrar/search/search.component.html b/src/registrar/search/search.component.html index 7622138..aee7d32 100644 --- a/src/registrar/search/search.component.html +++ b/src/registrar/search/search.component.html @@ -11,7 +11,7 @@ id="searchbox" pattern="[a-zA-Z0-9]*" maxlength="32" - placeholder="{{ currentLanguageSet?.ro?.benIDOrPhNo }}" + placeholder="{{ isEnableES ? currentLanguageSet?.ro?.benIDOrPhNo : currentLanguageSet?.ro?.benIDOrPhNo }}" class="pull-left search_textbox" [(ngModel)]="quicksearchTerm" (ngModelChange)="onSearchInputChange($event)" diff --git a/src/registrar/services/registrar.service.ts b/src/registrar/services/registrar.service.ts index aa55910..b9cfef8 100644 --- a/src/registrar/services/registrar.service.ts +++ b/src/registrar/services/registrar.service.ts @@ -122,12 +122,7 @@ export class RegistrarService { } identityQuickSearchES(searchTerm: any) { - // const requestBody = { - // search: searchTerm - // }; - console.log("entered elastic search"); - - return this.http.post(environment.elasticSearchUrl, searchTerm); + return this.http.post(environment.elasticSearchUrl, searchTerm); } clearBeneficiaryEditDetails() { this.beneficiaryEditDetails.next(null); From 09f42028ac5f9fc8ec307ade87da13fe4ef53818 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Fri, 19 Dec 2025 18:53:05 +0530 Subject: [PATCH 05/13] fix: removed unwanted logs --- src/registrar/search/search.component.ts | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/registrar/search/search.component.ts b/src/registrar/search/search.component.ts index ade2baf..f216f70 100644 --- a/src/registrar/search/search.component.ts +++ b/src/registrar/search/search.component.ts @@ -135,7 +135,6 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked, OnDes debounceTime(500), // 500ms delay after typing stops distinctUntilChanged(), // Only emit if value changed switchMap((searchTerm: string) => { - console.log('switchMap called with:', searchTerm); // Debug log // Validate alphanumeric const alphanumericPattern = /^[a-zA-Z0-9]*$/; if (!alphanumericPattern.test(searchTerm)) { @@ -145,18 +144,14 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked, OnDes ); return []; } - console.log('Calling API with:', { search: searchTerm }); // Debug log - // Call new ES API return this.registrarService.identityQuickSearchES({ search: searchTerm }); }) ) .subscribe( (response: any) => { - console.log('API Response:', response); // Debug log this.handleESSearchResponse(response); }, (error: any) => { - console.error('API Error:', error); // Debug log this.confirmationService.alert(error, 'error'); } ); @@ -164,22 +159,16 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked, OnDes // Method to handle input changes with debounce (for typing) onSearchInputChange(searchTerm: string) { - console.log('common UI onSearchInputChange called with:', searchTerm); // Debug log const trimmed = searchTerm?.trim() || ''; - console.log('Trimmed length:', trimmed.length); // Debug log if (trimmed.length >= 3) { - console.log('Emitting to searchSubject$'); // Debug log this.searchSubject$.next(trimmed); } else if (trimmed.length === 0) { this.resetWorklist(); } } - // Method for search button click (immediate search, no debounce) onSearchButtonClick(searchTerm: any) { if (this.isEnableES) { - // ES Flow: Immediate search with alphanumeric validation - console.log('ES: Button click with:', searchTerm); if (!searchTerm || searchTerm.trim().length < 3) { this.confirmationService.alert( 'Please enter at least 3 characters', @@ -199,21 +188,16 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked, OnDes return; } - console.log('ES: Calling API directly with:', { search: trimmed }); this.registrarService.identityQuickSearchES({ search: trimmed }) .subscribe( (response: any) => { - console.log('ES: Button API Response:', response); this.handleESSearchResponse(response); }, (error: any) => { - console.error('ES: Button API Error:', error); this.confirmationService.alert(error, 'error'); } ); } else { - // Old Flow: Use existing identityQuickSearch method - console.log('Old API: Button click with:', searchTerm); this.identityQuickSearch(searchTerm); } } @@ -232,7 +216,6 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked, OnDes this.filteredBeneficiaryList = this.beneficiaryList; this.dataSource.data = this.beneficiaryList; this.dataSource.paginator = this.paginator; - console.log('Updated dataSource:', this.dataSource.data); // Debug log this.changeDetectorRef.detectChanges(); } } @@ -270,10 +253,8 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked, OnDes this.pagedList = []; } - // Keep old method for backward compatibility (used in advanced search, etc.) identityQuickSearch(searchTerm: any) { - console.log("Entered old search"); - + const searchObject = { beneficiaryRegID: null, beneficiaryID: null, From fb6b49b0eb2789803931fc72eee1ccc1f7c75e08 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Mon, 29 Dec 2025 18:12:53 +0530 Subject: [PATCH 06/13] fix: 2038 integrated elastic search and advance es --- .../beneficiary-details.component.ts | 103 +++++++++++---- .../family-tagging-details.component.ts | 54 ++++++-- .../personal-information.component.ts | 125 ++++++++++++------ src/registrar/search/search.component.html | 5 +- src/registrar/search/search.component.ts | 73 +++++++--- src/registrar/services/registrar.service.ts | 5 + 6 files changed, 266 insertions(+), 99 deletions(-) diff --git a/src/registrar/beneficiary-details/beneficiary-details.component.ts b/src/registrar/beneficiary-details/beneficiary-details.component.ts index 938470f..228e4f8 100644 --- a/src/registrar/beneficiary-details/beneficiary-details.component.ts +++ b/src/registrar/beneficiary-details/beneficiary-details.component.ts @@ -37,6 +37,7 @@ import { import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service'; import { RegistrarService } from '../services/registrar.service'; import { SessionStorageService } from '../services/session-storage.service'; +import { environment } from 'src/environments/environment'; @Component({ selector: 'app-beneficiary-details', @@ -61,6 +62,7 @@ export class BeneficiaryDetailsComponent implements OnInit, DoCheck, OnDestroy { firstName: any; lastName: any; regDate: any; + isEnableES: boolean = false; constructor( private router: Router, @@ -73,6 +75,7 @@ export class BeneficiaryDetailsComponent implements OnInit, DoCheck, OnDestroy { ) {} ngOnInit() { + this.isEnableES = environment.isEnableES || false; this.assignSelectedLanguage(); this.today = new Date(); this.getHealthIDDetails(); @@ -134,34 +137,80 @@ export class BeneficiaryDetailsComponent implements OnInit, DoCheck, OnDestroy { }); } - getBenFamilyDetails() { + getBenFamilyDetails() { this.route.params.subscribe((param) => { - const reqObj = { - beneficiaryRegID: null, - beneficiaryName: null, - beneficiaryID: param['beneficiaryId'], - phoneNo: null, - HealthID: null, - HealthIDNumber: null, - familyId: null, - identity: null, - }; - this.registrarService - .identityQuickSearch(reqObj) - .subscribe((res: any) => { - if (res && res.data.length === 1) { - this.beneficiary = res.data[0]; - this.benFamilyId = res.data[0].familyId; - this.beneficiaryName = - this.beneficiary.firstName + - (this.beneficiary.lastName !== undefined - ? ' ' + this.beneficiary.lastName - : ''); - this.regDate = moment - .utc(this.beneficiary.createdDate) - .format('DD-MM-YYYY hh:mm A'); - } - }); + if (this.isEnableES) { + // Use Elasticsearch search + const searchTerm = param['beneficiaryId']; + this.registrarService + .identityQuickSearchES({ search: searchTerm }) + .subscribe( + (res: any) => { + if (res && res.data && res.data.length === 1) { + this.beneficiary = res.data[0]; + this.benFamilyId = res.data[0].familyID || res.data[0].familyId; + this.beneficiaryName = + this.beneficiary.firstName + + (this.beneficiary.lastName !== undefined && + this.beneficiary.lastName !== null && + this.beneficiary.lastName !== '' + ? ' ' + this.beneficiary.lastName + : ''); + this.regDate = moment + .utc(this.beneficiary.createdDate) + .format('DD-MM-YYYY hh:mm A'); + } else if (res && res.data && res.data.length > 1) { + // Multiple results found + this.confirmationService.alert( + 'Multiple beneficiaries found with this ID. Please use advanced search.', + 'info', + ); + } else { + this.confirmationService.alert( + this.current_language_set?.alerts?.info?.beneficiarynotfound || + 'Beneficiary not found', + 'info', + ); + } + }, + (err: any) => { + this.confirmationService.alert( + 'Error fetching beneficiary details', + 'error', + ); + }, + ); + } else { + // Use traditional search + const reqObj = { + beneficiaryRegID: null, + beneficiaryName: null, + beneficiaryID: param['beneficiaryId'], + phoneNo: null, + HealthID: null, + HealthIDNumber: null, + familyId: null, + identity: null, + }; + this.registrarService + .identityQuickSearch(reqObj) + .subscribe((res: any) => { + if (res && res.data.length === 1) { + this.beneficiary = res.data[0]; + this.benFamilyId = res.data[0].familyId; + this.beneficiaryName = + this.beneficiary.firstName + + (this.beneficiary.lastName !== undefined + ? ' ' + this.beneficiary.lastName + : ''); + this.regDate = moment + .utc(this.beneficiary.createdDate) + .format('DD-MM-YYYY hh:mm A'); + } + }); + } + + // Fetch beneficiary image (common for both ES and non-ES) const benFlowID: any = param['beneficiaryRegID']; this.beneficiaryDetailsService .getBeneficiaryImage(benFlowID) diff --git a/src/registrar/family-tagging/family-tagging-details/family-tagging-details.component.ts b/src/registrar/family-tagging/family-tagging-details/family-tagging-details.component.ts index cd79ace..f696e78 100644 --- a/src/registrar/family-tagging/family-tagging-details/family-tagging-details.component.ts +++ b/src/registrar/family-tagging/family-tagging-details/family-tagging-details.component.ts @@ -38,6 +38,8 @@ import { FamilyTaggingService } from '../../services/familytagging.service'; import { RegistrarService } from '../../services/registrar.service'; import { SearchFamilyComponent } from '../../search-family/search-family.component'; import { SessionStorageService } from '../../services/session-storage.service'; +import { environment } from 'src/environments/environment'; + @Component({ selector: 'app-family-tagging-details', @@ -97,6 +99,7 @@ export class FamilyTaggingDetailsComponent benStateId: any; benDistrictId: any; benBlockId: any; + isEnableES: boolean = false; constructor( private dialog: MatDialog, @@ -110,6 +113,8 @@ export class FamilyTaggingDetailsComponent ) {} ngOnInit() { + + this.isEnableES = environment.isEnableES || false; this.assignSelectedLanguage(); this.benFamilyId = this.route.snapshot.paramMap.get('familyId'); this.benFamilyName = this.route.snapshot.paramMap.get('familyName'); @@ -373,17 +378,43 @@ export class FamilyTaggingDetailsComponent }); } - getBeneficiaryDetailsAfterFamilyTag() { - const benReqObj = { - beneficiaryRegID: null, - beneficiaryID: this.beneficiaryId, - phoneNo: null, - HealthID: null, - HealthIDNumber: null, - familyId: null, - identity: null, - }; + getBeneficiaryDetailsAfterFamilyTag() { + const benReqObj = { + beneficiaryRegID: null, + beneficiaryID: this.beneficiaryId, + phoneNo: null, + HealthID: null, + HealthIDNumber: null, + familyId: null, + identity: null, + }; + if (this.isEnableES) { + // Use Elasticsearch when enabled + const esSearchReqObj = { + search: this.beneficiaryId + }; + + this.registrarService.identityQuickSearchES(esSearchReqObj).subscribe( + (beneficiaryDetails: any) => { + if (beneficiaryDetails && beneficiaryDetails.statusCode === 200 && + beneficiaryDetails.data && beneficiaryDetails.data.length === 1) { + this.benFamilyId = + beneficiaryDetails.data[0].familyID !== undefined && + beneficiaryDetails.data[0].familyID !== null + ? beneficiaryDetails.data[0].familyID + : null; + this.registrarService.getBenFamilyDetails(this.benFamilyId); + } else { + this.benFamilyId = null; + } + }, + (error: string) => { + this.confirmationService.alert(error, 'error'); + } + ); + } else { + // Use regular search when Elasticsearch is disabled this.registrarService.identityQuickSearch(benReqObj).subscribe( (beneficiaryDetails: any) => { if (beneficiaryDetails && beneficiaryDetails.data.length === 1) { @@ -399,7 +430,8 @@ export class FamilyTaggingDetailsComponent }, (error: string) => { this.confirmationService.alert(error, 'error'); - }, + } ); } } +} diff --git a/src/registrar/registration/personal-information/personal-information.component.ts b/src/registrar/registration/personal-information/personal-information.component.ts index f90d181..1d0cca2 100644 --- a/src/registrar/registration/personal-information/personal-information.component.ts +++ b/src/registrar/registration/personal-information/personal-information.component.ts @@ -28,6 +28,7 @@ import { import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service'; import { AmritTrackingService } from 'Common-UI/src/tracking'; import { Injector } from '@angular/core'; +import { environment } from 'src/environments/environment'; @Component({ @@ -83,6 +84,7 @@ export class PersonalInformationComponent { ageforMarriage = 12; maritalStatusMaster: any; personalInfoSubscription!: Subscription; + isEnableES: boolean = false; constructor( private fb: FormBuilder, @@ -116,6 +118,7 @@ export class PersonalInformationComponent { } ngOnInit() { + this.isEnableES = environment.isEnableES || false; this.fetchLanguageResponse(); this.formData.forEach((item: any) => { if (item.fieldName && item.allowText) { @@ -333,55 +336,96 @@ export class PersonalInformationComponent { /** * Phone Number Parent Relations */ - getParentDetails() { + getParentDetails() { const searchTerm = this.personalInfoFormGroup.value.phoneNo; - const searchObject = { - beneficiaryRegID: null, - beneficiaryID: null, - phoneNo: null, - }; + if (searchTerm && searchTerm.trim().length === 10) { - searchObject['phoneNo'] = searchTerm; - this.registrarService.identityQuickSearch(searchObject).subscribe( - (beneficiaryList: any) => { - if ( - beneficiaryList && - beneficiaryList.length > 0 && - beneficiaryList[0].benPhoneMaps.length > 0 - ) { - console.log( - 'ta d ad a d a', - JSON.stringify(beneficiaryList, null, 4) - ); - this.personalInfoFormGroup.patchValue({ - parentRegID: beneficiaryList[0].benPhoneMaps[0].parentBenRegID, - parentRelation: 11, - }); - console.log(this.personalInfoFormGroup.value.parentRegID); - } else { + if (this.isEnableES) { + // Use Elasticsearch search + this.registrarService.identityQuickSearchES({ search: searchTerm }).subscribe( + (response: any) => { + if ( + response && + response.data && + response.data.length > 0 && + response.data[0].benPhoneMaps && + response.data[0].benPhoneMaps.length > 0 + ) { + console.log('ES Parent search result:', JSON.stringify(response, null, 4)); + this.personalInfoFormGroup.patchValue({ + parentRegID: response.data[0].benPhoneMaps[0].parentBenRegID, + parentRelation: 11, + }); + console.log('Parent Reg ID (ES):', this.personalInfoFormGroup.value.parentRegID); + } else { + this.personalInfoFormGroup.patchValue({ + parentRegID: null, + parentRelation: 1, + }); + console.log('No parent found (ES):', this.personalInfoFormGroup.value.parentRegID); + + if (this.patientRevisit) { + this.personalInfoFormGroup.patchValue({ + parentRegID: this.personalInfoFormGroup.value.beneficiaryRegID, + }); + console.log('Patient revisit parent (ES):', this.personalInfoFormGroup.value.parentRegID); + } + } + }, + error => { + this.confirmationService.alert(error, 'error'); this.personalInfoFormGroup.patchValue({ parentRegID: null, parentRelation: 1, + phoneNo: null, }); - console.log(this.personalInfoFormGroup.value.parentRegID); - - if (this.patientRevisit) { + } + ); + } else { + const searchObject = { + beneficiaryRegID: null, + beneficiaryID: null, + phoneNo: searchTerm, + }; + + this.registrarService.identityQuickSearch(searchObject).subscribe( + (beneficiaryList: any) => { + if ( + beneficiaryList && + beneficiaryList.length > 0 && + beneficiaryList[0].benPhoneMaps.length > 0 + ) { + console.log('Traditional search result:', JSON.stringify(beneficiaryList, null, 4)); + this.personalInfoFormGroup.patchValue({ + parentRegID: beneficiaryList[0].benPhoneMaps[0].parentBenRegID, + parentRelation: 11, + }); + console.log('Parent Reg ID:', this.personalInfoFormGroup.value.parentRegID); + } else { this.personalInfoFormGroup.patchValue({ - parentRegID: this.personalInfoFormGroup.value.beneficiaryRegID, + parentRegID: null, + parentRelation: 1, }); - console.log(this.personalInfoFormGroup.value.parentRegID); + console.log('No parent found:', this.personalInfoFormGroup.value.parentRegID); + + if (this.patientRevisit) { + this.personalInfoFormGroup.patchValue({ + parentRegID: this.personalInfoFormGroup.value.beneficiaryRegID, + }); + console.log('Patient revisit parent:', this.personalInfoFormGroup.value.parentRegID); + } } + }, + error => { + this.confirmationService.alert(error, 'error'); + this.personalInfoFormGroup.patchValue({ + parentRegID: null, + parentRelation: 1, + phoneNo: null, + }); } - }, - error => { - this.confirmationService.alert(error, 'error'); - this.personalInfoFormGroup.patchValue({ - parentRegID: null, - parentRelation: 1, - phoneNo: null, - }); - } - ); + ); + } } else { if (this.patientRevisit) { this.personalInfoFormGroup.patchValue({ @@ -398,7 +442,8 @@ export class PersonalInformationComponent { } } } - /** + + /** * * Age Entered in Input */ diff --git a/src/registrar/search/search.component.html b/src/registrar/search/search.component.html index aee7d32..d57063f 100644 --- a/src/registrar/search/search.component.html +++ b/src/registrar/search/search.component.html @@ -156,7 +156,10 @@

*matHeaderCellDef mat-sort-header > - {{ currentLanguageSet?.bendetails?.beneficiaryID }} + {{ isEnableES + ? currentLanguageSet?.bendetails?.beneficiaryRegID + : currentLanguageSet?.bendetails?.beneficiaryID + }} = this.dialog.open( - SearchDialogComponent, - { - width: '60%', - disableClose: false, - }, - ); - - mdDialogRef.afterClosed().subscribe((result) => { + const mdDialogRef: MatDialogRef = this.dialog.open( + SearchDialogComponent, + { + width: '60%', + disableClose: false, + }, + ); + + mdDialogRef.afterClosed().subscribe((result) => { + if (result) { + this.advanceSearchTerm = result; - if (result) { - this.advanceSearchTerm = result; + // Use ES-based advanced search if Elasticsearch is enabled + if (this.isEnableES) { + this.registrarService + .advanceSearchIdentityES(this.advanceSearchTerm) + .subscribe( + (response: any) => { + if (!response?.data || response.data.length === 0) { + this.resetWorklist(); + this.quicksearchTerm = null; + this.confirmationService.alert( + this.currentLanguageSet.alerts.info.beneficiaryNotFound, + 'info', + ); + } else { + this.beneficiaryList = this.searchRestructES(response.data); + this.filteredBeneficiaryList = this.beneficiaryList; + this.dataSource.data = this.beneficiaryList; + this.dataSource.paginator = this.paginator; + this.dataSource.data.forEach( + (sectionCount: any, index: number) => { + sectionCount.sno = index + 1; + }, + ); + this.changeDetectorRef.detectChanges(); + } + console.log('ES Advanced Search Result:', JSON.stringify(response, null, 4)); + }, + (error) => { + this.confirmationService.alert(error, 'error'); + }, + ); + } else { + // Use regular advanced search for non-ES mode this.registrarService .advanceSearchIdentity(this.advanceSearchTerm) .subscribe( @@ -574,9 +607,9 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked, OnDes }, ); } - }); - } - + } + }); +} navigateTORegistrar() { const link = '/registrar/registration'; const currentRoute = this.router.routerState.snapshot.url; diff --git a/src/registrar/services/registrar.service.ts b/src/registrar/services/registrar.service.ts index b9cfef8..51bf1ae 100644 --- a/src/registrar/services/registrar.service.ts +++ b/src/registrar/services/registrar.service.ts @@ -140,6 +140,11 @@ export class RegistrarService { return this.http.post(environment.advanceSearchIdentityUrl, searchTerms); } + // New ES Advance Search + advanceSearchIdentityES(searchTerms: any) { + return this.http.post(environment.advanceElasticSearchUrl, searchTerms); + } + loadMasterData(servicePointID: any) { const tmpSPID = { spID: servicePointID }; return this.http.post(environment.registrarMasterDataUrl, tmpSPID); From 063e6e347418f804e5df9ee0be9f3df82fb04fe1 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Tue, 30 Dec 2025 13:33:48 +0530 Subject: [PATCH 07/13] fix: optimised the search api code --- .../beneficiary-details.component.ts | 168 ++++++++++-------- 1 file changed, 89 insertions(+), 79 deletions(-) diff --git a/src/registrar/beneficiary-details/beneficiary-details.component.ts b/src/registrar/beneficiary-details/beneficiary-details.component.ts index 228e4f8..efe6c50 100644 --- a/src/registrar/beneficiary-details/beneficiary-details.component.ts +++ b/src/registrar/beneficiary-details/beneficiary-details.component.ts @@ -137,89 +137,99 @@ export class BeneficiaryDetailsComponent implements OnInit, DoCheck, OnDestroy { }); } - getBenFamilyDetails() { + getBenFamilyDetails() { this.route.params.subscribe((param) => { - if (this.isEnableES) { - // Use Elasticsearch search - const searchTerm = param['beneficiaryId']; - this.registrarService - .identityQuickSearchES({ search: searchTerm }) - .subscribe( - (res: any) => { - if (res && res.data && res.data.length === 1) { - this.beneficiary = res.data[0]; - this.benFamilyId = res.data[0].familyID || res.data[0].familyId; - this.beneficiaryName = - this.beneficiary.firstName + - (this.beneficiary.lastName !== undefined && - this.beneficiary.lastName !== null && - this.beneficiary.lastName !== '' - ? ' ' + this.beneficiary.lastName - : ''); - this.regDate = moment - .utc(this.beneficiary.createdDate) - .format('DD-MM-YYYY hh:mm A'); - } else if (res && res.data && res.data.length > 1) { - // Multiple results found - this.confirmationService.alert( - 'Multiple beneficiaries found with this ID. Please use advanced search.', - 'info', - ); - } else { - this.confirmationService.alert( - this.current_language_set?.alerts?.info?.beneficiarynotfound || - 'Beneficiary not found', - 'info', - ); - } - }, - (err: any) => { - this.confirmationService.alert( - 'Error fetching beneficiary details', - 'error', - ); - }, - ); - } else { - // Use traditional search - const reqObj = { - beneficiaryRegID: null, - beneficiaryName: null, - beneficiaryID: param['beneficiaryId'], - phoneNo: null, - HealthID: null, - HealthIDNumber: null, - familyId: null, - identity: null, - }; - this.registrarService - .identityQuickSearch(reqObj) - .subscribe((res: any) => { - if (res && res.data.length === 1) { - this.beneficiary = res.data[0]; - this.benFamilyId = res.data[0].familyId; - this.beneficiaryName = - this.beneficiary.firstName + - (this.beneficiary.lastName !== undefined - ? ' ' + this.beneficiary.lastName - : ''); - this.regDate = moment - .utc(this.beneficiary.createdDate) - .format('DD-MM-YYYY hh:mm A'); - } - }); - } + const beneficiaryId = param['beneficiaryId']; + const benFlowID = param['beneficiaryRegID']; - // Fetch beneficiary image (common for both ES and non-ES) - const benFlowID: any = param['beneficiaryRegID']; - this.beneficiaryDetailsService - .getBeneficiaryImage(benFlowID) - .subscribe((data: any) => { - if (data && data.benImage) { + // Fetch beneficiary details based on search method + const searchObservable = this.isEnableES + ? this.searchWithElasticsearch(beneficiaryId) + : this.searchTraditional(beneficiaryId); + + searchObservable.subscribe({ + next: (res: any) => this.handleSearchResponse(res), + error: (err: any) => this.handleSearchError(err), + }); + + // Fetch beneficiary image independently + this.fetchBeneficiaryImage(benFlowID); + }); + } + + private searchWithElasticsearch(searchTerm: string) { + return this.registrarService.identityQuickSearchES({ search: searchTerm }); + } + + private searchTraditional(beneficiaryId: string) { + const reqObj = { + beneficiaryRegID: null, + beneficiaryName: null, + beneficiaryID: beneficiaryId, + phoneNo: null, + HealthID: null, + HealthIDNumber: null, + familyId: null, + identity: null, + }; + return this.registrarService.identityQuickSearch(reqObj); + } + + private handleSearchResponse(res: any) { + if (!res?.data || res.data.length === 0) { + this.showAlert( + this.current_language_set?.alerts?.info?.beneficiarynotfound || + 'Beneficiary not found', + 'info' + ); + return; + } + + if (res.data.length > 1) { + this.showAlert( + 'Multiple beneficiaries found with this ID. Please use advanced search.', + 'info' + ); + return; + } + + // Single result found + this.beneficiary = res.data[0]; + this.benFamilyId = res.data[0].familyID || res.data[0].familyId; + this.beneficiaryName = this.formatBeneficiaryName(this.beneficiary); + this.regDate = moment + .utc(this.beneficiary.createdDate) + .format('DD-MM-YYYY hh:mm A'); + } + + private formatBeneficiaryName(beneficiary: any): string { + const { firstName, lastName } = beneficiary; + return lastName?.trim() ? `${firstName} ${lastName}` : firstName; + } + + private handleSearchError(err: any) { + console.error('Error fetching beneficiary details:', err); + this.showAlert('Error fetching beneficiary details', 'error'); + } + + private fetchBeneficiaryImage(benFlowID: string) { + this.beneficiaryDetailsService + .getBeneficiaryImage(benFlowID) + .subscribe({ + next: (data: any) => { + if (data?.benImage) { this.beneficiary.benImage = data.benImage; } - }); - }); + }, + error: (err: any) => { + console.error('Error fetching beneficiary image:', err); + // Optionally show error to user or handle silently + }, + }); + } + + private showAlert(message: string, type: string) { + this.confirmationService.alert(message, type); } getHealthIDDetails() { From e14c76d22f182eed3dcae0a003c0de6ed8f31543 Mon Sep 17 00:00:00 2001 From: Helen Grace Karyamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Date: Tue, 30 Dec 2025 16:55:12 +0530 Subject: [PATCH 08/13] Amm 1811 (#34) * abdm m2 v3 changes * feat: AMM-1811 * feat: amm-1811 sucess scenario handled & UI fine tuned * fix: amm-1811 edge cases handled * healthIdNumber & healthId mismatch fix * fix: closed dialog after linking --------- Co-authored-by: 5Amogh --- .../aadhaar-correction-dialog.component.html | 35 + .../aadhaar-correction-dialog.component.ts | 71 ++ .../health-id-display-modal.component.css | 138 ++- .../health-id-display-modal.component.html | 120 ++- .../health-id-display-modal.component.ts | 807 ++++++++++++++++-- src/registrar/registration.module.ts | 2 + .../abha-information.component.ts | 16 +- .../registration/registration.component.ts | 47 +- src/registrar/services/registrar.service.ts | 14 + 9 files changed, 1125 insertions(+), 125 deletions(-) create mode 100644 src/registrar/abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component.html create mode 100644 src/registrar/abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component.ts diff --git a/src/registrar/abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component.html b/src/registrar/abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component.html new file mode 100644 index 0000000..94588dd --- /dev/null +++ b/src/registrar/abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component.html @@ -0,0 +1,35 @@ +

{{ title }}

+ +

{{ message }}

+
+ + Name (as on Aadhaar) + + Name is required + + + + Gender + + Male + Female + Other + + + + + Year of Birth + + Invalid year + +
+ + + + + + diff --git a/src/registrar/abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component.ts b/src/registrar/abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component.ts new file mode 100644 index 0000000..eb71b4d --- /dev/null +++ b/src/registrar/abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component.ts @@ -0,0 +1,71 @@ +/* + * AMRIT – Accessible Medical Records via Integrated Technology + * Integrated EHR (Electronic Health Records) Solution + * + * Copyright (C) "Piramal Swasthya Management and Research Institute" + * + * This file is part of AMRIT. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see https://www.gnu.org/licenses/. + */ +import { Component, Inject } from "@angular/core"; +import { MAT_DIALOG_DATA, MatDialogRef } from "@angular/material/dialog"; +import { FormBuilder, FormGroup, Validators } from "@angular/forms"; + +@Component({ + selector: "app-aadhaar-correction-dialog", + templateUrl: "aadhaar-correction-dialog.component.html", +}) +export class AadhaarCorrectionDialogComponent { + form: FormGroup; + title: string; + message: string; + + constructor( + private fb: FormBuilder, + private dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any, + ) { + this.title = data?.title ?? "Aadhaar correction"; + this.message = data?.message ?? "Please correct Aadhaar provided details"; + const formData = data?.formData || {}; + this.form = this.fb.group({ + name: [ + formData.name || "", + [Validators.required, Validators.minLength(1)], + ], + gender: [formData.gender || "", Validators.required], + yearOfBirth: [ + formData.yearOfBirth || new Date().getFullYear(), + [ + Validators.required, + Validators.min(1900), + Validators.max(new Date().getFullYear()), + ], + ], + }); + } + + submit() { + if (this.form.valid) { + this.dialogRef.close(this.form.value); + } else { + this.form.markAllAsTouched(); + } + } + + cancel() { + this.dialogRef.close(); + } +} diff --git a/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.css b/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.css index ef28ff0..3c2578d 100644 --- a/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.css +++ b/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.css @@ -56,4 +56,140 @@ md2-pagination { .overlay:root { padding: 0px; } - \ No newline at end of file + + /* Aadhaar Verification Panel - Material You pastel style */ + + .aadhaar-verify-panel { + background: linear-gradient(135deg, #f3f8ff, #f9fbff); + border: 1px solid #dbe7ff; + border-radius: 12px; + padding: 20px; + margin-top: 20px; + box-shadow: 0 1px 4px rgba(25, 118, 210, 0.08); + transition: box-shadow 0.25s ease, background 0.25s ease; + + &:hover { + background: #ffffff; + box-shadow: 0 3px 10px rgba(25, 118, 210, 0.1); + } + + .aadhaar-header { + display: flex; + justify-content: space-between; + align-items: center; + + .aadhaar-heading { + strong { + font-weight: 600; + color: #1a237e; + font-size: 15px; + } + + .aadhaar-subtext { + font-size: 12.5px; + color: #5f6368; + margin-top: 2px; + } + } + + .aadhaar-reset-btn { + color: #1976d2; + transition: transform 0.15s ease; + + &:hover { + transform: rotate(90deg); + } + } + } + + .aadhaar-verify-form { + display: flex; + flex-wrap: wrap; + gap: 16px; + margin-top: 14px; + + .aadhaar-field { + flex: 1 1 240px; + min-width: 180px; + + &.small { + width: 140px; + } + + ::ng-deep .mat-form-field-flex { + background: #ffffff; + border-radius: 6px; + } + } + } + + .aadhaar-actions { + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 10px; + margin-top: 16px; + + .aadhaar-apply-btn { + background-color: #1976d2; + color: white; + font-weight: 500; + letter-spacing: 0.3px; + border-radius: 8px; + min-width: 190px; + + &:hover { + background-color: #1565c0; + } + + &:disabled { + background-color: #bbdefb; + color: white; + } + } + + .aadhaar-reset-text-btn { + border-color: #1976d2; + color: #1976d2; + + &:hover { + background: rgba(25, 118, 210, 0.05); + } + } + + .aadhaar-note { + margin-left: 10px; + color: #5f6368; + font-size: 12.5px; + flex: 1 1 100%; + } + } + + @media (max-width: 768px) { + padding: 12px; + + .aadhaar-verify-form { + flex-direction: column; + } + + .aadhaar-actions { + flex-direction: column; + align-items: stretch; + + .aadhaar-apply-btn, + .aadhaar-reset-text-btn { + width: 100%; + } + + .aadhaar-note { + text-align: center; + margin-top: 8px; + } + } + } + } + + /* Optional: subtle transition for mat-form-field focus */ + ::ng-deep .mat-form-field-appearance-fill .mat-form-field-flex { + transition: box-shadow 0.15s ease; + } \ No newline at end of file diff --git a/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.html b/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.html index 926d2f3..282e41a 100644 --- a/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.html +++ b/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.html @@ -39,11 +39,7 @@

searchDetails.data.length > 0 " > - +
@@ -107,11 +103,7 @@

class="table-responsive vw100" *ngIf="!healthIDMapping && !enablehealthIdOTPForm && !searchPopup" > - +
From f439a1b1065949e1eced51fe7f4532414367757a Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Tue, 6 Jan 2026 15:28:30 +0530 Subject: [PATCH 10/13] fix: AMM-2038 found ben id issue , and age issue fixed that --- src/registrar/search/search.component.html | 6 +++--- src/registrar/search/search.component.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/registrar/search/search.component.html b/src/registrar/search/search.component.html index 5fa4928..5982564 100644 --- a/src/registrar/search/search.component.html +++ b/src/registrar/search/search.component.html @@ -11,7 +11,7 @@ id="searchbox" pattern="[a-zA-Z0-9]*" maxlength="32" - placeholder="{{ isEnableES ? currentLanguageSet?.ro?.benIDOrPhNo : currentLanguageSet?.ro?.benIDOrPhNo }}" + placeholder="{{ isEnableES ? currentLanguageSet?.ro?.benDetails : currentLanguageSet?.ro?.benIDOrPhNo }}" class="pull-left search_textbox" [(ngModel)]="quicksearchTerm" (ngModelChange)="onSearchInputChange($event)" @@ -110,7 +110,7 @@

@@ -163,7 +163,7 @@

*matCellDef="let beneficiary" (click)="patientRevisited(beneficiary.benObject)" > - {{ isEnableES ? beneficiary?.beneficiaryRegID : beneficiary?.beneficiaryID }} + {{ beneficiary?.beneficiaryID }} diff --git a/src/registrar/search/search.component.ts b/src/registrar/search/search.component.ts index bc3b64b..5e59a27 100644 --- a/src/registrar/search/search.component.ts +++ b/src/registrar/search/search.component.ts @@ -436,7 +436,7 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked, OnDes benObject && benObject.m_gender && benObject.m_gender.genderName && - benObject.dOB + benObject.dob ) { const action = false; console.log(JSON.stringify(benObject, null, 4), 'benObject'); @@ -455,7 +455,7 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked, OnDes .subscribe((result) => { if (result) this.sendToNurseWindow(result, benObject); }); - } else if (!benObject.m_gender.genderName && !benObject.dOB) { + } else if (!benObject.m_gender.genderName && !benObject.dob) { this.confirmationService.alert( this.currentLanguageSet.alerts.info.genderAndAgeDetails, 'info', @@ -465,7 +465,7 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked, OnDes this.currentLanguageSet.alerts.info.noGenderDetails, 'info', ); - } else if (!benObject.dOB) { + } else if (!benObject.dob) { this.confirmationService.alert( this.currentLanguageSet.alerts.info.noAgeDetailsAvail, 'info', From 495ccc84405ee2f7d9ca3850f830c064f7ee69cb Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Tue, 6 Jan 2026 15:32:37 +0530 Subject: [PATCH 11/13] fix: removed the esenable condition for table serach --- src/registrar/search/search.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/search/search.component.html b/src/registrar/search/search.component.html index 5982564..8196a72 100644 --- a/src/registrar/search/search.component.html +++ b/src/registrar/search/search.component.html @@ -110,7 +110,7 @@

From 9f810214500899453e87711e2b769e6acbfe8c5f Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Tue, 6 Jan 2026 16:50:59 +0530 Subject: [PATCH 12/13] Revert "Amm 1811 (#34)" This reverts commit e14c76d22f182eed3dcae0a003c0de6ed8f31543. --- .../aadhaar-correction-dialog.component.html | 35 - .../aadhaar-correction-dialog.component.ts | 71 -- .../health-id-display-modal.component.css | 138 +-- .../health-id-display-modal.component.html | 120 +-- .../health-id-display-modal.component.ts | 807 ++---------------- src/registrar/registration.module.ts | 2 - .../abha-information.component.ts | 16 +- .../registration/registration.component.ts | 47 +- src/registrar/services/registrar.service.ts | 14 - 9 files changed, 125 insertions(+), 1125 deletions(-) delete mode 100644 src/registrar/abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component.html delete mode 100644 src/registrar/abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component.ts diff --git a/src/registrar/abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component.html b/src/registrar/abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component.html deleted file mode 100644 index 94588dd..0000000 --- a/src/registrar/abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component.html +++ /dev/null @@ -1,35 +0,0 @@ -

{{ title }}

- -

{{ message }}

-
- - Name (as on Aadhaar) - - Name is required - - - - Gender - - Male - Female - Other - - - - - Year of Birth - - Invalid year - - - - - - - - diff --git a/src/registrar/abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component.ts b/src/registrar/abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component.ts deleted file mode 100644 index eb71b4d..0000000 --- a/src/registrar/abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component.ts +++ /dev/null @@ -1,71 +0,0 @@ -/* - * AMRIT – Accessible Medical Records via Integrated Technology - * Integrated EHR (Electronic Health Records) Solution - * - * Copyright (C) "Piramal Swasthya Management and Research Institute" - * - * This file is part of AMRIT. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see https://www.gnu.org/licenses/. - */ -import { Component, Inject } from "@angular/core"; -import { MAT_DIALOG_DATA, MatDialogRef } from "@angular/material/dialog"; -import { FormBuilder, FormGroup, Validators } from "@angular/forms"; - -@Component({ - selector: "app-aadhaar-correction-dialog", - templateUrl: "aadhaar-correction-dialog.component.html", -}) -export class AadhaarCorrectionDialogComponent { - form: FormGroup; - title: string; - message: string; - - constructor( - private fb: FormBuilder, - private dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any, - ) { - this.title = data?.title ?? "Aadhaar correction"; - this.message = data?.message ?? "Please correct Aadhaar provided details"; - const formData = data?.formData || {}; - this.form = this.fb.group({ - name: [ - formData.name || "", - [Validators.required, Validators.minLength(1)], - ], - gender: [formData.gender || "", Validators.required], - yearOfBirth: [ - formData.yearOfBirth || new Date().getFullYear(), - [ - Validators.required, - Validators.min(1900), - Validators.max(new Date().getFullYear()), - ], - ], - }); - } - - submit() { - if (this.form.valid) { - this.dialogRef.close(this.form.value); - } else { - this.form.markAllAsTouched(); - } - } - - cancel() { - this.dialogRef.close(); - } -} diff --git a/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.css b/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.css index 3c2578d..ef28ff0 100644 --- a/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.css +++ b/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.css @@ -56,140 +56,4 @@ md2-pagination { .overlay:root { padding: 0px; } - - /* Aadhaar Verification Panel - Material You pastel style */ - - .aadhaar-verify-panel { - background: linear-gradient(135deg, #f3f8ff, #f9fbff); - border: 1px solid #dbe7ff; - border-radius: 12px; - padding: 20px; - margin-top: 20px; - box-shadow: 0 1px 4px rgba(25, 118, 210, 0.08); - transition: box-shadow 0.25s ease, background 0.25s ease; - - &:hover { - background: #ffffff; - box-shadow: 0 3px 10px rgba(25, 118, 210, 0.1); - } - - .aadhaar-header { - display: flex; - justify-content: space-between; - align-items: center; - - .aadhaar-heading { - strong { - font-weight: 600; - color: #1a237e; - font-size: 15px; - } - - .aadhaar-subtext { - font-size: 12.5px; - color: #5f6368; - margin-top: 2px; - } - } - - .aadhaar-reset-btn { - color: #1976d2; - transition: transform 0.15s ease; - - &:hover { - transform: rotate(90deg); - } - } - } - - .aadhaar-verify-form { - display: flex; - flex-wrap: wrap; - gap: 16px; - margin-top: 14px; - - .aadhaar-field { - flex: 1 1 240px; - min-width: 180px; - - &.small { - width: 140px; - } - - ::ng-deep .mat-form-field-flex { - background: #ffffff; - border-radius: 6px; - } - } - } - - .aadhaar-actions { - display: flex; - align-items: center; - flex-wrap: wrap; - gap: 10px; - margin-top: 16px; - - .aadhaar-apply-btn { - background-color: #1976d2; - color: white; - font-weight: 500; - letter-spacing: 0.3px; - border-radius: 8px; - min-width: 190px; - - &:hover { - background-color: #1565c0; - } - - &:disabled { - background-color: #bbdefb; - color: white; - } - } - - .aadhaar-reset-text-btn { - border-color: #1976d2; - color: #1976d2; - - &:hover { - background: rgba(25, 118, 210, 0.05); - } - } - - .aadhaar-note { - margin-left: 10px; - color: #5f6368; - font-size: 12.5px; - flex: 1 1 100%; - } - } - - @media (max-width: 768px) { - padding: 12px; - - .aadhaar-verify-form { - flex-direction: column; - } - - .aadhaar-actions { - flex-direction: column; - align-items: stretch; - - .aadhaar-apply-btn, - .aadhaar-reset-text-btn { - width: 100%; - } - - .aadhaar-note { - text-align: center; - margin-top: 8px; - } - } - } - } - - /* Optional: subtle transition for mat-form-field focus */ - ::ng-deep .mat-form-field-appearance-fill .mat-form-field-flex { - transition: box-shadow 0.15s ease; - } \ No newline at end of file + \ No newline at end of file diff --git a/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.html b/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.html index 282e41a..926d2f3 100644 --- a/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.html +++ b/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.html @@ -39,7 +39,11 @@

searchDetails.data.length > 0 " > -

@@ -197,17 +189,13 @@

class="table-responsive vw100" *ngIf="healthIDMapping && !enablehealthIdOTPForm && !searchPopup" > - - - - - +
- {{ currentLanguageSet?.coreComponents?.sno }} - 1
+ + + +
+ {{ currentLanguageSet?.coreComponents?.sno }} + 1
+ +
+
+
+ {{ + currentLanguageSet?.pleaseVerifyAadhaarHeading || + "Please verify Aadhaar details" + }} +
+ {{ + currentLanguageSet?.pleaseVerifyAadhaarSub || + "Review your Aadhaar-linked details before generating the + token." + }} +
+
+ +
+ +
+ + {{ + currentLanguageSet?.name || "Name (as on Aadhaar)" + }} + + + + + {{ + currentLanguageSet?.gender || "Gender" + }} + + {{ + currentLanguageSet?.male || "Male" + }} + {{ + currentLanguageSet?.female || "Female" + }} + {{ + currentLanguageSet?.other || "Other" + }} + + + + + {{ + currentLanguageSet?.yearOfBirth || "Year of birth" + }} + + +
+ {{ + currentLanguageSet?.aadhaarVerifyNote || + "If the server still reports mismatch, update again or follow + the on-screen suggestions." + }} +
+
+
+
@@ -348,14 +417,13 @@

id="cancelButton" mat-raised-button type="button" - style="margin-right: 3px;" + style="margin-right: 3px" color="primary" class="pull-right mat_blue" (click)="resendOtp()" > {{ currentLanguageSet?.resendOTP }} - diff --git a/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.ts b/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.ts index 9afb45e..595c393 100644 --- a/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.ts +++ b/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.ts @@ -19,42 +19,47 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see https://www.gnu.org/licenses/. */ -import { Component, DoCheck, Inject, OnInit } from '@angular/core'; -import { FormGroup, FormBuilder } from '@angular/forms'; -import { DatePipe } from '@angular/common'; +import { Component, DoCheck, Inject, OnInit } from "@angular/core"; +import { FormGroup, FormBuilder } from "@angular/forms"; +import { DatePipe } from "@angular/common"; import { MAT_DIALOG_DATA, MatDialog, MatDialogRef, -} from '@angular/material/dialog'; -import { MatTableDataSource } from '@angular/material/table'; -import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; -import { ConfirmationService } from 'src/app/app-modules/core/services'; -import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service'; -import { RegistrarService } from '../../services/registrar.service'; +} from "@angular/material/dialog"; +import { MatTableDataSource } from "@angular/material/table"; +import { SetLanguageComponent } from "src/app/app-modules/core/components/set-language.component"; +import { + BeneficiaryDetailsService, + ConfirmationService, +} from "src/app/app-modules/core/services"; +import { HttpServiceService } from "src/app/app-modules/core/services/http-service.service"; +import { RegistrarService } from "../../services/registrar.service"; import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, -} from '@angular/material/core'; +} from "@angular/material/core"; import { MomentDateAdapter, MAT_MOMENT_DATE_ADAPTER_OPTIONS, -} from '@angular/material-moment-adapter'; -import { SessionStorageService } from '../../services/session-storage.service'; -import { DownloadSearchAbhaComponent } from '../download-search-abha/download-search-abha.component'; +} from "@angular/material-moment-adapter"; +import { SessionStorageService } from "../../services/session-storage.service"; +import { DownloadSearchAbhaComponent } from "../download-search-abha/download-search-abha.component"; +import { interval, startWith, Subscription } from "rxjs"; +import { AadhaarCorrectionDialogComponent } from "../aadhar-correction-dialog/aadhaar-correction-dialog.component"; @Component({ - selector: 'app-health-id-display-modal', - templateUrl: './health-id-display-modal.component.html', - styleUrls: ['./health-id-display-modal.component.css'], + selector: "app-health-id-display-modal", + templateUrl: "./health-id-display-modal.component.html", + styleUrls: ["./health-id-display-modal.component.css"], providers: [ { provide: DatePipe, }, { provide: MAT_DATE_LOCALE, - useValue: 'en-US', // Set the desired locale (e.g., 'en-GB' for dd/MM/yyyy) + useValue: "en-US", // Set the desired locale (e.g., 'en-GB' for dd/MM/yyyy) }, { provide: DateAdapter, @@ -65,13 +70,13 @@ import { DownloadSearchAbhaComponent } from '../download-search-abha/download-se provide: MAT_DATE_FORMATS, useValue: { parse: { - dateInput: 'LL', + dateInput: "LL", }, display: { - dateInput: 'DD/MM/YYYY', // Set the desired display format - monthYearLabel: 'MMM YYYY', - dateA11yLabel: 'LL', - monthYearA11yLabel: 'MMMM YYYY', + dateInput: "DD/MM/YYYY", // Set the desired display format + monthYearLabel: "MMM YYYY", + dateA11yLabel: "LL", + monthYearA11yLabel: "MMMM YYYY", }, }, }, @@ -91,32 +96,45 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { searchPopup = false; displayedColumns: any = [ - 'sno', - 'abhaNumber', - 'abha', - 'dateOfCreation', - 'abhaMode', + "sno", + "abhaNumber", + "abha", + "dateOfCreation", + "abhaMode", ]; searchDetails = new MatTableDataSource(); displayedColumns1: any = [ - 'sno', - 'abhaNumber', - 'abha', - 'dateOfCreation', - 'abhaMode', - 'action', + "sno", + "abhaNumber", + "abha", + "dateOfCreation", + "abhaMode", + "action", ]; displayedColumns2: any = [ - 'sno', - 'healthIDNo', - 'healthID', - 'createdDate', - 'healthIDMode', - 'rblMode', + "sno", + "healthIDNo", + "healthID", + "createdDate", + "healthIDMode", + "rblMode", ]; healthIDArray = new MatTableDataSource(); + linkToken: any; + beneficiaryDetails: any; + public aadhaarVerification: { + name: string; + gender: string; + yearOfBirth: number | null; + } = { + name: "", + gender: "", + yearOfBirth: null, + }; + public aadhaarVerified = false; + public currentYear = new Date().getFullYear(); constructor( public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public input: any, @@ -126,11 +144,28 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { private confirmationService: ConfirmationService, private datePipe: DatePipe, private dialogMd: MatDialog, - private sessionstorage:SessionStorageService, + private sessionstorage: SessionStorageService, + private beneficiaryDetailsService: BeneficiaryDetailsService, ) { dialogRef.disableClose = true; } + private closeConfirmationAlertIfOpen() { + try { + if (this.lastAlertRef) { + this.lastAlertRef.close(); + this.lastAlertRef = null; + } + } catch (e) { + console.warn("Failed to close confirmation alert", e); + } + } + + // Keep a reference to the last confirmationService alert dialog so we can close + // it when another dialog (MatDialog) is opened on top. + private lastAlertRef: MatDialogRef | null = null; + + ngOnInit() { console.log("this.input", this.input); this.searchDetails.data = []; @@ -141,23 +176,21 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { this.input.search !== undefined ? this.input.search : false; this.healthIDMapping = this.input.healthIDMapping; console.log("this.healthIDMapping", this.healthIDMapping); - if ( - this.input.dataList !== undefined && - this.input.search === true - ) { + this.getBeneficiaryDetails(); + if (this.input.dataList !== undefined && this.input.search === true) { let tempVal: any = this.input.dataList; this.benDetails = this.input.dataList; let tempCreatDate: any = this.input.dataList.createdDate; console.log("tempVal", tempVal); - this.searchDetails.data.push(tempVal); - console.log("this.searchDetails.data%%", this.searchDetails.data) - + this.searchDetails.data.push(tempVal); + console.log("this.searchDetails.data%%", this.searchDetails.data); } - if (this.input.dataList !== undefined && + if ( + this.input.dataList !== undefined && this.input.dataList.data?.BenHealthDetails !== undefined - ){ + ) { this.benDetails = this.input.dataList.data.BenHealthDetails; - console.log("this.benDetails1",this.benDetails) + console.log("this.benDetails1", this.benDetails); } this.healthIdOTPForm = this.createOtpGenerationForm(); this.createList(); @@ -180,7 +213,7 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { this.benDetails.forEach((healthID: any) => { healthID.createdDate = this.datePipe.transform( healthID.createdDate, - 'yyyy-MM-dd hh:mm:ss a', + "yyyy-MM-dd hh:mm:ss a", ); this.healthIDArray.data.push(healthID); }); @@ -188,8 +221,611 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { } onRadioChange(data: any) { + console.clear(); + console.log(this.selectedHealthID); this.selectedHealthID = data; + console.log(this.selectedHealthID); + } + + beneficiaryDetailSubscription: any; + getBeneficiaryDetails() { + this.beneficiaryDetailSubscription = + this.beneficiaryDetailsService.beneficiaryDetails$.subscribe( + (beneficiary) => { + if (beneficiary) { + if (beneficiary) { + this.beneficiaryDetails = beneficiary; + this.initAadhaarVerificationFromBeneficiary(); + } + } + }, + ); + } + + private initAadhaarVerificationFromBeneficiary() { + try { + const name = this.beneficiaryDetails?.beneficiaryName ?? ""; + const gender = this.beneficiaryDetails?.genderName ?? ""; + const dob = this.beneficiaryDetails?.dOB ?? null; + + let yob: number | null = null; + if (dob) { + const parsed = new Date(dob); + if (!isNaN(parsed.getTime())) { + yob = parsed.getFullYear(); + } else { + const maybe = parseInt(String(dob), 10); + if (!isNaN(maybe)) yob = maybe; + } + } + + this.aadhaarVerification = { + name, + gender, + yearOfBirth: yob ?? this.currentYear - 30, + }; + this.aadhaarVerified = false; + } catch (e) { + console.warn("initAadhaarVerificationFromBeneficiary failed", e); + } + } + + public onResetAadhaarVerification() { + this.initAadhaarVerificationFromBeneficiary(); + } + + // Apply the verified values into beneficiaryDetails and call generateTokenForLinking() + public applyAndGenerate() { + if ( + !this.aadhaarVerification.name || + !this.aadhaarVerification.gender || + !this.aadhaarVerification.yearOfBirth + ) { + this.confirmationService.alert( + this.currentLanguageSet?.pleaseFillAllFields || + "Please fill all fields", + "error", + ); + return; + } + + // Copy into beneficiaryDetails so existing generateTokenForLinking reads them + this.beneficiaryDetails.beneficiaryName = this.aadhaarVerification.name; + this.beneficiaryDetails.genderName = this.aadhaarVerification.gender; + this.beneficiaryDetails.dOB = `${this.aadhaarVerification.yearOfBirth}-01-01T00:00:00.000Z`; + + this.aadhaarVerified = true; + this.suppressAutoGenerate = true; + if (this.linkPollingSub) { + this.linkPollingSub.unsubscribe(); + this.linkPollingSub = null; + } + // Trigger existing flow + this.generateTokenForLinking(); + } + + private linkPollingSub: Subscription | null = null; + private isPollingLink = false; + private generateResubmitAttempts = 0; + private readonly maxGenerateResubmitAttempts = 3; + // prevents concurrent generate calls + public isGenerating = false; + + // small guard to suppress any automatic re-trigger events while manual resubmit running + private suppressAutoGenerate = false; + + generateTokenForLinking() { + if (this.isGenerating) { + console.debug( + "[link] generateTokenForLinking suppressed because already generating", + ); + return; + } + this.isGenerating = true; + this.showProgressBar = true; + + const abdmFacilityId = this.sessionstorage.getItem("abdmFacilityId"); + const abdmFacilityName = this.sessionstorage.getItem("abdmFacilityName"); + const dateString = this.beneficiaryDetails.dOB; + const yearOfBirth = new Date(dateString).getFullYear(); + + const reqObj = { + abhaNumber: this.selectedHealthID.healthIdNumber + ? this.selectedHealthID.healthIdNumber + : null, + abhaAddress: this.selectedHealthID.healthId + ? this.selectedHealthID.healthId + : null, + name: this.beneficiaryDetails.beneficiaryName, + gender: this.beneficiaryDetails.genderName, + yearOfBirth, + visitCode: this.input.visitCode, + visitCategory: this.beneficiaryDetails.VisitCategory, + abdmFacilityId: + abdmFacilityId !== null && + abdmFacilityId !== undefined && + abdmFacilityId !== "" + ? abdmFacilityId + : null, + abdmFacilityName: + abdmFacilityName !== null && + abdmFacilityName !== undefined && + abdmFacilityName !== "" + ? abdmFacilityName + : null, + }; + + this.registrarService.generateTokenForCareContext(reqObj).subscribe( + (res: any) => { + this.showProgressBar = false; + const data = res?.data ?? null; + + if (data?.linkToken) { + this.linkToken = data.linkToken; + this.startLinkCareContextPolling(); + return; + } + + if (data?.requestId && !data?.linkToken) { + const requestId = data.requestId; + this.resumeViaSecondApi(requestId, reqObj); + return; + } + + const dataError = data?.Error ?? data?.error ?? null; + if (dataError) { + const serverMsg = + dataError?.Message ?? + dataError?.message ?? + "Details do not match Aadhaar"; + this.handleAadhaarMismatchDialog( + { + name: reqObj.name, + gender: reqObj.gender, + yearOfBirth: reqObj.yearOfBirth, + }, + serverMsg, + ); + return; + } + + const fallbackMsg = + res?.errorMessage ?? res?.status ?? "Failed to generate link token"; + + if ( + String(fallbackMsg).toLowerCase().includes("duplicate") || + String(fallbackMsg).toLowerCase().includes("abdm-1092") + ) { + this.confirmationService.alert(fallbackMsg, "error"); + return; + } + + this.confirmationService.alert(fallbackMsg, "error"); + }, + (err) => { + this.showProgressBar = false; + const payloadError = err?.error ?? null; + const errMsg = + payloadError?.Message ?? + payloadError?.message ?? + err?.error?.errorMessage ?? + err?.message ?? + ""; + + if ( + String(errMsg).toLowerCase().includes("duplicate") || + String(errMsg).toLowerCase().includes("abdm-1092") + ) { + this.confirmationService.alert(errMsg, "error"); + return; + } + + if (payloadError && (payloadError?.Code || payloadError?.Message)) { + const serverMsg = + payloadError?.Message ?? + payloadError?.message ?? + "Details do not match Aadhaar"; + this.handleAadhaarMismatchDialog( + { + name: this.beneficiaryDetails.beneficiaryName, + gender: this.beneficiaryDetails.genderName, + yearOfBirth: new Date(this.beneficiaryDetails.dOB).getFullYear(), + }, + serverMsg, + ); + return; + } + + // generic + this.confirmationService.alert( + errMsg || "Something went wrong", + "error", + ); + }, + ); } + + private resumeViaSecondApi(requestId: string, originalReqObj: any) { + const reqObj = { + requestId, + abdmFacilityId: this.sessionstorage.getItem("abdmFacilityId"), + abdmFacilityName: this.sessionstorage.getItem("abdmFacilityName"), + abhaNumber: this.selectedHealthID?.healthIdNumber ?? null, + abhaAddress: this.selectedHealthID?.healthId ?? null, + visitCode: this.input.visitCode, + visitCategory: this.beneficiaryDetails.VisitCategory, + visitReason: this.beneficiaryDetails.VisitReason, + beneficiaryId: this.beneficiaryDetails.beneficiaryID, + }; + + this.pollLinkCareContext(reqObj, { resumeRequestId: requestId }); + } + + private pollLinkCareContext( + reqObj: any, + options?: { isStartup?: boolean; resumeRequestId?: string }, + ) { + const maxAttempts = 3; + const delayMs = 5000; + + if (options?.isStartup) { + if (this.isPollingLink) return; + if (!this.linkToken) { + this.confirmationService.alert( + "No link token available to start linking", + "error", + ); + return; + } + this.isPollingLink = true; + } + + this.isGenerating = false; + this.showProgressBar = true; + + if (this.linkPollingSub) { + this.linkPollingSub.unsubscribe(); + this.linkPollingSub = null; + } + + let attempts = 0; + this.linkPollingSub = interval(delayMs) + .pipe(startWith(0)) + .subscribe(() => { + attempts++; + this.registrarService.linkCareContext(reqObj).subscribe( + (res: any) => { + const data = res?.data ?? null; + const isEmpty = data && Object.keys(data).length === 0; + const respError = data?.Error ?? data?.error ?? null; + + if ( + data?.message && + String(data.message) + .toLowerCase() + .includes("care context added successfully") + ) { + this.stopLinkCareContextPolling(); + this.showProgressBar = false; + this.confirmationService.alert( + data?.message || + this.currentLanguageSet.linkSuccess || + "Care context linked successfully", + "success", + ); + this.linkToken = null; + this.closeDialog(); + return; + } + if (respError) { + const serverMsg = + respError?.Message ?? respError?.message ?? "Linking failed"; + const code = String(respError?.Code ?? "").toLowerCase(); + + if ( + code.includes("1207") || + /aadhar|aadhaar|does not match/i.test(serverMsg) + ) { + this.stopLinkCareContextPolling(); + this.showProgressBar = false; + this.handleAadhaarMismatchDialog( + { + name: this.beneficiaryDetails.beneficiaryName, + gender: this.beneficiaryDetails.genderName, + yearOfBirth: new Date( + this.beneficiaryDetails.dOB, + ).getFullYear(), + }, + serverMsg, + ); + return; + } + + this.stopLinkCareContextPolling(); + this.showProgressBar = false; + this.confirmationService.alert(serverMsg, "error"); + return; + } + + if (isEmpty) { + console.debug( + `[link] pollLinkCareContext: empty response attempt ${attempts}/${maxAttempts}`, + ); + if (attempts >= maxAttempts) { + this.stopLinkCareContextPolling(); + this.showProgressBar = false; + const infoMsg = options?.resumeRequestId + ? `Still processing. Please try again later with RequestId: ${options.resumeRequestId}` + : "Linking is still processing. Please try again later."; + this.confirmationService.alert(infoMsg, "info"); + } + return; + } + + // fallback after all retries + if (attempts >= maxAttempts) { + this.stopLinkCareContextPolling(); + this.showProgressBar = false; + this.confirmationService.alert( + res?.errorMessage ?? "Linking care context failed after maximum retries", + "error", + ); + } + }, + (err) => { + if (attempts >= maxAttempts) { + const msg = + err?.error?.message ?? err?.message ?? "Linking failed after retries"; + this.stopLinkCareContextPolling(); + this.showProgressBar = false; + this.confirmationService.alert(msg, "error"); + } else { + console.warn("[link] pollLinkCareContext retrying after error", err); + } + }, + ); + }); + } + + private startLinkCareContextPolling() { + const makeReqObj = () => ({ + linkToken: this.linkToken, + abhaNumber: this.selectedHealthID?.healthIdNumber ?? null, + abhaAddress: this.selectedHealthID?.healthId ?? null, + abdmFacilityId: this.sessionstorage.getItem("abdmFacilityId"), + abdmFacilityName: this.sessionstorage.getItem("abdmFacilityName"), + visitCode: this.input.visitCode, + visitCategory: this.beneficiaryDetails.VisitCategory, + visitReason: this.beneficiaryDetails.VisitReason, + beneficiaryId: this.beneficiaryDetails.beneficiaryID, + }); + + this.pollLinkCareContext(makeReqObj(), { isStartup: true }); + } + + private stopLinkCareContextPolling() { + if (this.linkPollingSub) { + this.linkPollingSub.unsubscribe(); + this.linkPollingSub = null; + } + this.isPollingLink = false; + this.isGenerating = false; + } + + private isAadhaarMismatch(errorCandidate: any): boolean { + if (!errorCandidate) return false; + + if (typeof errorCandidate === "object") { + const code = String( + errorCandidate.Code ?? errorCandidate.code ?? "", + ).toLowerCase(); + const msg = String( + errorCandidate.Message ?? + errorCandidate.message ?? + errorCandidate.errorMessage ?? + "", + ).toLowerCase(); + + const textMatch = + msg.includes("aadhar") || + msg.includes("aadhaar") || + msg.includes("does not match") || + msg.includes("doesn't match") || + msg.includes("not match") || + msg.includes("match the details"); + + const code1207 = /\b1207\b/.test(code) || /abdm-?1207/.test(code); + + return ( + textMatch || + (code1207 && + (msg.includes("match") || + msg.includes("aadhaar") || + msg.includes("aadhar"))) + ); + } + + const s = String(errorCandidate).toLowerCase(); + return ( + s.includes("aadhar") || + s.includes("aadhaar") || + s.includes("does not match") || + s.includes("doesn't match") || + s.includes("not match") || + s.includes("match the details") + ); + } + + private handleAadhaarMismatchDialog( + prefill: { name: string; gender: string; yearOfBirth: number }, + serverMsg: string, + ) { + if (this.generateResubmitAttempts >= this.maxGenerateResubmitAttempts) { + this.confirmationService.alert( + "Maximum correction attempts reached. " + (serverMsg || ""), + "error", + ); + return; + } + + // Close any existing confirmation alert before opening the Aadhaar correction dialog + this.closeConfirmationAlertIfOpen(); + + const dialogRef = this.dialogMd.open(AadhaarCorrectionDialogComponent, { + width: "420px", + data: { + title: "Aadhaar details mismatch", + message: + serverMsg || + "The entered details do not match Aadhaar. Please provide Aadhaar-provided details.", + formData: prefill, + }, + }); + + dialogRef + .afterClosed() + .subscribe( + ( + result: + | { name?: string; gender?: string; yearOfBirth?: number } + | undefined, + ) => { + if (!result) { + this.confirmationService.alert( + "Linking cancelled by user.", + "info", + ); + return; + } + + this.generateResubmitAttempts++; + this.resubmitGenerateTokenWithCorrectedDetails(result); + }, + ); + } + + private resubmitGenerateTokenWithCorrectedDetails(corrected: { + name?: string; + gender?: string; + yearOfBirth?: number; + }) { + this.showProgressBar = true; + const abdmFacilityId = this.sessionstorage.getItem("abdmFacilityId"); + const abdmFacilityName = this.sessionstorage.getItem("abdmFacilityName"); + + const reqObj = { + abhaNumber: this.selectedHealthID?.healthIdNumber ?? null, + abhaAddress: this.selectedHealthID?.healthId ?? null, + name: corrected.name ?? this.beneficiaryDetails.beneficiaryName, + gender: corrected.gender ?? this.beneficiaryDetails.genderName, + yearOfBirth: + corrected.yearOfBirth ?? + new Date(this.beneficiaryDetails.dOB).getFullYear(), + visitCode: this.input.visitCode, + visitCategory: this.beneficiaryDetails.VisitCategory, + abdmFacilityId: + abdmFacilityId !== null && + abdmFacilityId !== undefined && + abdmFacilityId !== "" + ? abdmFacilityId + : null, + abdmFacilityName: + abdmFacilityName !== null && + abdmFacilityName !== undefined && + abdmFacilityName !== "" + ? abdmFacilityName + : null, + }; + + this.registrarService.generateTokenForCareContext(reqObj).subscribe( + (res: any) => { + this.showProgressBar = false; + const data = res?.data ?? null; + const dataError = data?.Error ?? data?.error ?? null; + + // ⚠️ CASE 1: Aadhaar mismatch response + if (dataError) { + const serverMsg = + dataError?.Message ?? + dataError?.message ?? + "Details do not match Aadhaar"; + if ( + this.generateResubmitAttempts < this.maxGenerateResubmitAttempts + ) { + this.handleAadhaarMismatchDialog( + { + name: reqObj.name, + gender: reqObj.gender, + yearOfBirth: reqObj.yearOfBirth, + }, + serverMsg, + ); + } else { + this.confirmationService.alert(serverMsg, "error"); + } + return; + } + + // CASE 2: Successful token — start polling + if (data?.linkToken) { + this.linkToken = data.linkToken; + this.generateResubmitAttempts = 0; + this.startLinkCareContextPolling(); + return; + } + + // CASE 3: Success (200) but only requestId, no linkToken + if (data?.requestId && !data?.linkToken) { + this.resumeViaSecondApi(data.requestId, reqObj); + return; + } + + // CASE 4: Duplicate or other backend signals + const fallbackMsg = + res?.errorMessage ?? res?.status ?? "Failed to generate link token"; + + if ( + String(fallbackMsg).toLowerCase().includes("duplicate") || + String(fallbackMsg).toLowerCase().includes("abdm-1092") + ) { + // Flow 4 fallback: show error to user (no resume via duplicate) + this.confirmationService.alert(fallbackMsg, "error"); + return; + } + + // CASE 5: Unknown/invalid + this.confirmationService.alert(fallbackMsg, "error"); + }, + (err) => { + this.showProgressBar = false; + const errMsg = + err?.error?.errorMessage ?? err?.message ?? "Something went wrong"; + + if ( + this.isAadhaarMismatch(errMsg) && + this.generateResubmitAttempts < this.maxGenerateResubmitAttempts + ) { + this.handleAadhaarMismatchDialog( + { + name: reqObj.name, + gender: reqObj.gender, + yearOfBirth: reqObj.yearOfBirth, + }, + errMsg, + ); + } else if ( + String(errMsg).toLowerCase().includes("duplicate") || + String(errMsg).toLowerCase().includes("abdm-1092") + ) { + // Flow 4: fallback to showing error instead of resuming + this.confirmationService.alert(errMsg, "error"); + } else { + this.confirmationService.alert(errMsg, "error"); + } + }, + ); + } + generateOtpForMapping() { this.showProgressBar = true; const abdmFacilityId = this.sessionstorage.getItem("abdmFacilityId"); @@ -202,8 +838,18 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { ? this.selectedHealthID.healthIdNumber : null, authenticationMode: this.selectedHealthID.authenticationMode, - abdmFacilityId: (abdmFacilityId !== null && abdmFacilityId !== undefined && abdmFacilityId !== "") ? abdmFacilityId : null, - abdmFacilityName: (abdmFacilityName !== null && abdmFacilityName !== undefined && abdmFacilityName !== "") ? abdmFacilityName : null + abdmFacilityId: + abdmFacilityId !== null && + abdmFacilityId !== undefined && + abdmFacilityId !== "" + ? abdmFacilityId + : null, + abdmFacilityName: + abdmFacilityName !== null && + abdmFacilityName !== undefined && + abdmFacilityName !== "" + ? abdmFacilityName + : null, }; this.registrarService.generateOtpForMappingCareContext(reqObj).subscribe( (receivedOtpResponse: any) => { @@ -211,14 +857,14 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { this.showProgressBar = false; this.confirmationService.alert( this.currentLanguageSet.OTPSentToRegMobNo, - 'success', + "success", ); this.transactionId = receivedOtpResponse.data.txnId; this.enablehealthIdOTPForm = true; } else { this.confirmationService.alert( receivedOtpResponse.errorMessage, - 'error', + "error", ); this.enablehealthIdOTPForm = false; this.showProgressBar = false; @@ -226,7 +872,7 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { }, (err) => { this.showProgressBar = false; - this.confirmationService.alert(err.errorMessage, 'error'); + this.confirmationService.alert(err.errorMessage, "error"); this.enablehealthIdOTPForm = false; }, ); @@ -239,9 +885,9 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { return true; } checkOTP() { - const otp = this.healthIdOTPForm.controls['otp'].value; + const otp = this.healthIdOTPForm.controls["otp"].value; let cflag = false; - if (otp !== '' && otp !== undefined && otp !== null) { + if (otp !== "" && otp !== undefined && otp !== null) { const hid = otp; if (hid.length >= 4 && hid.length <= 32) { for (let i = 0; i < hid.length; i++) { @@ -267,7 +913,7 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { const abdmFacilityId = this.sessionstorage.getItem("abdmFacilityId"); const abdmFacilityName = this.sessionstorage.getItem("abdmFacilityName"); const verifyOtpData = { - otp: this.healthIdOTPForm.controls['otp'].value, + otp: this.healthIdOTPForm.controls["otp"].value, txnId: this.transactionId, beneficiaryID: this.selectedHealthID.beneficiaryRegID, healthID: this.selectedHealthID.healthId @@ -278,11 +924,21 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { : null, visitCode: this.input.visitCode, visitCategory: - this.sessionstorage.getItem('visitCategory') === 'General OPD (QC)' - ? 'Emergency' - : this.sessionstorage.getItem('visitCategory'), - abdmFacilityId: (abdmFacilityId !== null && abdmFacilityId !== undefined && abdmFacilityId !== "") ? abdmFacilityId : null, - abdmFacilityName: (abdmFacilityName !== null && abdmFacilityName !== undefined && abdmFacilityName !== "") ? abdmFacilityName : null + this.sessionstorage.getItem("visitCategory") === "General OPD (QC)" + ? "Emergency" + : this.sessionstorage.getItem("visitCategory"), + abdmFacilityId: + abdmFacilityId !== null && + abdmFacilityId !== undefined && + abdmFacilityId !== "" + ? abdmFacilityId + : null, + abdmFacilityName: + abdmFacilityName !== null && + abdmFacilityName !== undefined && + abdmFacilityName !== "" + ? abdmFacilityName + : null, }; this.registrarService .verifyOtpForMappingCarecontext(verifyOtpData) @@ -292,26 +948,26 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { this.showProgressBar = false; this.confirmationService.alert( verifiedMappingData.data.response, - 'success', + "success", ); this.closeDialog(); } else { this.showProgressBar = false; this.confirmationService.alert( verifiedMappingData.errorMessage, - 'error', + "error", ); } }, (err) => { this.showProgressBar = false; - this.confirmationService.alert(err.errorMessage, 'error'); + this.confirmationService.alert(err.errorMessage, "error"); }, ); } resendOtp() { - this.healthIdOTPForm.controls['otp'].reset; - this.healthIdOTPForm.controls['otp'].patchValue(null); + this.healthIdOTPForm.controls["otp"].reset; + this.healthIdOTPForm.controls["otp"].patchValue(null); this.generateOtpForMapping(); } closeDialog() { @@ -319,14 +975,17 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { } printHealthIDCard(data: any) { + // Close any lingering confirmation alert before opening the print dialog + this.closeConfirmationAlertIfOpen(); + const dialogRefValue = this.dialogMd.open(DownloadSearchAbhaComponent, { - height: '330px', - width: '500px', - disableClose: true, + height: "330px", + width: "500px", + disableClose: true, data: { printCard: true, - healthId: data.healthId - } + healthId: data.healthId, + }, }); } } diff --git a/src/registrar/registration.module.ts b/src/registrar/registration.module.ts index 9524417..9063759 100644 --- a/src/registrar/registration.module.ts +++ b/src/registrar/registration.module.ts @@ -38,6 +38,7 @@ import { DisplayAbhaCardComponent } from './abha-components/display-abha-card/di import { AbhaVerifySuccessComponentComponent } from './abha-components/abha-verify-success-component/abha-verify-success-component.component'; import { AbhaEnterMobileOtpComponentComponent } from './abha-components/abha-enter-mobile-otp-component/abha-enter-mobile-otp-component.component'; import { AbhaConsentFormComponent } from './abha-components/abha-consent-form/abha-consent-form.component'; +import { AadhaarCorrectionDialogComponent } from './abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component'; @NgModule({ declarations: [ @@ -66,6 +67,7 @@ import { AbhaConsentFormComponent } from './abha-components/abha-consent-form/ab AbhaVerifySuccessComponentComponent, AbhaEnterMobileOtpComponentComponent, AbhaConsentFormComponent, + AadhaarCorrectionDialogComponent, ], imports: [ CommonModule, diff --git a/src/registrar/registration/abha-information/abha-information.component.ts b/src/registrar/registration/abha-information/abha-information.component.ts index ffdb365..dfc5214 100644 --- a/src/registrar/registration/abha-information/abha-information.component.ts +++ b/src/registrar/registration/abha-information/abha-information.component.ts @@ -52,10 +52,12 @@ export class AbhaInformationComponent { (response: any) => { console.log('responseABHACompoenet', response); if (response) { + this.abhaInfoFormGroup.patchValue({ healthId: response.healthId }); this.abhaInfoFormGroup.patchValue({ healthIdNumber: response.healthIdNumber, }); this.abhaInfoFormGroup.controls['healthIdNumber'].disable(); + console.log('abha info group', this.abhaInfoFormGroup.value); } }, ); @@ -64,6 +66,10 @@ export class AbhaInformationComponent { ngOnInit() { console.log("INSIDE ABHA COMPOENENT") this.fetchLanguageResponse(); + // Ensure `healthId` control exists on the passed-in form group + if (this.abhaInfoFormGroup && !this.abhaInfoFormGroup.get('healthId')) { + this.abhaInfoFormGroup.addControl('healthId', new FormControl('', [Validators.required])); + } this.formData.forEach((item: any) => { if (item.fieldName && item.allowText) { this.abhaInfoFormGroup.addControl( @@ -88,7 +94,8 @@ export class AbhaInformationComponent { }); console.log("formDataABHA", this.formData); if (this.patientRevisit) { - this.abhaInfoFormGroup.controls['healthIdNumber'].patchValue(this.revisitData?.abhaDetails[0]?.healthIDNumber); + this.abhaInfoFormGroup.controls['healthIdNumber'].patchValue(this.revisitData?.abhaDetails[0]?.healthIdNumber || ''); + this.abhaInfoFormGroup.controls['healthId']?.patchValue(this.revisitData?.abhaDetails[0]?.healthId || ''); console.log('other Form Data', this.formData); } } @@ -194,8 +201,11 @@ export class AbhaInformationComponent { this.abhaInfoFormGroup.controls['healthId'].patchValue(null); this.abhaInfoFormGroup.controls['healthIdMode'].patchValue(null); } else { - this.abhaInfoFormGroup.patchValue({ healthId: result.healthIdNumber }); - this.abhaInfoFormGroup.patchValue({ healthIdMode: result.healthIdMode }); + this.abhaInfoFormGroup.patchValue({ + healthId: result?.healthId || result?.healthIdNumber || '', + healthIdNumber: result?.healthIdNumber || '' + }); + this.abhaInfoFormGroup.patchValue({ healthIdMode: result?.healthIdMode || '' }); this.abhaInfoFormGroup.controls['healthIdNumber'].disable(); this.abhaInfoFormGroup.markAsDirty(); this.registrarService.changePersonalDetailsData(result); diff --git a/src/registrar/registration/registration.component.ts b/src/registrar/registration/registration.component.ts index faf10d9..461716f 100644 --- a/src/registrar/registration/registration.component.ts +++ b/src/registrar/registration/registration.component.ts @@ -47,6 +47,7 @@ export class RegistrationComponent { consentGranted: any; disableGenerateOTP = false; today = new Date(); + healthIdNumber: any; constructor( @@ -338,27 +339,27 @@ export class RegistrationComponent { const reqObj = { beneficiaryRegID: null, beneficiaryID: numb, - healthId: this.mainForm.controls['abhaInfoForm'].value['healthIdNumber'], - healthIdNumber: this.mainForm.controls['abhaInfoForm'].value['healthIdNumber'], + healthId: this.mainForm.controls['abhaInfoForm'].value['healthId'], + healthIdNumber: this.healthIdNumber, providerServiceMapId: this.sessionstorage.getItem('providerServiceID'), authenticationMode: null, createdBy: this.sessionstorage.getItem('userName'), }; - if - (this.mainForm.controls['abhaInfoForm'].value['healthIdNumber'] !== undefined && - this.mainForm.controls['abhaInfoForm'].value['healthIdNumber'] !== null) { - this.registrarService.mapHealthId(reqObj).subscribe((res: any) => { - if (res.statusCode === 200) { - // this.confirmationService.alert(res.data.response, 'success'); - console.log('success'); - } else { - this.confirmationService.alert( - this.currentLanguageSet.alerts.info.issueInSavngData, - 'error', - ); - } - }); - } + if (this.healthIdNumber != null && this.healthIdNumber !== undefined) { + this.registrarService.mapHealthId(reqObj).subscribe((res: any) => { + console.log('response for benhealthid mapping', res); + if (res.statusCode === 200) { + // this.confirmationService.alert(res.data.response, 'success'); + console.log('success'); + } else { + this.confirmationService.alert( + this.currentLanguageSet.alerts.info.issueInSavngData, + 'error', + ); + } + }); + } + this.mainForm.reset(); this.disableGenerateOTP = false; this.router.navigate(['/registrar/search/']); @@ -434,7 +435,8 @@ export class RegistrationComponent { addressLine3: demographicsForm.controls['addressLine3']?.value || null, religionName: othersForm.controls['religionName']?.value || null, }, - abha: abhaForm.controls['healthIdNumber']?.value || null, + healthIdNumber: this.healthIdNumber, + healthId: abhaForm.controls['healthId']?.value || null, genderID: (() => { const genderName = personalForm.controls['genderName']?.value; if (genderName === 'Female') { @@ -514,8 +516,8 @@ export class RegistrationComponent { const reqObj = { beneficiaryRegID: null, beneficiaryID: personalForm.beneficiaryID, - healthId: this.mainForm.controls['abhaInfoForm'].value['healthIdNumber'], - healthIdNumber: this.mainForm.controls['abhaInfoForm'].value['healthIdNumber'], + healthId: this.mainForm.controls['abhaInfoForm'].value['healthId'], + healthIdNumber: this.healthIdNumber, authenticationMode: null, providerServiceMapId: this.sessionstorage.getItem('providerServiceID'), createdBy: this.sessionstorage.getItem('userName'), @@ -614,6 +616,8 @@ export class RegistrationComponent { addressLine3: demographicsForm.controls['addressLine3']?.value || null, religionName: othersForm.controls['religionName']?.value || null, }, + healthId: abhaForm.controls['healthId']?.value || null, + healthIdNumber: this.healthIdNumber, abha: abhaForm.controls['healthIdNumber']?.value || null, genderID: (() => { const genderName = personalForm.controls['genderName']?.value; @@ -752,9 +756,10 @@ export class RegistrationComponent { } setHealthIdAfterGeneration(result: any) { + this.healthIdNumber = result.healthIdNumber; (( this.mainForm.controls['otherInfoForm'] - )).patchValue({ healthId: result.healthIdNumber }); + )).patchValue({ healthId: result?.healthId || '' }); (( this.mainForm.controls['otherInfoForm'] )).patchValue({ healthIdNumber: result.healthIdNumber }); diff --git a/src/registrar/services/registrar.service.ts b/src/registrar/services/registrar.service.ts index 640429f..801df52 100644 --- a/src/registrar/services/registrar.service.ts +++ b/src/registrar/services/registrar.service.ts @@ -261,6 +261,20 @@ export class RegistrarService { return this.http.get(environment.getAbdmMappedFacility + reqObj); } + generateTokenForCareContext(reqObj: any) { + return this.http.post( + environment.generateLinkTokenForCareContext, + reqObj, + ); + } + + linkCareContext(reqObj: any) { + return this.http.post( + environment.linkCareContext, + reqObj, + ); + } + generateOtpForMappingCareContext(reqObjForMapping: any) { return this.http.post( environment.careContextGenerateOtpUrl, From abfa309a97a8876a0faee0458f6cbe669f90e0d0 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Thu, 1 Jan 2026 12:20:12 +0530 Subject: [PATCH 09/13] fix: beneficiaryID column name was hiding --- src/registrar/search/search.component.html | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/registrar/search/search.component.html b/src/registrar/search/search.component.html index d57063f..5fa4928 100644 --- a/src/registrar/search/search.component.html +++ b/src/registrar/search/search.component.html @@ -156,17 +156,14 @@

*matHeaderCellDef mat-sort-header > - {{ isEnableES - ? currentLanguageSet?.bendetails?.beneficiaryRegID - : currentLanguageSet?.bendetails?.beneficiaryID - }} + {{ currentLanguageSet?.bendetails?.beneficiaryID }}

- {{ beneficiary?.beneficiaryID }} + {{ isEnableES ? beneficiary?.beneficiaryRegID : beneficiary?.beneficiaryID }}
+
@@ -103,7 +107,11 @@

class="table-responsive vw100" *ngIf="!healthIDMapping && !enablehealthIdOTPForm && !searchPopup" > - +
@@ -189,13 +197,17 @@

class="table-responsive vw100" *ngIf="healthIDMapping && !enablehealthIdOTPForm && !searchPopup" > - - - - - +
- {{ currentLanguageSet?.coreComponents?.sno }} - 1
+ + + +
+ {{ currentLanguageSet?.coreComponents?.sno }} + 1
- -
-
-
- {{ - currentLanguageSet?.pleaseVerifyAadhaarHeading || - "Please verify Aadhaar details" - }} -
- {{ - currentLanguageSet?.pleaseVerifyAadhaarSub || - "Review your Aadhaar-linked details before generating the - token." - }} -
-
- -
- -
- - {{ - currentLanguageSet?.name || "Name (as on Aadhaar)" - }} - - - - - {{ - currentLanguageSet?.gender || "Gender" - }} - - {{ - currentLanguageSet?.male || "Male" - }} - {{ - currentLanguageSet?.female || "Female" - }} - {{ - currentLanguageSet?.other || "Other" - }} - - - - - {{ - currentLanguageSet?.yearOfBirth || "Year of birth" - }} - - -
- {{ - currentLanguageSet?.aadhaarVerifyNote || - "If the server still reports mismatch, update again or follow - the on-screen suggestions." - }} -
-
-
-
@@ -417,13 +348,14 @@

id="cancelButton" mat-raised-button type="button" - style="margin-right: 3px" + style="margin-right: 3px;" color="primary" class="pull-right mat_blue" (click)="resendOtp()" > {{ currentLanguageSet?.resendOTP }} + diff --git a/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.ts b/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.ts index 595c393..9afb45e 100644 --- a/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.ts +++ b/src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.ts @@ -19,47 +19,42 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see https://www.gnu.org/licenses/. */ -import { Component, DoCheck, Inject, OnInit } from "@angular/core"; -import { FormGroup, FormBuilder } from "@angular/forms"; -import { DatePipe } from "@angular/common"; +import { Component, DoCheck, Inject, OnInit } from '@angular/core'; +import { FormGroup, FormBuilder } from '@angular/forms'; +import { DatePipe } from '@angular/common'; import { MAT_DIALOG_DATA, MatDialog, MatDialogRef, -} from "@angular/material/dialog"; -import { MatTableDataSource } from "@angular/material/table"; -import { SetLanguageComponent } from "src/app/app-modules/core/components/set-language.component"; -import { - BeneficiaryDetailsService, - ConfirmationService, -} from "src/app/app-modules/core/services"; -import { HttpServiceService } from "src/app/app-modules/core/services/http-service.service"; -import { RegistrarService } from "../../services/registrar.service"; +} from '@angular/material/dialog'; +import { MatTableDataSource } from '@angular/material/table'; +import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; +import { ConfirmationService } from 'src/app/app-modules/core/services'; +import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service'; +import { RegistrarService } from '../../services/registrar.service'; import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, -} from "@angular/material/core"; +} from '@angular/material/core'; import { MomentDateAdapter, MAT_MOMENT_DATE_ADAPTER_OPTIONS, -} from "@angular/material-moment-adapter"; -import { SessionStorageService } from "../../services/session-storage.service"; -import { DownloadSearchAbhaComponent } from "../download-search-abha/download-search-abha.component"; -import { interval, startWith, Subscription } from "rxjs"; -import { AadhaarCorrectionDialogComponent } from "../aadhar-correction-dialog/aadhaar-correction-dialog.component"; +} from '@angular/material-moment-adapter'; +import { SessionStorageService } from '../../services/session-storage.service'; +import { DownloadSearchAbhaComponent } from '../download-search-abha/download-search-abha.component'; @Component({ - selector: "app-health-id-display-modal", - templateUrl: "./health-id-display-modal.component.html", - styleUrls: ["./health-id-display-modal.component.css"], + selector: 'app-health-id-display-modal', + templateUrl: './health-id-display-modal.component.html', + styleUrls: ['./health-id-display-modal.component.css'], providers: [ { provide: DatePipe, }, { provide: MAT_DATE_LOCALE, - useValue: "en-US", // Set the desired locale (e.g., 'en-GB' for dd/MM/yyyy) + useValue: 'en-US', // Set the desired locale (e.g., 'en-GB' for dd/MM/yyyy) }, { provide: DateAdapter, @@ -70,13 +65,13 @@ import { AadhaarCorrectionDialogComponent } from "../aadhar-correction-dialog/aa provide: MAT_DATE_FORMATS, useValue: { parse: { - dateInput: "LL", + dateInput: 'LL', }, display: { - dateInput: "DD/MM/YYYY", // Set the desired display format - monthYearLabel: "MMM YYYY", - dateA11yLabel: "LL", - monthYearA11yLabel: "MMMM YYYY", + dateInput: 'DD/MM/YYYY', // Set the desired display format + monthYearLabel: 'MMM YYYY', + dateA11yLabel: 'LL', + monthYearA11yLabel: 'MMMM YYYY', }, }, }, @@ -96,45 +91,32 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { searchPopup = false; displayedColumns: any = [ - "sno", - "abhaNumber", - "abha", - "dateOfCreation", - "abhaMode", + 'sno', + 'abhaNumber', + 'abha', + 'dateOfCreation', + 'abhaMode', ]; searchDetails = new MatTableDataSource(); displayedColumns1: any = [ - "sno", - "abhaNumber", - "abha", - "dateOfCreation", - "abhaMode", - "action", + 'sno', + 'abhaNumber', + 'abha', + 'dateOfCreation', + 'abhaMode', + 'action', ]; displayedColumns2: any = [ - "sno", - "healthIDNo", - "healthID", - "createdDate", - "healthIDMode", - "rblMode", + 'sno', + 'healthIDNo', + 'healthID', + 'createdDate', + 'healthIDMode', + 'rblMode', ]; healthIDArray = new MatTableDataSource(); - linkToken: any; - beneficiaryDetails: any; - public aadhaarVerification: { - name: string; - gender: string; - yearOfBirth: number | null; - } = { - name: "", - gender: "", - yearOfBirth: null, - }; - public aadhaarVerified = false; - public currentYear = new Date().getFullYear(); constructor( public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public input: any, @@ -144,28 +126,11 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { private confirmationService: ConfirmationService, private datePipe: DatePipe, private dialogMd: MatDialog, - private sessionstorage: SessionStorageService, - private beneficiaryDetailsService: BeneficiaryDetailsService, + private sessionstorage:SessionStorageService, ) { dialogRef.disableClose = true; } - private closeConfirmationAlertIfOpen() { - try { - if (this.lastAlertRef) { - this.lastAlertRef.close(); - this.lastAlertRef = null; - } - } catch (e) { - console.warn("Failed to close confirmation alert", e); - } - } - - // Keep a reference to the last confirmationService alert dialog so we can close - // it when another dialog (MatDialog) is opened on top. - private lastAlertRef: MatDialogRef | null = null; - - ngOnInit() { console.log("this.input", this.input); this.searchDetails.data = []; @@ -176,21 +141,23 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { this.input.search !== undefined ? this.input.search : false; this.healthIDMapping = this.input.healthIDMapping; console.log("this.healthIDMapping", this.healthIDMapping); - this.getBeneficiaryDetails(); - if (this.input.dataList !== undefined && this.input.search === true) { + if ( + this.input.dataList !== undefined && + this.input.search === true + ) { let tempVal: any = this.input.dataList; this.benDetails = this.input.dataList; let tempCreatDate: any = this.input.dataList.createdDate; console.log("tempVal", tempVal); - this.searchDetails.data.push(tempVal); - console.log("this.searchDetails.data%%", this.searchDetails.data); + this.searchDetails.data.push(tempVal); + console.log("this.searchDetails.data%%", this.searchDetails.data) + } - if ( - this.input.dataList !== undefined && + if (this.input.dataList !== undefined && this.input.dataList.data?.BenHealthDetails !== undefined - ) { + ){ this.benDetails = this.input.dataList.data.BenHealthDetails; - console.log("this.benDetails1", this.benDetails); + console.log("this.benDetails1",this.benDetails) } this.healthIdOTPForm = this.createOtpGenerationForm(); this.createList(); @@ -213,7 +180,7 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { this.benDetails.forEach((healthID: any) => { healthID.createdDate = this.datePipe.transform( healthID.createdDate, - "yyyy-MM-dd hh:mm:ss a", + 'yyyy-MM-dd hh:mm:ss a', ); this.healthIDArray.data.push(healthID); }); @@ -221,611 +188,8 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { } onRadioChange(data: any) { - console.clear(); - console.log(this.selectedHealthID); this.selectedHealthID = data; - console.log(this.selectedHealthID); - } - - beneficiaryDetailSubscription: any; - getBeneficiaryDetails() { - this.beneficiaryDetailSubscription = - this.beneficiaryDetailsService.beneficiaryDetails$.subscribe( - (beneficiary) => { - if (beneficiary) { - if (beneficiary) { - this.beneficiaryDetails = beneficiary; - this.initAadhaarVerificationFromBeneficiary(); - } - } - }, - ); - } - - private initAadhaarVerificationFromBeneficiary() { - try { - const name = this.beneficiaryDetails?.beneficiaryName ?? ""; - const gender = this.beneficiaryDetails?.genderName ?? ""; - const dob = this.beneficiaryDetails?.dOB ?? null; - - let yob: number | null = null; - if (dob) { - const parsed = new Date(dob); - if (!isNaN(parsed.getTime())) { - yob = parsed.getFullYear(); - } else { - const maybe = parseInt(String(dob), 10); - if (!isNaN(maybe)) yob = maybe; - } - } - - this.aadhaarVerification = { - name, - gender, - yearOfBirth: yob ?? this.currentYear - 30, - }; - this.aadhaarVerified = false; - } catch (e) { - console.warn("initAadhaarVerificationFromBeneficiary failed", e); - } - } - - public onResetAadhaarVerification() { - this.initAadhaarVerificationFromBeneficiary(); - } - - // Apply the verified values into beneficiaryDetails and call generateTokenForLinking() - public applyAndGenerate() { - if ( - !this.aadhaarVerification.name || - !this.aadhaarVerification.gender || - !this.aadhaarVerification.yearOfBirth - ) { - this.confirmationService.alert( - this.currentLanguageSet?.pleaseFillAllFields || - "Please fill all fields", - "error", - ); - return; - } - - // Copy into beneficiaryDetails so existing generateTokenForLinking reads them - this.beneficiaryDetails.beneficiaryName = this.aadhaarVerification.name; - this.beneficiaryDetails.genderName = this.aadhaarVerification.gender; - this.beneficiaryDetails.dOB = `${this.aadhaarVerification.yearOfBirth}-01-01T00:00:00.000Z`; - - this.aadhaarVerified = true; - this.suppressAutoGenerate = true; - if (this.linkPollingSub) { - this.linkPollingSub.unsubscribe(); - this.linkPollingSub = null; - } - // Trigger existing flow - this.generateTokenForLinking(); - } - - private linkPollingSub: Subscription | null = null; - private isPollingLink = false; - private generateResubmitAttempts = 0; - private readonly maxGenerateResubmitAttempts = 3; - // prevents concurrent generate calls - public isGenerating = false; - - // small guard to suppress any automatic re-trigger events while manual resubmit running - private suppressAutoGenerate = false; - - generateTokenForLinking() { - if (this.isGenerating) { - console.debug( - "[link] generateTokenForLinking suppressed because already generating", - ); - return; - } - this.isGenerating = true; - this.showProgressBar = true; - - const abdmFacilityId = this.sessionstorage.getItem("abdmFacilityId"); - const abdmFacilityName = this.sessionstorage.getItem("abdmFacilityName"); - const dateString = this.beneficiaryDetails.dOB; - const yearOfBirth = new Date(dateString).getFullYear(); - - const reqObj = { - abhaNumber: this.selectedHealthID.healthIdNumber - ? this.selectedHealthID.healthIdNumber - : null, - abhaAddress: this.selectedHealthID.healthId - ? this.selectedHealthID.healthId - : null, - name: this.beneficiaryDetails.beneficiaryName, - gender: this.beneficiaryDetails.genderName, - yearOfBirth, - visitCode: this.input.visitCode, - visitCategory: this.beneficiaryDetails.VisitCategory, - abdmFacilityId: - abdmFacilityId !== null && - abdmFacilityId !== undefined && - abdmFacilityId !== "" - ? abdmFacilityId - : null, - abdmFacilityName: - abdmFacilityName !== null && - abdmFacilityName !== undefined && - abdmFacilityName !== "" - ? abdmFacilityName - : null, - }; - - this.registrarService.generateTokenForCareContext(reqObj).subscribe( - (res: any) => { - this.showProgressBar = false; - const data = res?.data ?? null; - - if (data?.linkToken) { - this.linkToken = data.linkToken; - this.startLinkCareContextPolling(); - return; - } - - if (data?.requestId && !data?.linkToken) { - const requestId = data.requestId; - this.resumeViaSecondApi(requestId, reqObj); - return; - } - - const dataError = data?.Error ?? data?.error ?? null; - if (dataError) { - const serverMsg = - dataError?.Message ?? - dataError?.message ?? - "Details do not match Aadhaar"; - this.handleAadhaarMismatchDialog( - { - name: reqObj.name, - gender: reqObj.gender, - yearOfBirth: reqObj.yearOfBirth, - }, - serverMsg, - ); - return; - } - - const fallbackMsg = - res?.errorMessage ?? res?.status ?? "Failed to generate link token"; - - if ( - String(fallbackMsg).toLowerCase().includes("duplicate") || - String(fallbackMsg).toLowerCase().includes("abdm-1092") - ) { - this.confirmationService.alert(fallbackMsg, "error"); - return; - } - - this.confirmationService.alert(fallbackMsg, "error"); - }, - (err) => { - this.showProgressBar = false; - const payloadError = err?.error ?? null; - const errMsg = - payloadError?.Message ?? - payloadError?.message ?? - err?.error?.errorMessage ?? - err?.message ?? - ""; - - if ( - String(errMsg).toLowerCase().includes("duplicate") || - String(errMsg).toLowerCase().includes("abdm-1092") - ) { - this.confirmationService.alert(errMsg, "error"); - return; - } - - if (payloadError && (payloadError?.Code || payloadError?.Message)) { - const serverMsg = - payloadError?.Message ?? - payloadError?.message ?? - "Details do not match Aadhaar"; - this.handleAadhaarMismatchDialog( - { - name: this.beneficiaryDetails.beneficiaryName, - gender: this.beneficiaryDetails.genderName, - yearOfBirth: new Date(this.beneficiaryDetails.dOB).getFullYear(), - }, - serverMsg, - ); - return; - } - - // generic - this.confirmationService.alert( - errMsg || "Something went wrong", - "error", - ); - }, - ); } - - private resumeViaSecondApi(requestId: string, originalReqObj: any) { - const reqObj = { - requestId, - abdmFacilityId: this.sessionstorage.getItem("abdmFacilityId"), - abdmFacilityName: this.sessionstorage.getItem("abdmFacilityName"), - abhaNumber: this.selectedHealthID?.healthIdNumber ?? null, - abhaAddress: this.selectedHealthID?.healthId ?? null, - visitCode: this.input.visitCode, - visitCategory: this.beneficiaryDetails.VisitCategory, - visitReason: this.beneficiaryDetails.VisitReason, - beneficiaryId: this.beneficiaryDetails.beneficiaryID, - }; - - this.pollLinkCareContext(reqObj, { resumeRequestId: requestId }); - } - - private pollLinkCareContext( - reqObj: any, - options?: { isStartup?: boolean; resumeRequestId?: string }, - ) { - const maxAttempts = 3; - const delayMs = 5000; - - if (options?.isStartup) { - if (this.isPollingLink) return; - if (!this.linkToken) { - this.confirmationService.alert( - "No link token available to start linking", - "error", - ); - return; - } - this.isPollingLink = true; - } - - this.isGenerating = false; - this.showProgressBar = true; - - if (this.linkPollingSub) { - this.linkPollingSub.unsubscribe(); - this.linkPollingSub = null; - } - - let attempts = 0; - this.linkPollingSub = interval(delayMs) - .pipe(startWith(0)) - .subscribe(() => { - attempts++; - this.registrarService.linkCareContext(reqObj).subscribe( - (res: any) => { - const data = res?.data ?? null; - const isEmpty = data && Object.keys(data).length === 0; - const respError = data?.Error ?? data?.error ?? null; - - if ( - data?.message && - String(data.message) - .toLowerCase() - .includes("care context added successfully") - ) { - this.stopLinkCareContextPolling(); - this.showProgressBar = false; - this.confirmationService.alert( - data?.message || - this.currentLanguageSet.linkSuccess || - "Care context linked successfully", - "success", - ); - this.linkToken = null; - this.closeDialog(); - return; - } - if (respError) { - const serverMsg = - respError?.Message ?? respError?.message ?? "Linking failed"; - const code = String(respError?.Code ?? "").toLowerCase(); - - if ( - code.includes("1207") || - /aadhar|aadhaar|does not match/i.test(serverMsg) - ) { - this.stopLinkCareContextPolling(); - this.showProgressBar = false; - this.handleAadhaarMismatchDialog( - { - name: this.beneficiaryDetails.beneficiaryName, - gender: this.beneficiaryDetails.genderName, - yearOfBirth: new Date( - this.beneficiaryDetails.dOB, - ).getFullYear(), - }, - serverMsg, - ); - return; - } - - this.stopLinkCareContextPolling(); - this.showProgressBar = false; - this.confirmationService.alert(serverMsg, "error"); - return; - } - - if (isEmpty) { - console.debug( - `[link] pollLinkCareContext: empty response attempt ${attempts}/${maxAttempts}`, - ); - if (attempts >= maxAttempts) { - this.stopLinkCareContextPolling(); - this.showProgressBar = false; - const infoMsg = options?.resumeRequestId - ? `Still processing. Please try again later with RequestId: ${options.resumeRequestId}` - : "Linking is still processing. Please try again later."; - this.confirmationService.alert(infoMsg, "info"); - } - return; - } - - // fallback after all retries - if (attempts >= maxAttempts) { - this.stopLinkCareContextPolling(); - this.showProgressBar = false; - this.confirmationService.alert( - res?.errorMessage ?? "Linking care context failed after maximum retries", - "error", - ); - } - }, - (err) => { - if (attempts >= maxAttempts) { - const msg = - err?.error?.message ?? err?.message ?? "Linking failed after retries"; - this.stopLinkCareContextPolling(); - this.showProgressBar = false; - this.confirmationService.alert(msg, "error"); - } else { - console.warn("[link] pollLinkCareContext retrying after error", err); - } - }, - ); - }); - } - - private startLinkCareContextPolling() { - const makeReqObj = () => ({ - linkToken: this.linkToken, - abhaNumber: this.selectedHealthID?.healthIdNumber ?? null, - abhaAddress: this.selectedHealthID?.healthId ?? null, - abdmFacilityId: this.sessionstorage.getItem("abdmFacilityId"), - abdmFacilityName: this.sessionstorage.getItem("abdmFacilityName"), - visitCode: this.input.visitCode, - visitCategory: this.beneficiaryDetails.VisitCategory, - visitReason: this.beneficiaryDetails.VisitReason, - beneficiaryId: this.beneficiaryDetails.beneficiaryID, - }); - - this.pollLinkCareContext(makeReqObj(), { isStartup: true }); - } - - private stopLinkCareContextPolling() { - if (this.linkPollingSub) { - this.linkPollingSub.unsubscribe(); - this.linkPollingSub = null; - } - this.isPollingLink = false; - this.isGenerating = false; - } - - private isAadhaarMismatch(errorCandidate: any): boolean { - if (!errorCandidate) return false; - - if (typeof errorCandidate === "object") { - const code = String( - errorCandidate.Code ?? errorCandidate.code ?? "", - ).toLowerCase(); - const msg = String( - errorCandidate.Message ?? - errorCandidate.message ?? - errorCandidate.errorMessage ?? - "", - ).toLowerCase(); - - const textMatch = - msg.includes("aadhar") || - msg.includes("aadhaar") || - msg.includes("does not match") || - msg.includes("doesn't match") || - msg.includes("not match") || - msg.includes("match the details"); - - const code1207 = /\b1207\b/.test(code) || /abdm-?1207/.test(code); - - return ( - textMatch || - (code1207 && - (msg.includes("match") || - msg.includes("aadhaar") || - msg.includes("aadhar"))) - ); - } - - const s = String(errorCandidate).toLowerCase(); - return ( - s.includes("aadhar") || - s.includes("aadhaar") || - s.includes("does not match") || - s.includes("doesn't match") || - s.includes("not match") || - s.includes("match the details") - ); - } - - private handleAadhaarMismatchDialog( - prefill: { name: string; gender: string; yearOfBirth: number }, - serverMsg: string, - ) { - if (this.generateResubmitAttempts >= this.maxGenerateResubmitAttempts) { - this.confirmationService.alert( - "Maximum correction attempts reached. " + (serverMsg || ""), - "error", - ); - return; - } - - // Close any existing confirmation alert before opening the Aadhaar correction dialog - this.closeConfirmationAlertIfOpen(); - - const dialogRef = this.dialogMd.open(AadhaarCorrectionDialogComponent, { - width: "420px", - data: { - title: "Aadhaar details mismatch", - message: - serverMsg || - "The entered details do not match Aadhaar. Please provide Aadhaar-provided details.", - formData: prefill, - }, - }); - - dialogRef - .afterClosed() - .subscribe( - ( - result: - | { name?: string; gender?: string; yearOfBirth?: number } - | undefined, - ) => { - if (!result) { - this.confirmationService.alert( - "Linking cancelled by user.", - "info", - ); - return; - } - - this.generateResubmitAttempts++; - this.resubmitGenerateTokenWithCorrectedDetails(result); - }, - ); - } - - private resubmitGenerateTokenWithCorrectedDetails(corrected: { - name?: string; - gender?: string; - yearOfBirth?: number; - }) { - this.showProgressBar = true; - const abdmFacilityId = this.sessionstorage.getItem("abdmFacilityId"); - const abdmFacilityName = this.sessionstorage.getItem("abdmFacilityName"); - - const reqObj = { - abhaNumber: this.selectedHealthID?.healthIdNumber ?? null, - abhaAddress: this.selectedHealthID?.healthId ?? null, - name: corrected.name ?? this.beneficiaryDetails.beneficiaryName, - gender: corrected.gender ?? this.beneficiaryDetails.genderName, - yearOfBirth: - corrected.yearOfBirth ?? - new Date(this.beneficiaryDetails.dOB).getFullYear(), - visitCode: this.input.visitCode, - visitCategory: this.beneficiaryDetails.VisitCategory, - abdmFacilityId: - abdmFacilityId !== null && - abdmFacilityId !== undefined && - abdmFacilityId !== "" - ? abdmFacilityId - : null, - abdmFacilityName: - abdmFacilityName !== null && - abdmFacilityName !== undefined && - abdmFacilityName !== "" - ? abdmFacilityName - : null, - }; - - this.registrarService.generateTokenForCareContext(reqObj).subscribe( - (res: any) => { - this.showProgressBar = false; - const data = res?.data ?? null; - const dataError = data?.Error ?? data?.error ?? null; - - // ⚠️ CASE 1: Aadhaar mismatch response - if (dataError) { - const serverMsg = - dataError?.Message ?? - dataError?.message ?? - "Details do not match Aadhaar"; - if ( - this.generateResubmitAttempts < this.maxGenerateResubmitAttempts - ) { - this.handleAadhaarMismatchDialog( - { - name: reqObj.name, - gender: reqObj.gender, - yearOfBirth: reqObj.yearOfBirth, - }, - serverMsg, - ); - } else { - this.confirmationService.alert(serverMsg, "error"); - } - return; - } - - // CASE 2: Successful token — start polling - if (data?.linkToken) { - this.linkToken = data.linkToken; - this.generateResubmitAttempts = 0; - this.startLinkCareContextPolling(); - return; - } - - // CASE 3: Success (200) but only requestId, no linkToken - if (data?.requestId && !data?.linkToken) { - this.resumeViaSecondApi(data.requestId, reqObj); - return; - } - - // CASE 4: Duplicate or other backend signals - const fallbackMsg = - res?.errorMessage ?? res?.status ?? "Failed to generate link token"; - - if ( - String(fallbackMsg).toLowerCase().includes("duplicate") || - String(fallbackMsg).toLowerCase().includes("abdm-1092") - ) { - // Flow 4 fallback: show error to user (no resume via duplicate) - this.confirmationService.alert(fallbackMsg, "error"); - return; - } - - // CASE 5: Unknown/invalid - this.confirmationService.alert(fallbackMsg, "error"); - }, - (err) => { - this.showProgressBar = false; - const errMsg = - err?.error?.errorMessage ?? err?.message ?? "Something went wrong"; - - if ( - this.isAadhaarMismatch(errMsg) && - this.generateResubmitAttempts < this.maxGenerateResubmitAttempts - ) { - this.handleAadhaarMismatchDialog( - { - name: reqObj.name, - gender: reqObj.gender, - yearOfBirth: reqObj.yearOfBirth, - }, - errMsg, - ); - } else if ( - String(errMsg).toLowerCase().includes("duplicate") || - String(errMsg).toLowerCase().includes("abdm-1092") - ) { - // Flow 4: fallback to showing error instead of resuming - this.confirmationService.alert(errMsg, "error"); - } else { - this.confirmationService.alert(errMsg, "error"); - } - }, - ); - } - generateOtpForMapping() { this.showProgressBar = true; const abdmFacilityId = this.sessionstorage.getItem("abdmFacilityId"); @@ -838,18 +202,8 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { ? this.selectedHealthID.healthIdNumber : null, authenticationMode: this.selectedHealthID.authenticationMode, - abdmFacilityId: - abdmFacilityId !== null && - abdmFacilityId !== undefined && - abdmFacilityId !== "" - ? abdmFacilityId - : null, - abdmFacilityName: - abdmFacilityName !== null && - abdmFacilityName !== undefined && - abdmFacilityName !== "" - ? abdmFacilityName - : null, + abdmFacilityId: (abdmFacilityId !== null && abdmFacilityId !== undefined && abdmFacilityId !== "") ? abdmFacilityId : null, + abdmFacilityName: (abdmFacilityName !== null && abdmFacilityName !== undefined && abdmFacilityName !== "") ? abdmFacilityName : null }; this.registrarService.generateOtpForMappingCareContext(reqObj).subscribe( (receivedOtpResponse: any) => { @@ -857,14 +211,14 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { this.showProgressBar = false; this.confirmationService.alert( this.currentLanguageSet.OTPSentToRegMobNo, - "success", + 'success', ); this.transactionId = receivedOtpResponse.data.txnId; this.enablehealthIdOTPForm = true; } else { this.confirmationService.alert( receivedOtpResponse.errorMessage, - "error", + 'error', ); this.enablehealthIdOTPForm = false; this.showProgressBar = false; @@ -872,7 +226,7 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { }, (err) => { this.showProgressBar = false; - this.confirmationService.alert(err.errorMessage, "error"); + this.confirmationService.alert(err.errorMessage, 'error'); this.enablehealthIdOTPForm = false; }, ); @@ -885,9 +239,9 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { return true; } checkOTP() { - const otp = this.healthIdOTPForm.controls["otp"].value; + const otp = this.healthIdOTPForm.controls['otp'].value; let cflag = false; - if (otp !== "" && otp !== undefined && otp !== null) { + if (otp !== '' && otp !== undefined && otp !== null) { const hid = otp; if (hid.length >= 4 && hid.length <= 32) { for (let i = 0; i < hid.length; i++) { @@ -913,7 +267,7 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { const abdmFacilityId = this.sessionstorage.getItem("abdmFacilityId"); const abdmFacilityName = this.sessionstorage.getItem("abdmFacilityName"); const verifyOtpData = { - otp: this.healthIdOTPForm.controls["otp"].value, + otp: this.healthIdOTPForm.controls['otp'].value, txnId: this.transactionId, beneficiaryID: this.selectedHealthID.beneficiaryRegID, healthID: this.selectedHealthID.healthId @@ -924,21 +278,11 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { : null, visitCode: this.input.visitCode, visitCategory: - this.sessionstorage.getItem("visitCategory") === "General OPD (QC)" - ? "Emergency" - : this.sessionstorage.getItem("visitCategory"), - abdmFacilityId: - abdmFacilityId !== null && - abdmFacilityId !== undefined && - abdmFacilityId !== "" - ? abdmFacilityId - : null, - abdmFacilityName: - abdmFacilityName !== null && - abdmFacilityName !== undefined && - abdmFacilityName !== "" - ? abdmFacilityName - : null, + this.sessionstorage.getItem('visitCategory') === 'General OPD (QC)' + ? 'Emergency' + : this.sessionstorage.getItem('visitCategory'), + abdmFacilityId: (abdmFacilityId !== null && abdmFacilityId !== undefined && abdmFacilityId !== "") ? abdmFacilityId : null, + abdmFacilityName: (abdmFacilityName !== null && abdmFacilityName !== undefined && abdmFacilityName !== "") ? abdmFacilityName : null }; this.registrarService .verifyOtpForMappingCarecontext(verifyOtpData) @@ -948,26 +292,26 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { this.showProgressBar = false; this.confirmationService.alert( verifiedMappingData.data.response, - "success", + 'success', ); this.closeDialog(); } else { this.showProgressBar = false; this.confirmationService.alert( verifiedMappingData.errorMessage, - "error", + 'error', ); } }, (err) => { this.showProgressBar = false; - this.confirmationService.alert(err.errorMessage, "error"); + this.confirmationService.alert(err.errorMessage, 'error'); }, ); } resendOtp() { - this.healthIdOTPForm.controls["otp"].reset; - this.healthIdOTPForm.controls["otp"].patchValue(null); + this.healthIdOTPForm.controls['otp'].reset; + this.healthIdOTPForm.controls['otp'].patchValue(null); this.generateOtpForMapping(); } closeDialog() { @@ -975,17 +319,14 @@ export class HealthIdDisplayModalComponent implements OnInit, DoCheck { } printHealthIDCard(data: any) { - // Close any lingering confirmation alert before opening the print dialog - this.closeConfirmationAlertIfOpen(); - const dialogRefValue = this.dialogMd.open(DownloadSearchAbhaComponent, { - height: "330px", - width: "500px", - disableClose: true, + height: '330px', + width: '500px', + disableClose: true, data: { printCard: true, - healthId: data.healthId, - }, + healthId: data.healthId + } }); } } diff --git a/src/registrar/registration.module.ts b/src/registrar/registration.module.ts index 9063759..9524417 100644 --- a/src/registrar/registration.module.ts +++ b/src/registrar/registration.module.ts @@ -38,7 +38,6 @@ import { DisplayAbhaCardComponent } from './abha-components/display-abha-card/di import { AbhaVerifySuccessComponentComponent } from './abha-components/abha-verify-success-component/abha-verify-success-component.component'; import { AbhaEnterMobileOtpComponentComponent } from './abha-components/abha-enter-mobile-otp-component/abha-enter-mobile-otp-component.component'; import { AbhaConsentFormComponent } from './abha-components/abha-consent-form/abha-consent-form.component'; -import { AadhaarCorrectionDialogComponent } from './abha-components/aadhar-correction-dialog/aadhaar-correction-dialog.component'; @NgModule({ declarations: [ @@ -67,7 +66,6 @@ import { AadhaarCorrectionDialogComponent } from './abha-components/aadhar-corre AbhaVerifySuccessComponentComponent, AbhaEnterMobileOtpComponentComponent, AbhaConsentFormComponent, - AadhaarCorrectionDialogComponent, ], imports: [ CommonModule, diff --git a/src/registrar/registration/abha-information/abha-information.component.ts b/src/registrar/registration/abha-information/abha-information.component.ts index dfc5214..ffdb365 100644 --- a/src/registrar/registration/abha-information/abha-information.component.ts +++ b/src/registrar/registration/abha-information/abha-information.component.ts @@ -52,12 +52,10 @@ export class AbhaInformationComponent { (response: any) => { console.log('responseABHACompoenet', response); if (response) { - this.abhaInfoFormGroup.patchValue({ healthId: response.healthId }); this.abhaInfoFormGroup.patchValue({ healthIdNumber: response.healthIdNumber, }); this.abhaInfoFormGroup.controls['healthIdNumber'].disable(); - console.log('abha info group', this.abhaInfoFormGroup.value); } }, ); @@ -66,10 +64,6 @@ export class AbhaInformationComponent { ngOnInit() { console.log("INSIDE ABHA COMPOENENT") this.fetchLanguageResponse(); - // Ensure `healthId` control exists on the passed-in form group - if (this.abhaInfoFormGroup && !this.abhaInfoFormGroup.get('healthId')) { - this.abhaInfoFormGroup.addControl('healthId', new FormControl('', [Validators.required])); - } this.formData.forEach((item: any) => { if (item.fieldName && item.allowText) { this.abhaInfoFormGroup.addControl( @@ -94,8 +88,7 @@ export class AbhaInformationComponent { }); console.log("formDataABHA", this.formData); if (this.patientRevisit) { - this.abhaInfoFormGroup.controls['healthIdNumber'].patchValue(this.revisitData?.abhaDetails[0]?.healthIdNumber || ''); - this.abhaInfoFormGroup.controls['healthId']?.patchValue(this.revisitData?.abhaDetails[0]?.healthId || ''); + this.abhaInfoFormGroup.controls['healthIdNumber'].patchValue(this.revisitData?.abhaDetails[0]?.healthIDNumber); console.log('other Form Data', this.formData); } } @@ -201,11 +194,8 @@ export class AbhaInformationComponent { this.abhaInfoFormGroup.controls['healthId'].patchValue(null); this.abhaInfoFormGroup.controls['healthIdMode'].patchValue(null); } else { - this.abhaInfoFormGroup.patchValue({ - healthId: result?.healthId || result?.healthIdNumber || '', - healthIdNumber: result?.healthIdNumber || '' - }); - this.abhaInfoFormGroup.patchValue({ healthIdMode: result?.healthIdMode || '' }); + this.abhaInfoFormGroup.patchValue({ healthId: result.healthIdNumber }); + this.abhaInfoFormGroup.patchValue({ healthIdMode: result.healthIdMode }); this.abhaInfoFormGroup.controls['healthIdNumber'].disable(); this.abhaInfoFormGroup.markAsDirty(); this.registrarService.changePersonalDetailsData(result); diff --git a/src/registrar/registration/registration.component.ts b/src/registrar/registration/registration.component.ts index 461716f..faf10d9 100644 --- a/src/registrar/registration/registration.component.ts +++ b/src/registrar/registration/registration.component.ts @@ -47,7 +47,6 @@ export class RegistrationComponent { consentGranted: any; disableGenerateOTP = false; today = new Date(); - healthIdNumber: any; constructor( @@ -339,27 +338,27 @@ export class RegistrationComponent { const reqObj = { beneficiaryRegID: null, beneficiaryID: numb, - healthId: this.mainForm.controls['abhaInfoForm'].value['healthId'], - healthIdNumber: this.healthIdNumber, + healthId: this.mainForm.controls['abhaInfoForm'].value['healthIdNumber'], + healthIdNumber: this.mainForm.controls['abhaInfoForm'].value['healthIdNumber'], providerServiceMapId: this.sessionstorage.getItem('providerServiceID'), authenticationMode: null, createdBy: this.sessionstorage.getItem('userName'), }; - if (this.healthIdNumber != null && this.healthIdNumber !== undefined) { - this.registrarService.mapHealthId(reqObj).subscribe((res: any) => { - console.log('response for benhealthid mapping', res); - if (res.statusCode === 200) { - // this.confirmationService.alert(res.data.response, 'success'); - console.log('success'); - } else { - this.confirmationService.alert( - this.currentLanguageSet.alerts.info.issueInSavngData, - 'error', - ); - } - }); - } - + if + (this.mainForm.controls['abhaInfoForm'].value['healthIdNumber'] !== undefined && + this.mainForm.controls['abhaInfoForm'].value['healthIdNumber'] !== null) { + this.registrarService.mapHealthId(reqObj).subscribe((res: any) => { + if (res.statusCode === 200) { + // this.confirmationService.alert(res.data.response, 'success'); + console.log('success'); + } else { + this.confirmationService.alert( + this.currentLanguageSet.alerts.info.issueInSavngData, + 'error', + ); + } + }); + } this.mainForm.reset(); this.disableGenerateOTP = false; this.router.navigate(['/registrar/search/']); @@ -435,8 +434,7 @@ export class RegistrationComponent { addressLine3: demographicsForm.controls['addressLine3']?.value || null, religionName: othersForm.controls['religionName']?.value || null, }, - healthIdNumber: this.healthIdNumber, - healthId: abhaForm.controls['healthId']?.value || null, + abha: abhaForm.controls['healthIdNumber']?.value || null, genderID: (() => { const genderName = personalForm.controls['genderName']?.value; if (genderName === 'Female') { @@ -516,8 +514,8 @@ export class RegistrationComponent { const reqObj = { beneficiaryRegID: null, beneficiaryID: personalForm.beneficiaryID, - healthId: this.mainForm.controls['abhaInfoForm'].value['healthId'], - healthIdNumber: this.healthIdNumber, + healthId: this.mainForm.controls['abhaInfoForm'].value['healthIdNumber'], + healthIdNumber: this.mainForm.controls['abhaInfoForm'].value['healthIdNumber'], authenticationMode: null, providerServiceMapId: this.sessionstorage.getItem('providerServiceID'), createdBy: this.sessionstorage.getItem('userName'), @@ -616,8 +614,6 @@ export class RegistrationComponent { addressLine3: demographicsForm.controls['addressLine3']?.value || null, religionName: othersForm.controls['religionName']?.value || null, }, - healthId: abhaForm.controls['healthId']?.value || null, - healthIdNumber: this.healthIdNumber, abha: abhaForm.controls['healthIdNumber']?.value || null, genderID: (() => { const genderName = personalForm.controls['genderName']?.value; @@ -756,10 +752,9 @@ export class RegistrationComponent { } setHealthIdAfterGeneration(result: any) { - this.healthIdNumber = result.healthIdNumber; (( this.mainForm.controls['otherInfoForm'] - )).patchValue({ healthId: result?.healthId || '' }); + )).patchValue({ healthId: result.healthIdNumber }); (( this.mainForm.controls['otherInfoForm'] )).patchValue({ healthIdNumber: result.healthIdNumber }); diff --git a/src/registrar/services/registrar.service.ts b/src/registrar/services/registrar.service.ts index e88c0a4..51bf1ae 100644 --- a/src/registrar/services/registrar.service.ts +++ b/src/registrar/services/registrar.service.ts @@ -269,20 +269,6 @@ export class RegistrarService { return this.http.get(environment.getAbdmMappedFacility + reqObj); } - generateTokenForCareContext(reqObj: any) { - return this.http.post( - environment.generateLinkTokenForCareContext, - reqObj, - ); - } - - linkCareContext(reqObj: any) { - return this.http.post( - environment.linkCareContext, - reqObj, - ); - } - generateOtpForMappingCareContext(reqObjForMapping: any) { return this.http.post( environment.careContextGenerateOtpUrl, From 900d5a36e301054a9e2fd5cfef1610aa12e91660 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Wed, 7 Jan 2026 14:23:01 +0530 Subject: [PATCH 13/13] fix: amm-2038 es addidn space for serch --- src/registrar/search/search.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/registrar/search/search.component.ts b/src/registrar/search/search.component.ts index 5e59a27..0577a3d 100644 --- a/src/registrar/search/search.component.ts +++ b/src/registrar/search/search.component.ts @@ -134,7 +134,7 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked, OnDes distinctUntilChanged(), // Only emit if value changed switchMap((searchTerm: string) => { // Validate alphanumeric - const alphanumericPattern = /^[a-zA-Z0-9]*$/; + const alphanumericPattern = /^[a-zA-Z0-9\s]*$/; if (!alphanumericPattern.test(searchTerm)) { this.confirmationService.alert( 'Please enter valid alphanumeric input', @@ -177,7 +177,7 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked, OnDes } const trimmed = searchTerm.trim(); - const alphanumericPattern = /^[a-zA-Z0-9]*$/; + const alphanumericPattern = /^[a-zA-Z0-9\s]*$/; if (!alphanumericPattern.test(trimmed)) { this.confirmationService.alert( 'Please enter valid alphanumeric input',