From 1bae0c4b39c721c61b6f487c9c51171580311b39 Mon Sep 17 00:00:00 2001 From: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Date: Mon, 21 Jul 2025 11:57:37 +0530 Subject: [PATCH 1/9] Update version in pom.xml to 3.4.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 25e9b69..830fbf9 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ org.codehaus.mojo exec-maven-plugin - 3.1.0 + 3.4.0 npm-install @@ -173,7 +173,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.4.0 properties-updated 1 From 6b4ee4e8164315d529ce2945330a35c437e302aa Mon Sep 17 00:00:00 2001 From: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Date: Mon, 21 Jul 2025 15:45:41 +0530 Subject: [PATCH 2/9] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 830fbf9..d20b112 100644 --- a/pom.xml +++ b/pom.xml @@ -173,7 +173,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.4.0 + 3.1.0 properties-updated 1 From 772ee8405d0eac35463a525091baf0a60924b879 Mon Sep 17 00:00:00 2001 From: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Date: Tue, 29 Jul 2025 12:56:50 +0530 Subject: [PATCH 3/9] fix: amm-1655 (#71) --- .../general-opd-diagnosis.component.html | 41 ++++++------------ .../general-opd-diagnosis.component.ts | 34 +++++++++++++++ .../ncd-care-diagnosis.component.html | 43 +++++++------------ .../ncd-care-diagnosis.component.ts | 34 +++++++++++++++ .../ncd-screening-diagnosis.component.html | 42 +++++++----------- .../ncd-screening-diagnosis.component.ts | 34 +++++++++++++++ .../pnc-diagnosis.component.html | 43 +++++++------------ .../pnc-diagnosis/pnc-diagnosis.component.ts | 35 ++++++++++++++- 8 files changed, 197 insertions(+), 109 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html index 66308f8..3f3d3d1 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html @@ -14,35 +14,22 @@

{{ current_language_set?.casesheet?.provisionalDiag }}*

" > -
- - - search +
+ + {{ current_language_set?.casesheet?.provisionalDiag }} + + + + + {{ diag.term }} + +
+
- -
+
+ +
@@ -75,40 +87,60 @@

{{ current_language_set?.common?.confirmDiagnosis }}

+ class="row m-t-20"> -
- +
+ + {{ + current_language_set?.common?.confirmDiagnosis + }} - search + maxlength="100" + required + #confirmDiagnosisInput + [matAutocomplete]="autoConfirmDiagnosis" + (keyup)=" + onDiagnosisInputKeyup( + 'confirmatory', + confirmDiagnosisInput.value, + i + ) + " /> + + + + {{ diag.term }} + + Loading… + End of results +
-
+
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts index e77880e..62e157e 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts @@ -182,13 +182,11 @@ export class PncDiagnosisComponent ); } - getConfirmatoryDiagnosisList(): AbstractControl[] | null { - const confirmatoryDiagnosisListControl = this.generalDiagnosisForm.get( - 'confirmatoryDiagnosisList', + get confirmatoryDiagnosisControls(): AbstractControl[] { + return ( + (this.generalDiagnosisForm.get('confirmatoryDiagnosisList') as FormArray) + ?.controls || [] ); - return confirmatoryDiagnosisListControl instanceof FormArray - ? confirmatoryDiagnosisListControl.controls - : null; } beneficiaryDetailsSubscription: any; @@ -423,34 +421,179 @@ export class PncDiagnosisComponent } } - onDiagnosisInputKeyup(value: string, index: number) { - if (value.length >= 3) { - this.masterdataService - .searchDiagnosisBasedOnPageNo(value, index) - .subscribe((results: any) => { - this.suggestedDiagnosisList[index] = results?.data?.sctMaster; - }); - } else { - this.suggestedDiagnosisList[index] = []; - } + displayDiagnosis(diagnosis: any): string { + return typeof diagnosis === 'string' ? diagnosis : diagnosis?.term || ''; } - displayDiagnosis(diagnosis: any): string { + displayConfirmatoryDiagnosis(diagnosis: any): string { return typeof diagnosis === 'string' ? diagnosis : diagnosis?.term || ''; } - onDiagnosisSelected(selected: any, index: number) { - // this.patientQuickConsultForm.get(['provisionalDiagnosisList', index])?.setValue(selected); - const diagnosisFormArray = this.generalDiagnosisForm.get( - 'provisionalDiagnosisList' - ) as FormArray; - const diagnosisFormGroup = diagnosisFormArray.at(index) as FormGroup; - - // Set the nested and top-level fields - diagnosisFormGroup.patchValue({ - viewProvisionalDiagnosisProvided: selected, - conceptID: selected?.conceptID || null, - term: selected?.term || null, + // --- Shared scroll state for both provisional + confirmatory --- + private readonly PAGE_BASE = 0; + private readonly BOOTSTRAP_MAX_PAGES = 3; + + state: any = { + provisional: { + suggested: [] as any[][], + lastQueryByIndex: [] as string[], + pageByIndex: [] as number[], + loadingMore: [] as boolean[], + noMore: [] as boolean[], + wantMore: [] as boolean[], + }, + confirmatory: { + suggested: [] as any[][], + lastQueryByIndex: [] as string[], + pageByIndex: [] as number[], + loadingMore: [] as boolean[], + noMore: [] as boolean[], + wantMore: [] as boolean[], + }, + }; + + // --- Keyup handler (shared) --- + onDiagnosisInputKeyup( + type: 'provisional' | 'confirmatory', + value: string, + index: number, + ) { + const term = (value || '').trim(); + const s = this.state[type]; + + if (term.length >= 3) { + if (s.lastQueryByIndex[index] !== term) { + s.lastQueryByIndex[index] = term; + s.pageByIndex[index] = 0; + s.noMore[index] = false; + s.wantMore[index] = false; + s.suggested[index] = []; + } + this.fetchPage(type, index, false); + } else { + s.lastQueryByIndex[index] = ''; + s.pageByIndex[index] = 0; + s.noMore[index] = false; + s.wantMore[index] = false; + s.suggested[index] = []; + } + } + + // --- When user picks an option --- + onDiagnosisSelected( + type: 'provisional' | 'confirmatory', + selected: any, + index: number, + ) { + const controlName = + type === 'provisional' + ? 'provisionalDiagnosisList' + : 'confirmatoryDiagnosisList'; + const formArray = this.generalDiagnosisForm.get(controlName) as FormArray; + const fg = formArray.at(index) as FormGroup; + + fg.patchValue({ + [type === 'provisional' + ? 'viewProvisionalDiagnosisProvided' + : 'confirmatoryDiagnosis']: selected, + conceptID: selected?.conceptID ?? null, + term: selected?.term ?? null, }); } + + // --- Autocomplete scroll hooks --- + onPanelReady( + type: 'provisional' | 'confirmatory', + index: number, + panelEl: HTMLElement, + ) { + const s = this.state[type]; + if (panelEl.scrollHeight <= panelEl.clientHeight && !s.noMore[index]) { + this.bootstrapUntilScrollable(type, index, panelEl); + } + } + + onAutoNearEnd(type: 'provisional' | 'confirmatory', index: number) { + const s = this.state[type]; + if (!s.loadingMore[index] && !s.noMore[index]) { + this.fetchPage(type, index, true); + } else if (s.loadingMore[index]) { + s.wantMore[index] = true; + } + } + + private bootstrapUntilScrollable( + type: 'provisional' | 'confirmatory', + rowIndex: number, + panelEl: HTMLElement, + ) { + const s = this.state[type]; + let fetched = 0; + const tryFill = () => { + const scrollable = panelEl.scrollHeight > panelEl.clientHeight; + if ( + scrollable || + s.noMore[rowIndex] || + fetched >= this.BOOTSTRAP_MAX_PAGES + ) + return; + if (s.loadingMore[rowIndex]) { + requestAnimationFrame(tryFill); + return; + } + fetched++; + this.fetchPage(type, rowIndex, true); + requestAnimationFrame(tryFill); + }; + if (s.lastQueryByIndex[rowIndex]?.length >= 3) tryFill(); + } + + private fetchPage( + type: 'provisional' | 'confirmatory', + index: number, + append = false, + ) { + const s = this.state[type]; + const term = s.lastQueryByIndex[index]; + if (!term) return; + + const nextLogical = (s.pageByIndex[index] ?? 0) + (append ? 1 : 0); + const pageAtReq = nextLogical + this.PAGE_BASE; + if (s.loadingMore[index]) return; + s.loadingMore[index] = true; + + this.masterdataService + .searchDiagnosisBasedOnPageNo(term, pageAtReq) + .subscribe({ + next: (results: any) => { + if (s.lastQueryByIndex[index] !== term) return; + const list = results?.data?.sctMaster ?? []; + + if (append) { + const existing = new Set( + (s.suggested[index] ?? []).map( + (d: any) => d.id ?? d.code ?? d.term, + ), + ); + s.suggested[index] = [ + ...(s.suggested[index] ?? []), + ...list.filter( + (d: any) => !existing.has(d.id ?? d.code ?? d.term), + ), + ]; + } else { + s.suggested[index] = list; + } + + s.pageByIndex[index] = nextLogical; + if (!list.length) s.noMore[index] = true; + }, + complete: () => { + const wantChain = s.wantMore[index] && !s.noMore[index]; + s.loadingMore[index] = false; + s.wantMore[index] = false; + if (wantChain) this.fetchPage(type, index, true); + }, + }); + } } diff --git a/src/app/app-modules/nurse-doctor/nurse-doctor.module.ts b/src/app/app-modules/nurse-doctor/nurse-doctor.module.ts index 41c782c..b6f7aa6 100644 --- a/src/app/app-modules/nurse-doctor/nurse-doctor.module.ts +++ b/src/app/app-modules/nurse-doctor/nurse-doctor.module.ts @@ -160,6 +160,7 @@ import { GeneralCaseSheetComponent } from './case-sheet/general-case-sheet/gener import { HistoryCaseSheetComponent } from './case-sheet/general-case-sheet/history-case-sheet/history-case-sheet.component'; import { PncCaseSheetComponent } from './case-sheet/general-case-sheet/pnc-case-sheet/pnc-case-sheet.component'; import { SharedModule } from '../core/components/shared/shared.module'; +import { AutocompleteScrollerDirective } from './shared/utility/autocomplete-scroller.directive'; @NgModule({ imports: [ @@ -291,6 +292,7 @@ import { SharedModule } from '../core/components/shared/shared.module'; NurseMmuTmReferredWorklistComponent, DiseaseconfirmationComponent, CovidVaccinationStatusComponent, + AutocompleteScrollerDirective, ], providers: [ diff --git a/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html b/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html index 81a8c18..ab43773 100644 --- a/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html +++ b/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html @@ -622,88 +622,83 @@

-
+
-
- - - search + +
+ + {{ currentLanguageSet?.DiagnosisDetails?.provisionaldiagnosis }} + -
-
- - + + {{ diag.term }} + + Loading… + End of results +
+ + +
+ + +
diff --git a/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.ts b/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.ts index d7954d5..5ea53cb 100644 --- a/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.ts +++ b/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.ts @@ -169,6 +169,17 @@ export class QuickConsultComponent dataSource = new MatTableDataSource(); + suggestedDiagnosisList: any = []; + private readonly PAGE_BASE = 0; + + private readonly BOOTSTRAP_MAX_PAGES = 3; // when first page can't scroll, prefill up to this many extra pages + + loadingMore: boolean[] = []; + noMore: boolean[] = []; + wantMore: boolean[] = []; + pageByIndex: number[] = []; + lastQueryByIndex: string[] = []; + constructor( private fb: FormBuilder, private doctorService: DoctorService, @@ -1294,35 +1305,38 @@ export class QuickConsultComponent } } - removeDiagnosisFromList( - index: any, - diagnosisList: AbstractControl, - ) { - const diagnosisListForm = this.patientQuickConsultForm.controls[ + deleteDiagnosis(index: any, diagnosisListForm: AbstractControl) { + const diagnosisListArray = this.patientQuickConsultForm.controls[ 'provisionalDiagnosisList' ] as FormArray; - if (!diagnosisListForm.at(index).invalid) { + if (diagnosisListArray.at(index).valid) { this.confirmationService .confirm(`warn`, this.currentLanguageSet.alerts.info.warn) - .subscribe((result) => { + .subscribe(result => { if (result) { - if (diagnosisListForm.length > 1) { - diagnosisListForm.removeAt(index); + if (diagnosisListArray.length > 1) { + diagnosisListArray.removeAt(index); } else { - diagnosisListForm.removeAt(index); - diagnosisListForm.push(this.utils.initProvisionalDiagnosisList()); + diagnosisListForm.reset(); + (diagnosisListForm as FormGroup).controls[ + 'viewProvisionalDiagnosisProvided' + ].enable(); } + this.patientQuickConsultForm.markAsDirty(); } }); } else { - if (diagnosisListForm.length > 1) { - diagnosisListForm.removeAt(index); + if (diagnosisListArray.length > 1) { + diagnosisListArray.removeAt(index); } else { - diagnosisListForm.removeAt(index); - diagnosisListForm.push(this.utils.initProvisionalDiagnosisList()); + diagnosisListForm.reset(); + (diagnosisListForm as FormGroup).controls[ + 'viewProvisionalDiagnosisProvided' + ].enable(); } } } + checkProvisionalDiagnosisValidity(provisionalDiagnosis: any) { const temp = provisionalDiagnosis.value; if (temp.term && temp.conceptID) { @@ -1351,4 +1365,139 @@ export class QuickConsultComponent } return false; } + + onDiagnosisInputKeyup(value: string, index: number) { + const term = (value || '').trim(); + + if (term.length >= 3) { + if (this.lastQueryByIndex[index] !== term) { + this.lastQueryByIndex[index] = term; + this.pageByIndex[index] = 0; // logical 0th page + this.noMore[index] = false; + this.wantMore[index] = false; + this.suggestedDiagnosisList[index] = []; + } + this.fetchPage(index, false); + } else { + this.lastQueryByIndex[index] = ''; + this.pageByIndex[index] = 0; + this.noMore[index] = false; + this.wantMore[index] = false; + this.suggestedDiagnosisList[index] = []; + } + } + + displayDiagnosis(diagnosis: any): string { + return typeof diagnosis === 'string' ? diagnosis : diagnosis?.term || ''; + } + + onDiagnosisSelected(selected: any, index: number) { + const diagnosisFormArray = this.patientQuickConsultForm.get( + 'provisionalDiagnosisList', + ) as FormArray; + const diagnosisFormGroup = diagnosisFormArray.at(index) as FormGroup; + + // Set the nested and top-level fields + diagnosisFormGroup.patchValue({ + provisionalDiagnosis: selected, + conceptID: selected?.conceptID || null, + term: selected?.term || null, + }); + } + + onPanelReady(index: number, panelEl: HTMLElement) { + if (panelEl.scrollHeight <= panelEl.clientHeight && !this.noMore[index]) { + this.bootstrapUntilScrollable(index, panelEl); + } + } + + onAutoNearEnd(index: number) { + if (!this.loadingMore[index] && !this.noMore[index]) { + this.fetchPage(index, true); + } else if (this.loadingMore[index]) { + this.wantMore[index] = true; + } + } + + private bootstrapUntilScrollable(rowIndex: number, panelEl: HTMLElement) { + let fetched = 0; + + const tryFill = () => { + const scrollable = panelEl.scrollHeight > panelEl.clientHeight; + if ( + scrollable || + this.noMore[rowIndex] || + fetched >= this.BOOTSTRAP_MAX_PAGES + ) + return; + + if (this.loadingMore[rowIndex]) { + requestAnimationFrame(tryFill); + return; + } + + fetched++; + this.fetchPage(rowIndex, true); + + requestAnimationFrame(tryFill); + }; + + if (this.lastQueryByIndex[rowIndex]?.length >= 3) { + tryFill(); + } + } + + private fetchPage(index: number, append = false) { + const term = this.lastQueryByIndex[index]; + if (!term) return; + + const nextLogical = (this.pageByIndex[index] ?? 0) + (append ? 1 : 0); + const pageAtReq = nextLogical + this.PAGE_BASE; + + if (this.loadingMore[index]) return; + this.loadingMore[index] = true; + + const termAtReq = term; + + this.masterdataService + .searchDiagnosisBasedOnPageNo(termAtReq, pageAtReq) + .subscribe({ + next: (results: any) => { + if (this.lastQueryByIndex[index] !== termAtReq) return; + + const list = results?.data?.sctMaster ?? []; + + if (append) { + const existing = new Set( + (this.suggestedDiagnosisList[index] ?? []).map( + (d: any) => d.id ?? d.code ?? d.term + ) + ); + this.suggestedDiagnosisList[index] = [ + ...(this.suggestedDiagnosisList[index] ?? []), + ...list.filter( + (d: any) => !existing.has(d.id ?? d.code ?? d.term) + ), + ]; + } else { + this.suggestedDiagnosisList[index] = list; + } + + this.pageByIndex[index] = nextLogical; + if (!list.length) { + this.noMore[index] = true; + } + }, + error: () => { + console.error('Error fetching diagnosis data'); + }, + complete: () => { + const wantChain = this.wantMore[index] && !this.noMore[index]; + this.loadingMore[index] = false; + this.wantMore[index] = false; + + if (wantChain) this.fetchPage(index, true); + }, + }); + } } diff --git a/src/app/app-modules/nurse-doctor/shared/utility/autocomplete-scroller.directive.ts b/src/app/app-modules/nurse-doctor/shared/utility/autocomplete-scroller.directive.ts new file mode 100644 index 0000000..629a996 --- /dev/null +++ b/src/app/app-modules/nurse-doctor/shared/utility/autocomplete-scroller.directive.ts @@ -0,0 +1,119 @@ +/* + * 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 { + Directive, + EventEmitter, + NgZone, + OnDestroy, + AfterViewInit, + Output, + Input, +} from '@angular/core'; +import { MatAutocomplete } from '@angular/material/autocomplete'; +import { Subscription } from 'rxjs'; + +@Directive({ + selector: '[appAutocompleteScroller]', +}) +export class AutocompleteScrollerDirective implements AfterViewInit, OnDestroy { + @Input() threshold = 0.6; // 60% down + @Output() nearEnd = new EventEmitter(); + @Output() panelReady = new EventEmitter(); // lets component bootstrap if no overflow + + private subs: Subscription[] = []; + private scrollListener?: (e: Event) => void; + + constructor( + private ac: MatAutocomplete, + private ngZone: NgZone, + ) {} + + ngAfterViewInit(): void { + // Fired when the overlay panel opens + const openedSub = this.ac.opened.subscribe(() => { + this.waitForPanel((panelEl) => { + this.panelReady.emit(panelEl); // tell component the panel is live (for bootstrap) + + // attach scroll listener + this.ngZone.runOutsideAngular(() => { + this.scrollListener = () => { + if (panelEl.scrollHeight <= panelEl.clientHeight) return; // no overflow yet + const ratio = + (panelEl.scrollTop + panelEl.clientHeight) / panelEl.scrollHeight; + if (ratio >= this.threshold) { + // hop back into Angular so change detection works + this.ngZone.run(() => this.nearEnd.emit()); + } + }; + panelEl.addEventListener('scroll', this.scrollListener!, { + passive: true, + }); + }); + }); + }); + + // Fired when the panel closes + const closedSub = this.ac.closed.subscribe(() => { + const panelEl = this.getPanelEl(); + if (panelEl && this.scrollListener) { + panelEl.removeEventListener('scroll', this.scrollListener); + this.scrollListener = undefined; + } + }); + + this.subs.push(openedSub, closedSub); + } + + ngOnDestroy(): void { + this.subs.forEach((s) => s.unsubscribe()); + const panelEl = this.getPanelEl(); + if (panelEl && this.scrollListener) { + panelEl.removeEventListener('scroll', this.scrollListener); + this.scrollListener = undefined; + } + } + + private getPanelEl(): HTMLElement | null { + // Newer Material exposes panel element + const anyAc = this.ac as any; + const el = anyAc?.panel?.nativeElement as HTMLElement | null | undefined; + if (el) return el; + + // Fallback by id + const id = anyAc?.id as string | undefined; + return id ? (document.getElementById(id) as HTMLElement | null) : null; + } + + private waitForPanel(cb: (panelEl: HTMLElement) => void) { + let tries = 0; + const maxTries = 10; + const tick = () => { + const el = this.getPanelEl(); + if (el) { + cb(el); + return; + } + if (tries++ < maxTries) requestAnimationFrame(tick); + }; + requestAnimationFrame(tick); + } +} From a84a411a5e19e7bc3e320595f7cf34c896d99a33 Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Wed, 3 Sep 2025 19:00:35 +0530 Subject: [PATCH 7/9] fix: removing unnessary changes --- .../beneficiary-platform-history.component.ts | 3 +-- src/environments/environment.dev.ts | 20 +++++++++---------- src/environments/environment.development.ts | 20 +++++++++---------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/case-record/beneficiary-platform-history/beneficiary-platform-history.component.ts b/src/app/app-modules/nurse-doctor/case-record/beneficiary-platform-history/beneficiary-platform-history.component.ts index 53f0c0e..b7b5dfb 100644 --- a/src/app/app-modules/nurse-doctor/case-record/beneficiary-platform-history/beneficiary-platform-history.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/beneficiary-platform-history/beneficiary-platform-history.component.ts @@ -257,8 +257,7 @@ export class BeneficiaryPlatformHistoryComponent implements OnInit, DoCheck { visit.benVisitID, ); if (print) { - const url = 'http://localhost:4203/'; - // const url = environment.newTaburl; + const url = environment.newTaburl; window.open( url + '#/nurse-doctor/print/' + serviceType + '/' + 'previous', ); diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts index 68960ca..e888a8b 100644 --- a/src/environments/environment.dev.ts +++ b/src/environments/environment.dev.ts @@ -25,18 +25,18 @@ // `ng build --env=prod` then `environment.prod.ts` will be used instead. // The list of which env maps to which file can be found in `.angular-cli.json`. -const commonIP = 'https://uatamrit.piramalswasthya.org/'; -const tmIP = 'https://uatamrit.piramalswasthya.org/'; -const mmuIP = 'https://uatamrit.piramalswasthya.org/'; -const schedulerIP = 'https://uatamrit.piramalswasthya.org/'; -const tmUI_IP = 'https://uatamrit.piramalswasthya.org/'; -const schedulerUI_IP = 'https://uatamrit.piramalswasthya.org/'; -const inventoryUI_IP = 'https://uatamrit.piramalswasthya.org/'; +const commonIP = 'https://amritwprdev.piramalswasthya.org/'; +const tmIP = 'https://amritwprdev.piramalswasthya.org/'; +const mmuIP = 'https://amritwprdev.piramalswasthya.org/'; +const schedulerIP = 'https://amritwprdev.piramalswasthya.org/'; +const tmUI_IP = 'https://amritwprdev.piramalswasthya.org/'; +const schedulerUI_IP = 'https://amritwprdev.piramalswasthya.org/'; +const inventoryUI_IP = 'https://amritwprdev.piramalswasthya.org/'; const SERVER_IP = 'dataSYNCIP'; const SWYMED_IP = 'swymed://14.143.13.109'; -const adminIP = 'https://uatamrit.piramalswasthya.org'; -const FHIRIP = 'https://uatamrit.piramalswasthya.org'; -const identityIP = 'https://uatamrit.piramalswasthya.org/'; +const adminIP = 'https://amritwprdev.piramalswasthya.org'; +const FHIRIP = 'https://amritwprdev.piramalswasthya.org'; +const identityIP = 'https://amritwprdev.piramalswasthya.org/'; // With API MAN Configuration // const COMMON_API_OPEN = `http://${IP}:8080/apiman-gateway/IEMR/Common/open/`; diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts index 2cbfe1c..c97b77f 100644 --- a/src/environments/environment.development.ts +++ b/src/environments/environment.development.ts @@ -25,18 +25,18 @@ // `ng build --env=prod` then `environment.prod.ts` will be used instead. // The list of which env maps to which file can be found in `.angular-cli.json`. -const commonIP = 'https://uatamrit.piramalswasthya.org/'; -const tmIP = 'https://uatamrit.piramalswasthya.org/'; -const mmuIP = 'https://uatamrit.piramalswasthya.org/'; -const schedulerIP = 'https://uatamrit.piramalswasthya.org/'; -const tmUI_IP = 'https://uatamrit.piramalswasthya.org/'; -const schedulerUI_IP = 'https://uatamrit.piramalswasthya.org/'; -const inventoryUI_IP = 'https://uatamrit.piramalswasthya.org/'; +const commonIP = 'https://amritwprdev.piramalswasthya.org/'; +const tmIP = 'https://amritwprdev.piramalswasthya.org/'; +const mmuIP = 'https://amritwprdev.piramalswasthya.org/'; +const schedulerIP = 'https://amritwprdev.piramalswasthya.org/'; +const tmUI_IP = 'https://amritwprdev.piramalswasthya.org/'; +const schedulerUI_IP = 'https://amritwprdev.piramalswasthya.org/'; +const inventoryUI_IP = 'https://amritwprdev.piramalswasthya.org/'; const SERVER_IP = 'dataSYNCIP'; const SWYMED_IP = 'swymed://14.143.13.109'; -const adminIP = 'https://uatamrit.piramalswasthya.org'; -const FHIRIP = 'https://uatamrit.piramalswasthya.org'; -const identityIP = 'https://uatamrit.piramalswasthya.org/'; +const adminIP = 'https://amritwprdev.piramalswasthya.org'; +const FHIRIP = 'https://amritwprdev.piramalswasthya.org'; +const identityIP = 'https://amritwprdev.piramalswasthya.org/'; // With API MAN Configuration // const COMMON_API_OPEN = `http://${IP}:8080/apiman-gateway/IEMR/Common/open/`; From af0894776159c8027cd48a2053296e66e88eeeec Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Wed, 3 Sep 2025 19:00:56 +0530 Subject: [PATCH 8/9] fix: version update --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d20b112..9202d94 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.iemr.tm-ui tm-ui - 3.0.0 + 3.5.0 TM-UI Piramal - tm: Module ui war From b453b97131f049aba55d2b621239f2c3a104894d Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Thu, 4 Sep 2025 08:50:01 +0530 Subject: [PATCH 9/9] fix: removed extra details --- .../beneficiary-details.component.html | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/src/app/app-modules/core/components/beneficiary-details/beneficiary-details.component.html b/src/app/app-modules/core/components/beneficiary-details/beneficiary-details.component.html index 3f01716..9d09575 100644 --- a/src/app/app-modules/core/components/beneficiary-details/beneficiary-details.component.html +++ b/src/app/app-modules/core/components/beneficiary-details/beneficiary-details.component.html @@ -19,34 +19,6 @@ {{ beneficiary?.beneficiaryName }} - - - - {{ current_language_set?.bendetails?.fatherName }}: - - - - {{ beneficiary?.fatherName }} - - - - - - {{ current_language_set?.bendetails?.lastName }}: - - - - {{ beneficiary?.lastName }} - - - - - {{ current_language_set?.bendetails?.phoneNo }}: - - - {{ beneficiary?.preferredPhoneNum }} - - {{ current_language_set?.bendetails?.gender }} /