From 994675c3848327e47304ef8cf79adecc3f641de9 Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Sat, 5 Jul 2025 20:16:13 +0530 Subject: [PATCH 01/87] feat(tracking): added tracking on Visit Details and added tracking servervice in app module --- .../app-header/app-header.component.html | 9 ++++++++- .../components/app-header/app-header.component.ts | 8 ++++++++ .../chief-complaints.component.html | 4 ++++ .../chief-complaints.component.ts | 6 ++++++ .../upload-files/upload-files.component.html | 5 +++-- .../upload-files/upload-files.component.ts | 5 +++++ .../visit-details/visit-details.component.html | 15 +++++++++++++-- src/app/app.module.ts | 2 ++ 8 files changed, 49 insertions(+), 5 deletions(-) diff --git a/src/app/app-modules/core/components/app-header/app-header.component.html b/src/app/app-modules/core/components/app-header/app-header.component.html index 4bc3d2d5..e10af027 100644 --- a/src/app/app-modules/core/components/app-header/app-header.component.html +++ b/src/app/app-modules/core/components/app-header/app-header.component.html @@ -180,6 +180,7 @@ [routerLink]="[item.work[1].link]" routerLinkActive="active" [ngClass]="{ active: updateCSSToShowActiveRegistrar }" + (click)="trackRoleButtonClick('Registrar')" > {{ item.work[1].label }} @@ -195,12 +196,18 @@ mat-button [routerLink]="[item.link]" routerLinkActive="active" + (click)="trackRoleButtonClick(item.role)" > {{ item.label }}
  • - diff --git a/src/app/app-modules/core/components/app-header/app-header.component.ts b/src/app/app-modules/core/components/app-header/app-header.component.ts index b11902b2..f9166e1d 100644 --- a/src/app/app-modules/core/components/app-header/app-header.component.ts +++ b/src/app/app-modules/core/components/app-header/app-header.component.ts @@ -36,6 +36,7 @@ import { IotService } from '../../services/iot.service'; import { MatDialog } from '@angular/material/dialog'; import { environment } from 'src/environments/environment'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; // Add this import @Component({ selector: 'app-header', @@ -74,6 +75,7 @@ export class AppHeaderComponent implements OnInit, AfterContentChecked { private dialog: MatDialog, public service: IotService, readonly sessionstorage: SessionStorageService, + private trackingService: AmritTrackingService, // Add this injection ) {} ngOnInit() { @@ -330,4 +332,10 @@ export class AppHeaderComponent implements OnInit, AfterContentChecked { width: '600px', }); } + + trackRoleButtonClick(roleName: string) { + this.trackingService.trackButtonClick(`Role_${roleName}`); + // You can also use the more generic event tracking if you prefer: + // this.trackingService.trackEvent('Navigation', 'RoleButtonClick', roleName); + } } diff --git a/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.html b/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.html index 4bbe2e7f..4caabbdc 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.html +++ b/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.html @@ -32,6 +32,7 @@ (keyup)="suggestChiefComplaintList(complaint, i)" (blur)="reEnterChiefComplaint(complaint)" [matAutocomplete]="auto" + (focus)="trackFieldInteraction('Chief Complaints')" /> @@ -81,6 +82,7 @@ formControlName="duration" (input)="onInputDuration(complaint)" (selectionChange)="validateDuration(complaint)" + (focus)="trackFieldInteraction('Duration')" /> @@ -97,6 +99,7 @@ formControlName="unitOfDuration" [disabled]="!complaint.value.duration" (selectionChange)="validateDuration(complaint)" + (click)="trackFieldInteraction('Unit of Duration')" > Hour(s) Day(s) @@ -125,6 +128,7 @@ formControlName="description" maxlength="300" [disabled]="!complaint.value.chiefComplaint" + (focus)="trackFieldInteraction('Description')" > diff --git a/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.ts b/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.ts index 477707e6..a1d31691 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.ts +++ b/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.ts @@ -47,6 +47,7 @@ import { HttpServiceService } from 'src/app/app-modules/core/services/http-servi import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { MatTableDataSource } from '@angular/material/table'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-patient-chief-complaints', @@ -94,6 +95,7 @@ export class ChiefComplaintsComponent implements OnInit, DoCheck, OnDestroy { private nurseService: NurseService, private confirmationService: ConfirmationService, readonly sessionstorage: SessionStorageService, + private trackingService: AmritTrackingService, ) { this.formUtility = new VisitDetailUtils(this.fb, this.sessionstorage); } @@ -565,4 +567,8 @@ export class ChiefComplaintsComponent implements OnInit, DoCheck, OnDestroy { return true; } } + + trackFieldInteraction(fieldName: string) { + this.trackingService.trackFieldInteraction(fieldName, 'Visit Details'); + } } diff --git a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.html b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.html index 8f24c414..de23ead2 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.html +++ b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.html @@ -12,7 +12,7 @@ color="primary" class="mat_blue" [disabled]="disableFileSelection" - (click)="triggerLog($event)" + (click)="triggerLog($event); trackFieldInteraction('Select Files')" > {{ currentLanguageSet?.nurseData?.visitDetailsForm?.selectFile }} @@ -30,7 +30,8 @@ mat-raised-button color="primary" class="mat_blue pull-right" - (click)="checkForDuplicateUpload()" + [disabled]="!fileObj || fileObj.length === 0" + (click)="checkForDuplicateUpload(); trackFieldInteraction('Upload Files')" *ngIf="!disableFileSelection" > {{ currentLanguageSet?.nurseData?.visitDetailsForm?.uploadFiles }} diff --git a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts index 6cca31f7..71530ae5 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts +++ b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts @@ -39,6 +39,7 @@ import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-la import { LabService } from 'src/app/app-modules/lab/shared/services'; import { ViewRadiologyUploadedFilesComponent } from 'src/app/app-modules/lab/view-radiology-uploaded-files/view-radiology-uploaded-files.component'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-patient-upload-files', @@ -87,6 +88,7 @@ export class UploadFilesComponent implements OnChanges, OnInit, DoCheck { public httpServiceService: HttpServiceService, private doctorService: DoctorService, readonly sessionstorage: SessionStorageService, + private trackingService: AmritTrackingService, ) {} ngOnInit() { @@ -363,4 +365,7 @@ export class UploadFilesComponent implements OnChanges, OnInit, DoCheck { x.click(); } } + trackFieldInteraction(fieldName: string) { + this.trackingService.trackFieldInteraction(fieldName, 'Visit Details'); + } } diff --git a/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.html b/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.html index 88cfabc2..21141495 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.html +++ b/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.html @@ -36,8 +36,11 @@ name="visitReason" formControlName="visitReason" (selectionChange)=" - reasonSelected(patientVisitDetailsForm.controls['visitReason'].value) + + reasonSelected(patientVisitDetailsForm.controls['visitReason']. +value) " + (click)="trackFieldInteraction('Reason for Visit')" required > @@ -188,6 +195,7 @@ patientVisitDetailsForm.controls['followUpForFpMethod'].value ) " + (click)="trackFieldInteraction('Follow Up FP Method')" multiple required > @@ -224,6 +232,7 @@ allowText="alphaspace" name="otherFollowUpForFpMethod" formControlName="otherFollowUpForFpMethod" + (focus)="trackFieldInteraction('Other Follow Up FP Method')" /> @@ -251,6 +260,7 @@ patientVisitDetailsForm.controls['sideEffects'].value ) " + (click)="trackFieldInteraction('Side Effects')" > @@ -277,6 +287,7 @@ allowText="alphaspace" name="otherSideEffects" formControlName="otherSideEffects" + (focus)="trackFieldInteraction('Other Side Effects')" /> @@ -292,7 +303,7 @@ {{ diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c2ec38d7..c6cd6c8e 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -56,6 +56,7 @@ import { RegistrationModule } from 'Common-UI/src/registrar/registration.module' import { SharedModule } from './app-modules/core/components/shared/shared.module'; import { RegistrarModule } from './app-modules/registrar/registrar.module'; import { CaptchaComponent } from './user-login/captcha/captcha.component'; +import { TrackingModule } from 'Common-UI/src/tracking'; @NgModule({ declarations: [ @@ -85,6 +86,7 @@ import { CaptchaComponent } from './user-login/captcha/captcha.component'; CoreModule.forRoot(), SharedModule, RegistrationModule, + TrackingModule.forRoot(), ], schemas: [CUSTOM_ELEMENTS_SCHEMA], providers: [ From d3694fa624ad678d8cfe5a621fef0568ec9eee0c Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Sat, 5 Jul 2025 20:16:58 +0530 Subject: [PATCH 02/87] feat(tracking): added tracking in visit details --- .../visit-details/visit-details/visit-details.component.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.ts b/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.ts index ff735ab7..be60c872 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.ts +++ b/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.ts @@ -40,6 +40,7 @@ import { HttpServiceService } from 'src/app/app-modules/core/services/http-servi import { environment } from 'src/environments/environment'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-patient-visit-details', @@ -94,6 +95,7 @@ export class PatientVisitDetailsComponent private nurseService: NurseService, private route: ActivatedRoute, readonly sessionstorage: SessionStorageService, + private trackingService: AmritTrackingService, ) {} ngOnInit() { @@ -843,4 +845,8 @@ export class PatientVisitDetailsComponent this.disableAllFpOptions = false; this.enableOtherSideEffectTextField = false; } + + trackFieldInteraction(fieldName: string) { + this.trackingService.trackFieldInteraction(fieldName, 'Registration'); + } } From c23aa21c4abe1b91dae38b3e401298a43799a543 Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Sat, 5 Jul 2025 20:42:29 +0530 Subject: [PATCH 03/87] feat(tracking): added tracking in Past Illness --- .../past-history/past-history.component.html | 11 ++++++++--- .../past-history/past-history.component.ts | 10 ++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.html index 9e8a04c2..2bbbb449 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.html +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.html @@ -48,7 +48,7 @@

    name="pastAcuteIllness" formControlName="illnessType" (selectionChange)=" - filterPastIllnessType($event.value, i, pastIllness) + filterPastIllnessType($event.value, i, pastIllness); trackFieldInteraction('Past Illness') " > allowText="alphaspace" name="otherIllnessType" formControlName="otherIllnessType" + (focus)="trackFieldInteraction('Other Past Illness')" (blur)="otherIlnessForHrp()" /> @@ -97,6 +98,7 @@

    name="timePeriodAgo" formControlName="timePeriodAgo" (change)="validateDuration(pastIllness)" + (focus)="trackFieldInteraction('Illness Duration')" /> @@ -109,7 +111,7 @@

    Day(s) Week(s) @@ -181,7 +183,7 @@

    formControlName="surgeryType" name="surgeryType" (selectionChange)=" - filterPastSurgeryType($event.value, i, pastSurgery) + filterPastSurgeryType($event.value, i, pastSurgery); trackFieldInteraction('Past Surgery Type') " > allowText="alphaspace" name="otherSurgeryType" formControlName="otherSurgeryType" + (focus)="trackFieldInteraction('Other Past Surgery')" /> @@ -228,6 +231,7 @@

    name="timePeriodAgo" formControlName="timePeriodAgo" (change)="validateDuration(pastSurgery)" + (focus)="trackFieldInteraction('Surgery Duration')" /> @@ -241,6 +245,7 @@

    formControlName="timePeriodUnit" name="timePeriodUnit" (change)="validateDuration(pastSurgery)" + (selectionChange)="trackFieldInteraction('Surgery Time Period')" > Day(s) Week(s) diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.ts index 7125b3db..f02dd87f 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.ts +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.ts @@ -48,6 +48,7 @@ import { HrpService } from '../../../shared/services/hrp.service'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { PreviousDetailsComponent } from 'src/app/app-modules/core/components/previous-details/previous-details.component'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-general-past-history', @@ -91,6 +92,7 @@ export class PastHistoryComponent private masterdataService: MasterdataService, private hrpService: HrpService, readonly sessionstorage: SessionStorageService, + private trackingService: AmritTrackingService, ) {} ngOnInit() { @@ -754,4 +756,12 @@ export class PastHistoryComponent getLanguageJson.setLanguage(); this.currentLanguageSet = getLanguageJson.currentLanguageObject; } + + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction(fieldName, 'Past History'); + } catch (error) { + console.error(`❌ Error tracking past history ${fieldName}:`, error); + } + } } From 20e76062148a192115e85ac83aaad5433810c476 Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Sat, 5 Jul 2025 22:43:04 +0530 Subject: [PATCH 04/87] feat(tracking): added tracking in comorbidity --- ...comorbidity-concurrent-conditions.component.html | 13 +++++++++---- .../comorbidity-concurrent-conditions.component.ts | 10 ++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.html index accbecf7..53cf432f 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.html +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.html @@ -6,7 +6,7 @@ id="previousANCComorbidityHistory" color="primary" matTooltip="{{ currentLanguageSet?.DurationData?.previousDetails }}" - (click)="getPreviousComorbidityHistory()" + (click)="getPreviousComorbidityHistory(); trackFieldInteraction('Previous Comorbidity History')" (keydown.enter)="getPreviousComorbidityHistory()" (keydown.space)="getPreviousComorbidityHistory()" > @@ -53,7 +53,7 @@ $event.value, i, comorbidityConcurrentConditions - ) + ); trackFieldInteraction('Comorbid Conditions') " required="{{ ComorbidStatus }}" > @@ -86,6 +86,7 @@ allowText="alphaspace" name="otherComorbidCondition" formControlName="otherComorbidCondition" + (focus)="trackFieldInteraction('Other Comorbid Condition')" /> @@ -103,6 +104,7 @@ allowText="number" name="timePeriodAgo" formControlName="timePeriodAgo" + (focus)="trackFieldInteraction('Comorbidity Duration')" (change)="validateDuration(comorbidityConcurrentConditions)" /> @@ -118,6 +120,7 @@ name="timePeriodUnit" formControlName="timePeriodUnit" (change)="validateDuration(comorbidityConcurrentConditions)" + (selectionChange)="trackFieldInteraction('Comorbidity Duration Unit')" > Day(s) Week(s) @@ -138,6 +141,7 @@ class="checkbox" checked="checked" formControlName="isForHistory" + (change)="trackFieldInteraction('Inactive for Future Visits')" > {{ currentLanguageSet?.inactiveForFutureVisits }} @@ -150,10 +154,11 @@ class="mat-add-btn" [disabled]="checkValidity(comorbidityConcurrentConditions)" id="addComorbidityConcurrentConditions" - (click)="addComorbidityConcurrentConditions()" + (click)="addComorbidityConcurrentConditions(); trackFieldInteraction('Add Comorbidity')" > {{ currentLanguageSet?.common?.add }} + + diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.ts index 073722f1..378f4e40 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.ts +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.ts @@ -46,6 +46,7 @@ import { HttpServiceService } from 'src/app/app-modules/core/services/http-servi import { PreviousDetailsComponent } from 'src/app/app-modules/core/components/previous-details/previous-details.component'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-general-medication-history', @@ -75,6 +76,7 @@ export class MedicationHistoryComponent implements OnInit, DoCheck, OnDestroy { public httpServiceService: HttpServiceService, private beneficiaryDetailsService: BeneficiaryDetailsService, readonly sessionstorage: SessionStorageService, + private trackingService: AmritTrackingService, ) {} ngOnInit() { @@ -329,4 +331,18 @@ export class MedicationHistoryComponent implements OnInit, DoCheck, OnDestroy { medicationHistory?.get('timePeriodUnit')?.reset(); } } + + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction( + fieldName, + 'Medication History', + ); + } catch (error) { + console.error( + `❌ Error tracking medication history ${fieldName}:`, + error, + ); + } + } } From e8668e375387908653b99825211a792f1a55f619 Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Sat, 5 Jul 2025 23:13:32 +0530 Subject: [PATCH 06/87] feat: added tracking to previous history button --- .../medication-history/medication-history.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.html index 55caf960..0a73940d 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.html +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.html @@ -6,7 +6,7 @@ id="previousANCMedicationHistory" color="primary" matTooltip="{{ currentLanguageSet?.DurationData?.previousDetails }}" - (click)="getPreviousMedicationHistory()" + (click)="getPreviousMedicationHistory(); trackFieldInteraction('Previous Medication History')" (keydown.enter)="getPreviousMedicationHistory()" (keydown.space)="getPreviousMedicationHistory()" > From 7a56ed21ccd9c6017071cec29fe0fedcf364b211 Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Sat, 5 Jul 2025 23:40:29 +0530 Subject: [PATCH 07/87] feat(tracking): added tracking in personal history --- .../personal-history.component.html | 61 ++++++++++--------- .../personal-history.component.ts | 9 +++ 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.html index 6ccd323d..97e61e1b 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.html +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.html @@ -7,7 +7,7 @@ id="previousTobaccoHistory" color="primary" matTooltip="{{ currentLanguageSet?.DurationData?.previousDetails }}" - (click)="getPreviousTobaccoHistory()" + (click)="getPreviousTobaccoHistory(); trackFieldInteraction('Previous Tobacco History')" (keydown.enter)="getPreviousTobaccoHistory()" (keydown.space)="getPreviousTobaccoHistory()" > @@ -26,7 +26,7 @@ id="previousAlcoholHistory" color="primary" matTooltip="{{ currentLanguageSet?.DurationData?.previousDetails }}" - (click)="getPreviousAlcoholHistory()" + (click)="getPreviousAlcoholHistory(); trackFieldInteraction('Previous Alcohol History')" (keydown.enter)="getPreviousAlcoholHistory()" (keydown.space)="getPreviousAlcoholHistory()" > @@ -45,7 +45,7 @@ id="previousAllergyHistory" color="primary" matTooltip="{{ currentLanguageSet?.DurationData?.previousDetails }}" - (click)="getPreviousAllergyHistory()" + (click)="getPreviousAllergyHistory(); trackFieldInteraction('Previous Allergy History')" (keydown.enter)="getPreviousAllergyHistory()" (keydown.space)="getPreviousAllergyHistory()" > @@ -66,7 +66,7 @@ ?.personalHistoryANC_OPD_NCD_PNC?.dietaryType }}
    - + {{ currentLanguageSet?.historyData?.ancHistory ?.personalHistoryANC_OPD_NCD_PNC?.vegetarian @@ -89,7 +89,7 @@ ?.personalHistoryANC_OPD_NCD_PNC?.physicalActivityType }}
    - + {{ currentLanguageSet?.historyData?.ancHistory ?.personalHistoryANC_OPD_NCD_PNC?.sedentary @@ -110,7 +110,7 @@ ?.personalHistoryANC_OPD_NCD_PNC?.riskySexualPracticesStatus }}
    - + {{ currentLanguageSet?.common?.yes }} @@ -133,7 +133,7 @@ Yes No @@ -155,7 +155,7 @@ Yes No @@ -176,7 +176,7 @@ Yes No @@ -225,7 +225,7 @@

    maxlength="50" allowText="alphabet" formControlName="otherTobaccoUseType" + (focus)="trackFieldInteraction('Other Tobacco Type')" /> @@ -272,12 +273,13 @@

    formControlName="number" (blur)="perDayChange()" (input)="enableFields(tobacco)" + (focus)="trackFieldInteraction('Tobacco Number')" />
    - + allowText="number" formControlName="duration" (change)="validateDuration(tobacco)" + (focus)="trackFieldInteraction('Tobacco Duration')" />
    @@ -320,7 +323,7 @@

    Day(s) Week(s) @@ -340,7 +343,7 @@

    *ngIf="isLast" class="mat-add-btn" [disabled]="checkTobaccoValidity(tobacco)" - (click)="addTobacco()" + (click)="addTobacco(); trackFieldInteraction('Add Tobacco')" > {{ currentLanguageSet?.common?.add }} @@ -350,7 +353,7 @@

    class="mat-remove-btn" style="margin-left: 3px" *ngIf="i !== 0 || (i === 0 && (tobacco.touched || tobacco.dirty))" - (click)="removeTobacco(i, tobacco)" + (click)="removeTobacco(i, tobacco); trackFieldInteraction('Remove Tobacco')" > {{ currentLanguageSet?.common?.remove }} @@ -395,7 +398,7 @@

    maxlength="50" allowText="alphabet" formControlName="otherAlcoholType" + (focus)="trackFieldInteraction('Other Alcohol Type')" /> @@ -436,7 +440,7 @@

    id="frequencyIntake" class="select-full-width lineheight" formControlName="alcoholIntakeFrequency" - (selectionChange)="onChangeAlcIntakFreq(alcohol)" + (selectionChange)="onChangeAlcIntakFreq(alcohol); trackFieldInteraction('Alcohol Frequency')" > allowText="number" formControlName="duration" (change)="validateDuration(alcohol)" + (focus)="trackFieldInteraction('Alcohol Duration')" /> @@ -495,7 +500,7 @@

    Day(s) Week(s) @@ -515,7 +520,7 @@

    class="mat-add-btn" *ngIf="isLast" [disabled]="checkAlcoholValidity(alcohol)" - (click)="addAlcohol()" + (click)="addAlcohol(); trackFieldInteraction('Add Alcohol')" > {{ currentLanguageSet?.common?.add }} @@ -525,7 +530,7 @@

    class="mat-remove-btn" style="margin-left: 3px" *ngIf="i !== 0 || (i === 0 && (alcohol.touched || alcohol.dirty))" - (click)="removeAlcohol(i, alcohol)" + (click)="removeAlcohol(i, alcohol); trackFieldInteraction('Remove Alcohol')" > {{ currentLanguageSet?.common?.remove }} @@ -567,7 +572,7 @@

    maxlength="50" formControlName="snomedTerm" (change)="removeSnomedCode(allergy, i)" - (keyup.enter)=" - searchComponents(allergy.value.snomedTerm, i, allergy) - " + (keyup.enter)="searchComponents(allergy.value.snomedTerm, i, allergy)" + (focus)="trackFieldInteraction('Allergen Name')" /> search @@ -632,7 +636,7 @@

    class="select-full-width lineheight" multiple formControlName="typeOfAllergicReactions" - (change)="canEnableOtherAllergy(allergy)" + (change)="canEnableOtherAllergy(allergy); trackFieldInteraction('Type of Allergic Reactions')" > @@ -677,7 +682,7 @@

    allergyMasterData.length " [disabled]="checkAllergyValidity(allergy)" - (click)="addAllergy()" + (click)="addAllergy(); trackFieldInteraction('Add Allergy')" > {{ currentLanguageSet?.common?.add }} @@ -687,7 +692,7 @@

    class="mat-remove-btn" style="margin-left: 3px; margin-right: 3px" *ngIf="i !== 0 || (i === 0 && (allergy.touched || allergy.dirty))" - (click)="removeAllergy(i, allergy)" + (click)="removeAllergy(i, allergy); trackFieldInteraction('Remove Allergy')" > {{ currentLanguageSet?.common?.remove }} diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.ts index ebe9975b..3f461640 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.ts +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.ts @@ -51,6 +51,7 @@ import { PreviousDetailsComponent } from 'src/app/app-modules/core/components/pr import { AllergenSearchComponent } from 'src/app/app-modules/core/components/allergen-search/allergen-search.component'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-general-personal-history', @@ -115,6 +116,7 @@ export class GeneralPersonalHistoryComponent private masterdataService: MasterdataService, private ncdScreeningService: NcdScreeningService, readonly sessionstorage: SessionStorageService, + private trackingService: AmritTrackingService, ) {} ngOnInit() { @@ -1201,4 +1203,11 @@ export class GeneralPersonalHistoryComponent alcoholForm?.get('durationUnit')?.reset(); } } + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction(fieldName, 'Personal History'); + } catch (error) { + console.error(`❌ Error tracking personal history ${fieldName}:`, error); + } + } } From 18054b6c412c96e47791dde92796d7b177cae6e2 Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Sat, 5 Jul 2025 23:49:57 +0530 Subject: [PATCH 08/87] feat(tracking): added tracking to family history --- .../family-history/family-history.component.html | 12 ++++++++---- .../family-history/family-history.component.ts | 10 ++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.html index 706f3ddb..916eb260 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.html +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.html @@ -6,7 +6,7 @@ id="previousANCFamilyHistory" color="primary" matTooltip="{{ currentLanguageSet?.DurationData?.previousDetails }}" - (click)="getPreviousFamilyHistory()" + (click)="getPreviousFamilyHistory(); trackFieldInteraction('Previous Family History')" (keydown.enter)="getPreviousFamilyHistory()" (keydown.space)="getPreviousFamilyHistory()" > @@ -40,7 +40,7 @@ name="diseaseType" formControlName="diseaseType" (selectionChange)=" - filterFamilyDiseaseList($event.value, i, familyDisease) + filterFamilyDiseaseList($event.value, i, familyDisease); trackFieldInteraction('Family Disease Type') " > @@ -101,6 +102,8 @@ multiple name="familyMembers" formControlName="familyMembers" + (selectionChange)="trackFieldInteraction('Family Member')" + > {{ currentLanguageSet?.common?.add }} @@ -134,7 +137,7 @@ i !== 0 || (i === 0 && (familyDisease.touched || familyDisease.dirty)) " - (click)="removeFamilyDisease(i, familyDisease)" + (click)="removeFamilyDisease(i, familyDisease); trackFieldInteraction('Remove Family History')" > {{ currentLanguageSet?.common?.remove }} @@ -179,6 +182,7 @@ maxlength="50" name="geneticDisorder" formControlName="geneticDisorder" + (selectionChange)="trackFieldInteraction('Genetic Disorder Type')" /> diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.ts index ed8d835b..4ae3b54b 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.ts +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.ts @@ -39,6 +39,7 @@ import { HttpServiceService } from 'src/app/app-modules/core/services/http-servi import { PreviousDetailsComponent } from 'src/app/app-modules/core/components/previous-details/previous-details.component'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-general-family-history', @@ -75,6 +76,7 @@ export class FamilyHistoryComponent implements OnInit, DoCheck, OnDestroy { public httpServiceService: HttpServiceService, private masterdataService: MasterdataService, readonly sessionstorage: SessionStorageService, + private trackingService: AmritTrackingService, ) {} ngOnInit() { @@ -412,4 +414,12 @@ export class FamilyHistoryComponent implements OnInit, DoCheck, OnDestroy { getLanguageJson.setLanguage(); this.currentLanguageSet = getLanguageJson.currentLanguageObject; } + + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction(fieldName, 'Family History'); + } catch (error) { + console.error(`❌ Error tracking family history ${fieldName}:`, error); + } + } } From 347742af36c951ac5ef8202003ae52f58004460f Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Sat, 5 Jul 2025 23:53:59 +0530 Subject: [PATCH 09/87] feat(tracking): added tracking to menstrual history --- .../menstrual-history.component.html | 16 ++++++++++++---- .../menstrual-history.component.ts | 13 +++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.html index 06c0658b..7040bc01 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.html +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.html @@ -4,7 +4,7 @@ id="previousANCMenstrualHistory" color="primary" matTooltip="{{ currentLanguageSet?.DurationData?.previousDetails }}" - (click)="getPreviousMenstrualHistory()" + (click)="getPreviousMenstrualHistory(); trackFieldInteraction('Previous Menstrual History')" (keydown.enter)="getPreviousMenstrualHistory()" (keydown.space)="getPreviousMenstrualHistory()" > @@ -27,7 +27,7 @@ class="select-full-width" name="menstrualCycleStatus" formControlName="menstrualCycleStatus" - (selectionChange)="checkMenstrualCycleStatus()" + (selectionChange)="checkMenstrualCycleStatus(); trackFieldInteraction('Menstrual Cycle Status')" >
    - + {{ currentLanguageSet?.common?.regular }} @@ -65,6 +69,7 @@ class="select-full-width" name="cycleLength" formControlName="cycleLength" + (selectionChange)="trackFieldInteraction('Menstrual Cycle Length')" > diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.ts index 0f1fe5a4..b522b956 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.ts +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.ts @@ -41,6 +41,7 @@ import { MAT_MOMENT_DATE_ADAPTER_OPTIONS, } from '@angular/material-moment-adapter'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-general-menstrual-history', @@ -97,6 +98,7 @@ export class MenstrualHistoryComponent implements OnInit, DoCheck, OnDestroy { private confirmationService: ConfirmationService, private masterdataService: MasterdataService, readonly sessionstorage: SessionStorageService, + private trackingService: AmritTrackingService, ) {} ngOnInit() { @@ -316,4 +318,15 @@ export class MenstrualHistoryComponent implements OnInit, DoCheck, OnDestroy { this.disableNoneMenstrualProblem = flag; } + + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction( + fieldName, + 'Menstrual History', + ); + } catch (error) { + console.error(`❌ Error tracking menstrual history ${fieldName}:`, error); + } + } } From 976abbdb22279302c3783d136a644b8eaa83030b Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Sun, 6 Jul 2025 00:12:45 +0530 Subject: [PATCH 10/87] feat(tracking): added tracking to past obsteric history --- .../past-obsteric-history.component.html | 32 ++++++++++++------- .../past-obsteric-history.component.ts | 16 ++++++++++ 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.html index fb6136c7..bcdfa834 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.html +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.html @@ -4,7 +4,7 @@ id="previousANCPastObstetricHistory" color="primary" matTooltip="{{ currentLanguageSet?.DurationData?.previousDetails }}" - (click)="getPreviousObstetricHistory()" + (click)="getPreviousObstetricHistory(); trackFieldInteraction('Previous Past Obstetric History')" (keydown.enter)="getPreviousObstetricHistory()" (keydown.space)="getPreviousObstetricHistory()" > @@ -33,6 +33,7 @@ [readonly]="visitCategory === 'ANC' ? true : false" formControlName="totalNoOfPreg" (blur)="checkTotalPregnancy(totalNoOfPreg)" + (focus)="trackFieldInteraction('Total Number of Pregnancies')" /> @@ -58,7 +59,7 @@ formControlName="value" class="checkbox" color="primary" - (change)="togglePastObstericHistory($event, i + 1)" + (change)="togglePastObstericHistory($event, i + 1); trackFieldInteraction('Pregnancy Order ' + (i + 1))" > {{ i + 1 }} @@ -109,7 +110,7 @@ pastObstericHistory, i, true - ) + ); trackFieldInteraction('Pregnancy Complications') " multiple > @@ -157,6 +158,7 @@ maxlength="50" name="others" formControlName="otherPregComplication" + (focus)="trackFieldInteraction('Other Pregnancy Complication')" /> @@ -171,7 +173,7 @@ class="select-full-width" name="outcomeOfPregnancy" formControlName="pregOutcome" - (selectionChange)="checkPregnancyOutcome(pastObstericHistory)" + (selectionChange)="checkPregnancyOutcome(pastObstericHistory); trackFieldInteraction('Pregnancy Outcome')" > @@ -413,7 +419,7 @@ name="typeOfDelivery" formControlName="deliveryType" [disabled]="!pastObstericHistory.value.deliveryPlace" - (selectionChange)="hrpPastObstetricDetails(true)" + (selectionChange)="hrpPastObstetricDetails(true); trackFieldInteraction('Type of Delivery')" > @@ -445,7 +451,7 @@ pastObstericHistory, i, true - ) + ); trackFieldInteraction('Delivery Complications') " multiple > @@ -496,6 +502,7 @@ allowText="alphaspace" name="othersDeliveryComplication" formControlName="otherDeliveryComplication" + (focus)="trackFieldInteraction('Other Delivery Complication')" /> @@ -512,7 +519,7 @@ name="postpartumComplication" formControlName="postpartumComplicationList" (selectionChange)=" - resetOtherPostpartumComplicationType(pastObstericHistory, i) + resetOtherPostpartumComplicationType(pastObstericHistory, i); trackFieldInteraction('Postpartum Complications') " multiple > @@ -563,6 +570,7 @@ allowText="alphaspace" name="otherPostpartumComplication" formControlName="otherPostpartumCompType" + (focus)="trackFieldInteraction('Other Postpartum Complication')" /> @@ -584,7 +592,7 @@ name="newBornComplications" formControlName="newBornComplication" (selectionChange)=" - resetOtherNewBornComplications(pastObstericHistory) + resetOtherNewBornComplications(pastObstericHistory); trackFieldInteraction('Newborn Complications') " > @@ -644,6 +653,7 @@ name="congenitalAnomalies" formControlName="congenitalAnomalies" (change)="setCongenitalAnomalies()" + (focus)="trackFieldInteraction('Congenital Anomalies')" /> diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.ts index cb53b015..6f661fb1 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.ts +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.ts @@ -48,6 +48,7 @@ import { HttpServiceService } from 'src/app/app-modules/core/services/http-servi import { PreviousDetailsComponent } from 'src/app/app-modules/core/components/previous-details/previous-details.component'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-general-past-obsteric-history', @@ -86,6 +87,7 @@ export class PastObstericHistoryComponent private masterdataService: MasterdataService, private beneficiaryDetailsService: BeneficiaryDetailsService, readonly sessionstorage: SessionStorageService, + private trackingService: AmritTrackingService, ) { this.formUtility = new GeneralUtils(this.fb, this.sessionstorage); } @@ -817,4 +819,18 @@ export class PastObstericHistoryComponent getLanguageJson.setLanguage(); this.currentLanguageSet = getLanguageJson.currentLanguageObject; } + + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction( + fieldName, + 'Past Obstetric History', + ); + } catch (error) { + console.error( + `❌ Error tracking past obstetric history ${fieldName}:`, + error, + ); + } + } } From e2b55a85a69b891ceefe844b4d5b3ba39f044394 Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Sun, 6 Jul 2025 00:29:13 +0530 Subject: [PATCH 11/87] feat(tracking): added tracking to vitals component --- .../general-patient-vitals.component.html | 77 ++++++++++++++++--- .../general-patient-vitals.component.ts | 10 +++ 2 files changed, 75 insertions(+), 12 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.html b/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.html index ef5e0019..5b9f2e23 100644 --- a/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.html +++ b/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.html @@ -25,6 +25,7 @@
    name="height_cm" formControlName="height_cm" (change)="checkHeight(height_cm)" + (focus)="trackFieldInteraction('Height')" defaultNull maxlength="6" allowMax="350" @@ -48,6 +49,7 @@
    defaultNull (change)="checkWeight(weight_Kg)" (blur)="calculateBMI()" + (focus)="trackFieldInteraction('Weight')" allowText="decimal" name="weight_Kg" id="weight_Kg" @@ -65,7 +67,9 @@
    viewBox="0 0 512 512" matTooltip="{{ currentLanguageSet?.common?.startTest }}" matSuffix - (click)="openIOTWeightModel()" + (click)=" + openIOTWeightModel(); trackFieldInteraction('IoT Weight Test') + " onkeydown="openIOTWeightModel()" tabindex="{0}" > @@ -341,6 +345,7 @@
    }" (change)="checkIDRSForWaist(waistCircumference_cm)" (blur)="hipWaistRatio()" + (focus)="trackFieldInteraction('Waist Circumference')" id="waistCircumference_cm" name="waistCircumference_cm" formControlName="waistCircumference_cm" @@ -372,6 +377,7 @@
    allowText="decimal" (change)="checkHip(hipCircumference_cm)" (blur)="hipWaistRatio()" + (focus)="trackFieldInteraction('Hip Circumference')" name="hipCircumference_cm" id="hipCircumference_cm" formControlName="hipCircumference_cm" @@ -512,6 +518,7 @@
    defaultNull allowText="decimal" (change)="checkHeadCircumference(headCircumference_cm)" + (focus)="trackFieldInteraction('Head Circumference')" [ngClass]="{ abnormal: headCircumference_cm < 25 || headCircumference_cm > 75 }" @@ -546,6 +553,7 @@
    (change)=" checkMidUpperArmCircumference(midUpperArmCircumference_MUAC_cm) " + (focus)="trackFieldInteraction('Mid Upper Arm Circumference')" [ngClass]="{ abnormal: midUpperArmCircumference_MUAC_cm < 5 || @@ -628,6 +636,7 @@
    id="temperature" formControlName="temperature" (change)="checkTemperature(temperature)" + (focus)="trackFieldInteraction('Temperature')" maxlength="5" allowMax="150" [required]=" @@ -642,7 +651,10 @@
    viewBox="0 0 512 512" matTooltip="{{ currentLanguageSet?.common?.startTest }}" matSuffix - (click)="openIOTTempModel()" + (click)=" + openIOTTempModel(); + trackFieldInteraction('IoT Temperature Test') + " onkeydown="openIOTTempModel()" tabindex="{0}" > @@ -671,6 +683,7 @@
    id="pulseRate" formControlName="pulseRate" (change)="checkPulseRate(pulseRate)" + (focus)="trackFieldInteraction('Pulse Rate')" [required]=" (visitCategory !== 'NCD screening' && visitCategory !== 'ANC' && @@ -687,7 +700,10 @@
    viewBox="0 0 512 512" matTooltip="{{ currentLanguageSet?.common?.startTest }}" matSuffix - (click)="openIOTPulseRateModel()" + (click)=" + openIOTPulseRateModel(); + trackFieldInteraction('IoT Pulse Rate Test') + " onkeydown="openIOTPulseRateModel()" tabindex="{0}" > @@ -711,6 +727,7 @@
    formControlName="sPO2" [ngClass]="{ abnormal: sPO2 < 1 || sPO2 > 100 }" (change)="checkSpo2()" + (focus)="trackFieldInteraction('SpO2')" /> viewBox="0 0 512 512" matTooltip="{{ currentLanguageSet?.common?.startTest }}" matSuffix - (click)="openIOTSPO2Model()" + (click)=" + openIOTSPO2Model(); trackFieldInteraction('IoT SpO2 Test') + " onkeydown="openIOTSPO2Model()" tabindex="{0}" > @@ -743,6 +762,7 @@
    systolicBP_1stReading < 110 || systolicBP_1stReading > 140 }" (change)="checkSystolic(systolicBP_1stReading)" + (focus)="trackFieldInteraction('Systolic Blood Pressure')" allowText="number" id="systolicBP_1stReading" name="systolicBP_1stReading" @@ -768,7 +788,10 @@
    viewBox="0 0 512 512" matTooltip="{{ currentLanguageSet?.common?.startTest }}" matSuffix - (click)="openIOTBPModel()" + (click)=" + openIOTBPModel(); + trackFieldInteraction('IoT Blood Pressure Test') + " onkeydown="openIOTBPModel()" tabindex="{0}" > @@ -794,6 +817,7 @@
    diastolicBP_1stReading < 60 || diastolicBP_1stReading > 90 }" (change)="checkDiastolic(diastolicBP_1stReading)" + (focus)="trackFieldInteraction('Diastolic Blood Pressure')" allowText="number" id="diastolicBP_1stReading" name="diastolicBP_1stReading" @@ -819,7 +843,10 @@
    viewBox="0 0 512 512" matTooltip="{{ currentLanguageSet?.common?.startTest }}" matSuffix - (click)="openIOTBPModel()" + (click)=" + openIOTBPModel(); + trackFieldInteraction('IoT Blood Pressure Test') + " onkeydown="openIOTBPModel()" tabindex="{0}" > @@ -851,6 +878,7 @@
    id="respiratoryRate" formControlName="respiratoryRate" (change)="checkRespiratoryRate(respiratoryRate)" + (focus)="trackFieldInteraction('Respiratory Rate')" allowMax="150" maxlength="3" /> @@ -887,6 +915,7 @@
    bloodGlucose_Fasting < 50 || bloodGlucose_Fasting > 700 }" (change)="checkBloodSugarFasting(bloodGlucose_Fasting)" + (focus)="trackFieldInteraction('Fasting Blood Glucose')" /> viewBox="0 0 512 512" matTooltip="{{ currentLanguageSet?.common?.startTest }}" matSuffix - (click)="openIOTBGFastingModel()" + (click)=" + openIOTBGFastingModel(); + trackFieldInteraction('IoT Fasting Blood Glucose Test') + " onkeydown="openIOTBGFastingModel()" tabindex="{0}" > @@ -923,6 +955,7 @@
    formControlName="bloodGlucose_Random" [ngClass]="{ abnormal: bloodGlucose_Random < 140 }" (change)="checkBloodSugarRandom(bloodGlucose_Random)" + (focus)="trackFieldInteraction('Random Blood Glucose')" /> viewBox="0 0 512 512" matTooltip="{{ currentLanguageSet?.common?.startTest }}" matSuffix - (click)="openIOTBGRandomModel()" + (click)=" + openIOTBGRandomModel(); + trackFieldInteraction('IoT Random Blood Glucose Test') + " onkeydown="openIOTBGRandomModel()" tabindex="{0}" > @@ -959,6 +995,9 @@
    maxlength="3" [ngClass]="{ abnormal: bloodGlucose_2hr_PP < 140 }" (change)="checkBloodSugar2HrPostPrandial(bloodGlucose_2hr_PP)" + (focus)=" + trackFieldInteraction('2hr Post Prandial Blood Glucose') + " /> viewBox="0 0 512 512" matTooltip="{{ currentLanguageSet?.common?.startTest }}" matSuffix - (click)="openIOTBGPostPrandialModel()" + (click)=" + openIOTBGPostPrandialModel(); + trackFieldInteraction( + 'IoT Post Prandial Blood Glucose Test' + ) + " onkeydown="openIOTBGPostPrandialModel()" tabindex="{0}" > @@ -992,6 +1036,7 @@
    allowText="tempDecimal" [ngClass]="{ abnormal: hemoglobin < 11 || hemoglobin > 15.1 }" (change)="checkHemoglobin()" + (focus)="trackFieldInteraction('Hemoglobin')" name="hemoglobin" id="hemoglobin" formControlName="hemoglobin" @@ -1023,7 +1068,9 @@
    id="PreviousRbsHistory" class="pull-right" color="primary" - (click)="loadMMURBS()" + (click)=" + loadMMURBS(); trackFieldInteraction('Load Previous RBS History') + " > history @@ -1033,7 +1080,9 @@
    @@ -1053,6 +1102,7 @@
    maxlength="4" (blur)="checkForRange()" (change)="rbsResultChange()" + (focus)="trackFieldInteraction('RBS Test Result')" [ngClass]="{ abnormal: rbsTestResult < 0 || rbsTestResult > 1000 }" @@ -1063,7 +1113,9 @@
    viewBox="0 0 512 512" matTooltip="{{ currentLanguageSet?.common?.startTest }}" matSuffix - (click)="openIOTRBSModel()" + (click)=" + openIOTRBSModel(); trackFieldInteraction('IoT RBS Test') + " onkeydown="openIOTRBSModel()" tabindex="{0}" > @@ -1087,6 +1139,7 @@
    formControlName="rbsTestRemarks" maxlength="300" [disabled]="rbsResultChange()" + (focus)="trackFieldInteraction('RBS Test Remarks')" /> diff --git a/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts b/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts index 4c467583..7e5f58db 100644 --- a/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts +++ b/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts @@ -36,6 +36,7 @@ import { HttpServiceService } from 'src/app/app-modules/core/services/http-servi import { MmuRbsDetailsComponent } from 'src/app/app-modules/core/components/mmu-rbs-details/mmu-rbs-details.component'; import { IotcomponentComponent } from 'src/app/app-modules/core/components/iotcomponent/iotcomponent.component'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-nurse-general-patient-vitals', @@ -101,6 +102,7 @@ export class GeneralPatientVitalsComponent private route: ActivatedRoute, private ncdScreeningService: NcdScreeningService, readonly sessionstorage: SessionStorageService, + private trackingService: AmritTrackingService, ) {} ngOnInit() { @@ -1183,4 +1185,12 @@ export class GeneralPatientVitalsComponent onCheckboxChange(symptomName: any, event: any) { symptomName = event.checked ? 1 : 0; } + + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction(fieldName, 'Vitals'); + } catch (error) { + console.error(`❌ Error tracking vitals ${fieldName}:`, error); + } + } } From 574fb6b6e089761391987f21c472e437041ea49e Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Sun, 6 Jul 2025 00:46:13 +0530 Subject: [PATCH 12/87] feat(tracking): added tracking to examination component --- .../general-examination.component.html | 55 ++++++++++++++++--- .../general-examination.component.ts | 16 ++++++ 2 files changed, 63 insertions(+), 8 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.html index f59582b0..b46b69cd 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.html +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.html @@ -11,6 +11,7 @@ id="consciousness" name="consciousness" formControlName="consciousness" + (selectionChange)="trackFieldInteraction('Consciousness')" > {{ built.name }} @@ -80,6 +83,7 @@ id="coherence" name="coherence" formControlName="coherence" + (change)="trackFieldInteraction('Coherence')" > {{ current_language_set?.common?.yes @@ -104,6 +108,7 @@ id="comfortness" name="comfortness" formControlName="comfortness" + (change)="trackFieldInteraction('Comfortness')" >
    - + {{ current_language_set?.common?.normal }} @@ -153,7 +163,7 @@ id="dangerSigns" name="dangerSigns" formControlName="dangerSigns" - (change)="checkWithDangerSign()" + (change)="checkWithDangerSign(); trackFieldInteraction('Danger Signs')" > {{ current_language_set?.common?.yes @@ -182,6 +192,7 @@ name="typeOfDangerSigns" formControlName="typeOfDangerSigns" [required]="dangerSigns === 'Yes'" + (selectionChange)="trackFieldInteraction('Type of Danger Signs')" >
    - + {{ current_language_set?.common?.present }} @@ -225,7 +241,12 @@ ?.genExamination?.jaundice }}
    - + {{ current_language_set?.common?.present }} @@ -246,7 +267,12 @@ ?.genExamination?.cyanosis }}
    - + {{ current_language_set?.common?.present }} @@ -267,7 +293,12 @@ ?.genExamination?.clubbing }}
    - + {{ current_language_set?.common?.present }} @@ -292,7 +323,9 @@ id="lymphadenopathy" name="lymphadenopathy" formControlName="lymphadenopathy" - (change)="checkWithLymphadenopathy()" + (change)=" + checkWithLymphadenopathy(); trackFieldInteraction('Lymphadenopathy') + " > {{ current_language_set?.common?.present @@ -321,6 +354,7 @@ name="lymphnodesInvolved" formControlName="lymphnodesInvolved" [required]="lymphadenopathy === 'Present'" + (selectionChange)="trackFieldInteraction('Lymph Nodes Involved')" > {{ current_language_set?.common?.present @@ -404,6 +439,7 @@ name="extentOfEdema" formControlName="extentOfEdema" [required]="edema === 'Present'" + (selectionChange)="trackFieldInteraction('Extent of Edema')" > {{ current_language_set?.ExaminationData?.ANC_OPD_PNCExamination @@ -464,6 +501,7 @@ id="quickening" name="quickening" formControlName="quickening" + (change)="trackFieldInteraction('Quickening')" > {{ current_language_set?.common?.present @@ -490,6 +528,7 @@ id="foetalMovements" name="foetalMovements" formControlName="foetalMovements" + (change)="trackFieldInteraction('Foetal Movements')" > {{ current_language_set?.common?.present diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.ts index 4f5141c5..1828630f 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.ts +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.ts @@ -24,6 +24,7 @@ import { FormGroup, FormBuilder } from '@angular/forms'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-nurse-general-examination', @@ -209,6 +210,7 @@ export class GeneralExaminationComponent implements OnInit, DoCheck, OnChanges { constructor( public httpServiceService: HttpServiceService, readonly sessionstorage: SessionStorageService, + private trackingService: AmritTrackingService, ) {} hideForANCAndQC = false; ngOnInit() { @@ -284,4 +286,18 @@ export class GeneralExaminationComponent implements OnInit, DoCheck, OnChanges { get FoetalMovements() { return this.generalExaminationForm.controls['foetalMovements'].value; } + + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction( + fieldName, + 'General Examination', + ); + } catch (error) { + console.error( + `❌ Error tracking general examination ${fieldName}:`, + error, + ); + } + } } From 875ae4365967ebac1074559b877f98cf587290f2 Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Sun, 6 Jul 2025 01:30:32 +0530 Subject: [PATCH 13/87] feat(tracking): completed exmaination tracking --- .../head-to-toe-examination.component.html | 18 ++++++++++- .../head-to-toe-examination.component.ts | 16 ++++++++++ .../cardio-vascular-system.component.html | 18 +++++++++-- .../cardio-vascular-system.component.ts | 21 ++++++++++-- .../central-nervous-system.component.html | 8 +++++ .../central-nervous-system.component.ts | 20 +++++++++++- .../genito-urinary-system.component.html | 3 ++ .../genito-urinary-system.component.ts | 20 +++++++++++- .../musculoskeletal-system.component.html | 13 ++++++++ .../musculoskeletal-system.component.ts | 16 ++++++++++ .../obstetric-examination.component.html | 32 +++++++++++++++---- .../obstetric-examination.component.ts | 16 ++++++++++ .../respiratory-system.component.html | 11 +++++++ .../respiratory-system.component.ts | 16 ++++++++++ 14 files changed, 215 insertions(+), 13 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.html index fd90760b..7e887852 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.html +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.html @@ -15,7 +15,9 @@ id="headtoToeExam" name="headtoToeExam" formControlName="headtoToeExam" - (change)="checkWithHeadToToe()" + (change)=" + checkWithHeadToToe(); trackFieldInteraction('Head to Toe Examination') + " > {{ current_language_set?.common?.normal @@ -48,6 +50,7 @@ name="head" formControlName="head" maxlength="50" + (focus)="trackFieldInteraction('Head Examination')" /> @@ -72,6 +75,7 @@ name="eyes" formControlName="eyes" maxlength="50" + (focus)="trackFieldInteraction('Eyes Examination')" /> @@ -97,6 +101,7 @@ name="ears" formControlName="ears" maxlength="50" + (focus)="trackFieldInteraction('Ears Examination')" /> @@ -122,6 +127,7 @@ name="nose" formControlName="nose" maxlength="50" + (focus)="trackFieldInteraction('Nose Examination')" /> @@ -147,6 +153,7 @@ name="oralCavity" formControlName="oralCavity" maxlength="50" + (focus)="trackFieldInteraction('Oral Cavity Examination')" /> @@ -172,6 +179,7 @@ name="throat" formControlName="throat" maxlength="50" + (focus)="trackFieldInteraction('Throat Examination')" /> @@ -196,6 +204,7 @@ name="breastAndNipples" formControlName="breastAndNipples" maxlength="50" + (focus)="trackFieldInteraction('Breast Examination')" /> @@ -218,6 +227,7 @@ name="nipples" formControlName="nipples" maxlength="300" + (focus)="trackFieldInteraction('Nipples Examination')" /> @@ -243,6 +253,7 @@ name="trunk" formControlName="trunk" maxlength="50" + (focus)="trackFieldInteraction('Trunk Examination')" /> @@ -268,6 +279,7 @@ name="upperLimbs" formControlName="upperLimbs" maxlength="50" + (focus)="trackFieldInteraction('Upper Limbs Examination')" /> @@ -293,6 +305,7 @@ name="lowerLimbs" formControlName="lowerLimbs" maxlength="50" + (focus)="trackFieldInteraction('Lower Limbs Examination')" /> @@ -318,6 +331,7 @@ name="skin" formControlName="skin" maxlength="50" + (focus)="trackFieldInteraction('Skin Examination')" /> @@ -343,6 +357,7 @@ name="hair" formControlName="hair" maxlength="50" + (focus)="trackFieldInteraction('Hair Examination')" /> @@ -368,6 +383,7 @@ name="nails" formControlName="nails" maxlength="50" + (focus)="trackFieldInteraction('Nails Examination')" /> diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.ts index 7803850d..1bf8a66e 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.ts +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.ts @@ -23,6 +23,7 @@ import { Component, OnInit, Input, DoCheck } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-nurse-head-to-toe-examination', @@ -40,6 +41,7 @@ export class HeadToToeExaminationComponent implements OnInit, DoCheck { constructor( private fb: FormBuilder, public httpServiceService: HttpServiceService, + private trackingService: AmritTrackingService, ) {} ngOnInit() { @@ -119,4 +121,18 @@ export class HeadToToeExaminationComponent implements OnInit, DoCheck { get nipples() { return this.headToToeExaminationForm.controls['nipples'].value; } + + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction( + fieldName, + 'Head to Toe Examination', + ); + } catch (error) { + console.error( + `❌ Error tracking head to toe examination ${fieldName}:`, + error, + ); + } + } } diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.html index d4bff7c3..e2baf95f 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.html +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.html @@ -8,6 +8,7 @@ {{ current_language_set?.common?.normal @@ -32,6 +33,7 @@ name="apexbeatLocation" formControlName="apexbeatLocation" maxlength="300" + (focus)="trackFieldInteraction('Apex Beat Location')" > @@ -50,6 +52,7 @@ name="apexbeatType" formControlName="apexbeatType" maxlength="300" + (focus)="trackFieldInteraction('Apex Beat Type')" > @@ -68,6 +71,7 @@ name="firstHeartSound_S1" formControlName="firstHeartSound_S1" maxlength="300" + (focus)="trackFieldInteraction('First Heart Sound')" > @@ -86,6 +90,7 @@ name="secondHeartSound_S2" formControlName="secondHeartSound_S2" maxlength="300" + (focus)="trackFieldInteraction('Second Heart Sound')" > @@ -104,6 +109,7 @@ name="additionalHeartSounds" formControlName="additionalHeartSounds" maxlength="300" + (focus)="trackFieldInteraction('Additional Heart Sounds')" > @@ -114,7 +120,11 @@ ?.cardioForANC_OPD_PNC?.murmurs }}
    - + {{ current_language_set?.common?.present }} @@ -130,7 +140,11 @@ ?.cardioForANC_OPD_PNC?.pericardialrub }}
    - + {{ current_language_set?.common?.present }} diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.ts index debda105..94d298d0 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.ts +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.ts @@ -23,7 +23,7 @@ import { Component, OnInit, Input, DoCheck } from '@angular/core'; import { FormGroup } from '@angular/forms'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service'; - +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-nurse-cardio-vascular-system', templateUrl: './cardio-vascular-system.component.html', @@ -34,7 +34,10 @@ export class CardioVascularSystemComponent implements OnInit, DoCheck { cardioVascularSystemForm!: FormGroup; current_language_set: any; - constructor(public httpServiceService: HttpServiceService) {} + constructor( + public httpServiceService: HttpServiceService, + private trackingService: AmritTrackingService, + ) {} ngOnInit() { this.assignSelectedLanguage(); @@ -48,4 +51,18 @@ export class CardioVascularSystemComponent implements OnInit, DoCheck { getLanguageJson.setLanguage(); this.current_language_set = getLanguageJson.currentLanguageObject; } + + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction( + fieldName, + 'Cardiovascular System', + ); + } catch (error) { + console.error( + `❌ Error tracking cardiovascular system ${fieldName}:`, + error, + ); + } + } } diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.html index b04a7ab0..c7cd7dbd 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.html +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.html @@ -9,6 +9,7 @@ class="select-full-width" name="handedness" formControlName="handedness" + (selectionChange)="trackFieldInteraction('Handedness')" > @@ -52,6 +54,7 @@ name="motorSystem" formControlName="motorSystem" maxlength="300" + (focus)="trackFieldInteraction('Motor System')" > @@ -70,6 +73,7 @@ name="sensorySystem" formControlName="sensorySystem" maxlength="300" + (focus)="trackFieldInteraction('Sensory System')" > @@ -88,6 +92,7 @@ name="autonomicSystem" formControlName="autonomicSystem" maxlength="300" + (focus)="trackFieldInteraction('Autonomic System')" > @@ -106,6 +111,7 @@ name="cerebellarSigns" formControlName="cerebellarSigns" maxlength="300" + (focus)="trackFieldInteraction('Cerebellar Signs')" > @@ -119,6 +125,7 @@ {{ current_language_set?.common?.present @@ -143,6 +150,7 @@ name="skull" formControlName="skull" maxlength="300" + (focus)="trackFieldInteraction('Skull')" > diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.ts index 855a93bd..0cde482a 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.ts +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.ts @@ -23,6 +23,7 @@ import { Component, OnInit, Input, DoCheck } from '@angular/core'; import { FormGroup } from '@angular/forms'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-nurse-central-nervous-system', @@ -49,7 +50,10 @@ export class CentralNervousSystemComponent implements OnInit, DoCheck { }, ]; - constructor(public httpServiceService: HttpServiceService) {} + constructor( + public httpServiceService: HttpServiceService, + private trackingService: AmritTrackingService, + ) {} ngOnInit() { this.assignSelectedLanguage(); @@ -63,4 +67,18 @@ export class CentralNervousSystemComponent implements OnInit, DoCheck { getLanguageJson.setLanguage(); this.current_language_set = getLanguageJson.currentLanguageObject; } + + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction( + fieldName, + 'Central Nervous System', + ); + } catch (error) { + console.error( + `❌ Error tracking central nervous system ${fieldName}:`, + error, + ); + } + } } diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.html index ccf477fc..65c2c617 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.html +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.html @@ -13,6 +13,7 @@ name="renalAngle" formControlName="renalAngle" maxlength="300" + (focus)="trackFieldInteraction('Renal Angle')" > @@ -31,6 +32,7 @@ name="suprapubicRegion" formControlName="suprapubicRegion" maxlength="300" + (focus)="trackFieldInteraction('Suprapubic Region')" > @@ -49,6 +51,7 @@ name="externalGenitalia" formControlName="externalGenitalia" maxlength="300" + (focus)="trackFieldInteraction('External Genitalia')" > diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.ts index 5039be56..04eb0538 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.ts +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.ts @@ -23,6 +23,7 @@ import { Component, OnInit, Input, DoCheck } from '@angular/core'; import { FormGroup } from '@angular/forms'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-nurse-genito-urinary-system', @@ -34,7 +35,10 @@ export class GenitoUrinarySystemComponent implements OnInit, DoCheck { genitoUrinarySystemForm!: FormGroup; current_language_set: any; - constructor(public httpServiceService: HttpServiceService) {} + constructor( + public httpServiceService: HttpServiceService, + private trackingService: AmritTrackingService, + ) {} ngOnInit() { this.assignSelectedLanguage(); @@ -48,4 +52,18 @@ export class GenitoUrinarySystemComponent implements OnInit, DoCheck { getLanguageJson.setLanguage(); this.current_language_set = getLanguageJson.currentLanguageObject; } + + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction( + fieldName, + 'Genitourinary System', + ); + } catch (error) { + console.error( + `❌ Error tracking genitourinary system ${fieldName}:`, + error, + ); + } + } } diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.html index ca2ba269..33b6f090 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.html +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.html @@ -18,6 +18,7 @@
    class="select-full-width" name="joint_TypeOfJoint" formControlName="joint_TypeOfJoint" + (selectionChange)="trackFieldInteraction('Joint Type')" > class="select-full-width" name="joint_Laterality" formControlName="joint_Laterality" + (selectionChange)="trackFieldInteraction('Joint Laterality')" > class="select-full-width" name="joint_Abnormality" formControlName="joint_Abnormality" + (selectionChange)="trackFieldInteraction('Joint Abnormality')" > class="select-full-width" name="upperLimb_Laterality" formControlName="upperLimb_Laterality" + (selectionChange)="trackFieldInteraction('Upper Limb Laterality')" > class="select-full-width" name="upperLimb_Abnormality" formControlName="upperLimb_Abnormality" + (selectionChange)=" + trackFieldInteraction('Upper Limb Abnormality') + " > class="select-full-width" name="lowerLimb_Abnormality" formControlName="lowerLimb_Abnormality" + (selectionChange)=" + trackFieldInteraction('Lower Limb Abnormality') + " > @@ -227,6 +239,7 @@
    name="spine" formControlName="spine" maxlength="300" + (focus)="trackFieldInteraction('Spine')" > diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.ts index f480bcc9..2263fcd5 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.ts +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.ts @@ -24,6 +24,7 @@ import { MasterdataService } from '../../../../shared/services'; import { FormGroup } from '@angular/forms'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-nurse-musculoskeletal-system', @@ -144,6 +145,7 @@ export class MusculoskeletalSystemComponent constructor( private masterdataService: MasterdataService, public httpServiceService: HttpServiceService, + private trackingService: AmritTrackingService, ) {} ngOnInit() { @@ -172,4 +174,18 @@ export class MusculoskeletalSystemComponent if (masterData) this.selectTypeOfJoint = masterData.jointTypes; }); } + + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction( + fieldName, + 'Musculoskeletal System', + ); + } catch (error) { + console.error( + `❌ Error tracking musculoskeletal system ${fieldName}:`, + error, + ); + } + } } diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.html index c3a66351..7fd65675 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.html +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.html @@ -9,6 +9,7 @@ class="select-full-width" name="fundalHeight" formControlName="fundalHeight" + (selectionChange)="trackFieldInteraction('Fundal Height')" > {{ current_language_set?.common?.present @@ -90,7 +94,9 @@ {{ current_language_set?.common?.audible @@ -114,6 +120,7 @@ class="select-full-width" name="fetalHeartRate_BeatsPerMinute" formControlName="fetalHeartRate_BeatsPerMinute" + (selectionChange)="trackFieldInteraction('Fetal Heart Rate')" > @@ -213,7 +224,9 @@ {{ current_language_set?.checkHrpStatus }} @@ -282,7 +299,10 @@ [id]="value.foetalMonitorTestId" class="button-overall-disabled mat_blue" [disabled]="checkTestPrescribed(value.foetalMonitorTestId)" - (click)="sendTestDetails(value.foetalMonitorTestId, value.testName)" + (click)=" + sendTestDetails(value.foetalMonitorTestId, value.testName); + trackFieldInteraction('Fetosense Test') + " > {{ value.testName }} diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.ts index 57a4a6a6..2a1b6188 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.ts +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.ts @@ -35,6 +35,7 @@ import { } from 'src/app/app-modules/nurse-doctor/shared/services'; import { HrpService } from 'src/app/app-modules/nurse-doctor/shared/services/hrp.service'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-nurse-anc-obstetric-examination', templateUrl: './obstetric-examination.component.html', @@ -217,6 +218,7 @@ export class ObstetricExaminationComponent private datePipe: DatePipe, readonly sessionstorage: SessionStorageService, private doctorService: DoctorService, + private trackingService: AmritTrackingService, ) {} ngOnDestroy() { @@ -502,4 +504,18 @@ export class ObstetricExaminationComponent } /*END*/ + + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction( + fieldName, + 'Obstetric Examination', + ); + } catch (error) { + console.error( + `❌ Error tracking obstetric examination ${fieldName}:`, + error, + ); + } + } } diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.html index f5ee7c2e..8b53f1df 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.html +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.html @@ -9,6 +9,7 @@ class="select-full-width" name="trachea" formControlName="trachea" + (selectionChange)="trackFieldInteraction('Trachea')" > @@ -47,6 +49,7 @@ {{ current_language_set?.common?.present @@ -71,6 +74,7 @@ name="palpation" formControlName="palpation" maxlength="300" + (focus)="trackFieldInteraction('Palpation')" > @@ -85,6 +89,7 @@ class="select-full-width" name="auscultation_BreathSounds" formControlName="auscultation_BreathSounds" + (selectionChange)="trackFieldInteraction('Breath Sounds')" > {{ current_language_set?.common?.present @@ -124,6 +130,7 @@ {{ current_language_set?.common?.present @@ -143,6 +150,7 @@ {{ current_language_set?.common?.present @@ -162,6 +170,7 @@ {{ current_language_set?.common?.present @@ -181,6 +190,7 @@ {{ current_language_set?.common?.present @@ -201,6 +211,7 @@ class="select-full-width" name="percussion" formControlName="percussion" + (selectionChange)="trackFieldInteraction('Percussion')" > Date: Sun, 6 Jul 2025 14:06:08 +0530 Subject: [PATCH 14/87] fix(bug): fixed family history component --- .../family-history/family-history.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.html index 916eb260..48fbf74a 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.html +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.html @@ -123,7 +123,7 @@ *ngIf="isLast" [disabled]="checkValidity(familyDisease)" id="addFamilyDisease" - (click)="addFamilyHistory(); trackFieldInteraction('Add Family History')" + (click)="addFamilyDisease(); trackFieldInteraction('Add Family History')" > {{ currentLanguageSet?.common?.add }} From f8430ac5472b2863fdf139ac036f632ed051cca4 Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Sun, 6 Jul 2025 19:24:23 +0530 Subject: [PATCH 15/87] feat(tracking): added tracking to previous significant findings --- ...previous-significiant-findings.component.html | 11 ++++++++++- .../previous-significiant-findings.component.ts | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.html index 78d671f5..b818fb8e 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.html @@ -8,6 +8,7 @@ placeholder="{{ current_language_set?.common?.inTableSearch }}" #filterTerm (keyup)="filterPreviousSignificiantFindingsList(filterTerm.value)" + (focus)="trackFieldInteraction('Search Previous Findings')" /> search @@ -26,6 +27,7 @@ style="border-bottom: none" *matHeaderCellDef mat-sort-header + (click)="trackFieldInteraction('Sort Serial Number')" > {{ current_language_set?.coreComponents?.sno }} @@ -40,6 +42,7 @@ style="border-bottom: none" *matHeaderCellDef mat-sort-header + (click)="trackFieldInteraction('Sort Significant Findings')" > {{ current_language_set?.Significantfindingsdetails @@ -57,6 +60,7 @@ style="border-bottom: none" *matHeaderCellDef mat-sort-header + (click)="trackFieldInteraction('Sort Captured Date')" > {{ current_language_set?.Significantfindingsdetails?.captureddate }} @@ -65,7 +69,11 @@ - +
    diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.ts index 85d2dafa..d830fcc0 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.ts @@ -32,6 +32,7 @@ import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-la import { MatPaginator } from '@angular/material/paginator'; import { MatTableDataSource } from '@angular/material/table'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-previous-significiant-findings', @@ -45,6 +46,7 @@ export class PreviousSignificiantFindingsComponent private doctorService: DoctorService, public httpServiceService: HttpServiceService, readonly sessionstorage: SessionStorageService, + private trackingService: AmritTrackingService, ) {} rowsPerPage = 5; activePage = 1; @@ -137,4 +139,18 @@ export class PreviousSignificiantFindingsComponent }); } } + + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction( + fieldName, + 'Central Nervous System', + ); + } catch (error) { + console.error( + `❌ Error tracking central nervous system ${fieldName}:`, + error, + ); + } + } } From de118bf28ce5523b0954ccd78a0fb993da77f271 Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Sun, 6 Jul 2025 19:30:51 +0530 Subject: [PATCH 16/87] feat(tracking): added tracking to previous visit details component --- .../previous-visit-details.component.html | 7 ++++--- .../previous-visit-details.component.ts | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.html index 65e1ee3a..aa3cfc9b 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.html @@ -6,6 +6,7 @@

    {{ current_language_set?.previousvisit?.currentvitals }}

    + + + + + + + + + + + + + + + + + + + + + + + + - +
    @@ -122,7 +123,7 @@
    {{ current_language_set?.previousvisit?.bodyweighttrends }}
    [options]="lineChartOptions" [legend]="weightChartLegend" [type]="'line'" - (chartClick)="chartClicked('bw')" + (chartClick)="chartClicked('bw'); trackFieldInteraction('Body Weight Chart Click')" >
    @@ -147,7 +148,7 @@
    {{ current_language_set?.previousvisit?.bloodPressureTrends }}
    [options]="lineChartOptions" [legend]="weightChartLegend" [type]="'line'" - (chartClick)="chartClicked('bp')" + (chartClick)="chartClicked('bp'); trackFieldInteraction('Blood Pressure Chart Click')" >
    @@ -173,7 +174,7 @@
    {{ current_language_set?.previousvisit?.bloodGlucoseTrends }}
    [options]="lineChartOptions" [legend]="weightChartLegend" [type]="'line'" - (chartClick)="chartClicked('bg')" + (chartClick)="chartClicked('bg'); trackFieldInteraction('Blood Glucose Chart Click')" >
    diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.ts index d6a0560a..672da498 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.ts @@ -35,6 +35,7 @@ import { Subscription } from 'rxjs'; import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-previous-visit-details', @@ -145,6 +146,7 @@ export class PreviousVisitDetailsComponent private router: Router, public httpServiceService: HttpServiceService, readonly sessionstorage: SessionStorageService, + private trackingService: AmritTrackingService, ) {} ngOnInit() { @@ -354,4 +356,18 @@ export class PreviousVisitDetailsComponent this.previousVisitDetailsSubscription.unsubscribe(); } } + + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction( + fieldName, + 'Central Nervous System', + ); + } catch (error) { + console.error( + `❌ Error tracking central nervous system ${fieldName}:`, + error, + ); + } + } } From 6a9be159048d3c92e25b18f84597f0d6a6e12a9f Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Sun, 6 Jul 2025 19:59:02 +0530 Subject: [PATCH 17/87] feat(tracking): added tracking to findings and diagnosis component --- .../diagnosis/diagnosis.component.html | 6 +++ .../diagnosis/diagnosis.component.ts | 14 ++++- .../findings/findings.component.html | 53 ++++++++++++++++--- .../findings/findings.component.ts | 10 ++++ 4 files changed, 75 insertions(+), 8 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.html index f6ad2e5b..9e64c55f 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.html @@ -11,30 +11,36 @@ [caseRecordMode]="caseRecordMode" [generalDiagnosisForm]="generalDiagnosisForm" [visitCat]="visitCategory" + (click)="trackFieldInteraction('General OPD Diagnosis Component')" > diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.ts index e52388af..296768ef 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.ts @@ -23,6 +23,7 @@ import { Component, OnInit, Input, DoCheck } from '@angular/core'; import { FormGroup } from '@angular/forms'; import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service'; import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-diagnosis', @@ -40,7 +41,10 @@ export class DiagnosisComponent implements OnInit, DoCheck { caseRecordMode!: string; current_language_set: any; - constructor(public httpServiceService: HttpServiceService) {} + constructor( + public httpServiceService: HttpServiceService, + private trackingService: AmritTrackingService, + ) {} ngOnInit() { this.assignSelectedLanguage(); @@ -54,4 +58,12 @@ export class DiagnosisComponent implements OnInit, DoCheck { getLanguageJson.setLanguage(); this.current_language_set = getLanguageJson.currentLanguageObject; } + + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction(fieldName, 'Diagnosis'); + } catch (error) { + console.error(`❌ Error tracking diagnosis ${fieldName}:`, error); + } + } } diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.html index f795bf4f..f8348a9f 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.html @@ -11,6 +11,7 @@ mat-table [dataSource]="dataSource" aria-describedby="chiefComplaintDetails" + (click)="trackFieldInteraction('View Chief Complaints Table')" >
    		{{ current_language_set?.nurseData?.chiefComplaintsDetails @@ -35,6 +37,7 @@ style="border-bottom: none" *matHeaderCellDef mat-sort-header + (click)="trackFieldInteraction('Sort Duration')" > {{ current_language_set?.nurseData?.chiefComplaintsDetails?.duration @@ -51,6 +54,7 @@ style="border-bottom: none" *matHeaderCellDef mat-sort-header + (click)="trackFieldInteraction('Sort Unit of Duration')" > {{ current_language_set?.nurseData?.chiefComplaintsDetails @@ -80,6 +84,7 @@ style="border-bottom: none" *matHeaderCellDef mat-sort-header + (click)="trackFieldInteraction('Sort Description')" > {{ current_language_set?.nurseData?.chiefComplaintsDetails?.description @@ -135,6 +140,7 @@ #complaintType (keyup)="suggestChiefComplaintList(complaint, i)" [matAutocomplete]="auto" + (focus)="trackFieldInteraction('Chief Complaint Input')" /> @@ -142,7 +148,9 @@ #auto="matAutocomplete" [displayWith]="displayChiefComplaint" (optionSelected)=" - filterComplaints($event, i); getSCTid($event, i) + filterComplaints($event, i); + getSCTid($event, i); + trackFieldInteraction('Chief Complaint Selection') " > @@ -184,6 +193,9 @@ formControlName="unitOfDuration" [disabled]="!complaint.value.duration" (change)="validateDuration(complaint)" + (selectionChange)=" + trackFieldInteraction('Unit of Duration Selection') + " > Hour(s) Day(s) @@ -207,6 +219,7 @@ name="description" [disabled]="!complaint.value.chiefComplaint" formControlName="description" + (focus)="trackFieldInteraction('Chief Complaint Description')" > @@ -219,7 +232,10 @@ [id]="'addBtn' + i" *ngIf="isLast" [disabled]="checkComplaintFormValidity(complaint)" - (click)="addChiefComplaint()" + (click)=" + addChiefComplaint(); + trackFieldInteraction('Add Chief Complaint') + " color="primary" class="mat-add-btn" > @@ -229,7 +245,10 @@ mat-mini-fab [id]="'removeBtn' + i" *ngIf="i !== 0 || (i === 0 && complaint.touched)" - (click)="removeChiefComplaint(i, complaint)" + (click)=" + removeChiefComplaint(i, complaint); + trackFieldInteraction('Remove Chief Complaint') + " color="warn" style="margin-right: 15px; margin-top: 25px !important" class="mat-remove-btn" @@ -270,6 +289,7 @@ [previousSelected]=" generalFindingsForm.value.clinicalObservationsList " + (focus)="trackFieldInteraction('Clinical Observations Input')" /> search @@ -291,7 +314,10 @@ color="primary" *ngIf="isLast" [disabled]="validateAddedObservations(observations)" - (click)="addObservations()" + (click)=" + addObservations(); + trackFieldInteraction('Add Clinical Observation') + " class="mat-add-btn" > {{ current_language_set?.common?.add }} @@ -310,7 +336,10 @@ generalFindingsForm.get('clinicalObservationsList')?.value .clinicalObservationsProvided !== '') " - (click)="removeObservationsFromList(i, observations)" + (click)=" + removeObservationsFromList(i, observations); + trackFieldInteraction('Remove Clinical Observation') + " > {{ current_language_set?.common?.remove }} @@ -354,6 +383,7 @@ .significantFindingsProvided ) " + (focus)="trackFieldInteraction('Significant Findings Input')" /> search @@ -376,7 +407,10 @@ color="primary" *ngIf="isLast" [disabled]="validateAddedFindings(findings)" - (click)="addFindings()" + (click)=" + addFindings(); + trackFieldInteraction('Add Significant Finding') + " class="mat-add-btn" > {{ current_language_set?.common?.add }} @@ -395,7 +429,10 @@ generalFindingsForm.get('significantFindingsList')?.value .significantFindingsProvided !== '') " - (click)="removeFindingsFromList(i, findings)" + (click)=" + removeFindingsFromList(i, findings); + trackFieldInteraction('Remove Significant Finding') + " > {{ current_language_set?.common?.remove }} @@ -419,6 +456,7 @@ maxlength="300" name="otherSymptoms" formControlName="otherSymptoms" + (focus)="trackFieldInteraction('Other Symptoms')" > @@ -432,6 +470,7 @@ checked="checked" formControlName="isForHistory" [value]="'true'" + (change)="trackFieldInteraction('Show Findings on Next Visit')" >{{ current_language_set?.Find?.showThisFindingsOnNextVisit }} Date: Sun, 6 Jul 2025 20:04:34 +0530 Subject: [PATCH 18/87] feat(tracking): added tracking to investigations component --- .../investigations/investigations.component.html | 2 +- .../investigations/investigations.component.ts | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.html b/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.html index dcf8766b..ab6a5a3f 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.html +++ b/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.html @@ -9,7 +9,7 @@ multiple name="laboratoryList" formControlName="laboratoryList" - (selectionChange)="checkTestName($event)" + (selectionChange)="checkTestName($event); trackFieldInteraction('Laboratory Tests Selection')" > Date: Sun, 6 Jul 2025 20:16:15 +0530 Subject: [PATCH 19/87] feat(tracking): added tracking to prescription --- .../prescription/prescription.component.html | 44 +++++++++++++++---- .../prescription/prescription.component.ts | 10 +++++ 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.html index e0b19ea1..fe8657ef 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.html @@ -13,7 +13,10 @@ mat-raised-button color="primary" class="pull-right" - (click)="loadMMUPrescription()" + (click)=" + loadMMUPrescription(); + trackFieldInteraction('Load MMU Prescription') + " > {{ current_language_set?.loadMMUPrescription }} @@ -63,7 +66,10 @@ class="input-full-width" name="form" [(ngModel)]="currentPrescription.formName" - (selectionChange)="getFormValueChanged()" + (selectionChange)=" + getFormValueChanged(); + trackFieldInteraction('Medicine Form Selection') + " required > @@ -101,7 +108,10 @@ {{ item.itemName }} {{ item.strength }}{{ item.unitOfMeasurement }} {{ item.quantityInHand ? "(" + item.quantityInHand + ")" : "" }} @@ -118,6 +128,7 @@ name="dose" [(ngModel)]="currentPrescription.dose" [disabled]="!currentPrescription.drugID" + (selectionChange)="trackFieldInteraction('Dosage Selection')" required > @@ -181,6 +194,7 @@ name="unit" [(ngModel)]="currentPrescription.unit" [disabled]="!currentPrescription.drugID" + (selectionChange)="trackFieldInteraction('Unit Selection')" [required]="prescriptionForm.value.frequency !== 'SOS'" > @@ -282,7 +299,7 @@ class="mat_green" color="primary" type="button" - (click)="submitForUpload()" + (click)="submitForUpload(); trackFieldInteraction('Add Medicine')" > {{ current_language_set?.common?.add }} @@ -400,7 +417,10 @@ @@ -49,7 +52,10 @@
    {{ currentLanguageSet?.Referdetails?.revisitAndRefer }}
    id="PreviousReferralHistory" class="mat_icon_blue" color="primary" - (click)="getPreviousReferralHistory()" + (click)=" + getPreviousReferralHistory(); + trackFieldInteraction('Previous Referral History') + " > history @@ -69,10 +75,18 @@
    {{ currentLanguageSet?.Referdetails?.revisitAndRefer }}
    }} - Select None {{ currentLanguageSet?.Referdetails?.revisitAndRefer }} allowText="alphaspace" formControlName="otherReferredToInstituteName" name="otherReferredToInstituteName" + (focus)="trackFieldInteraction('Other Healthcare Center Input')" /> @@ -138,6 +153,7 @@
    {{ currentLanguageSet?.Referdetails?.revisitAndRefer }}
    formControlName="referralReason" name="Remarks" maxLength="300" + (focus)="trackFieldInteraction('Referral Reason Text')" > @@ -152,6 +168,7 @@
    {{ currentLanguageSet?.Referdetails?.revisitAndRefer }}
    formControlName="referralReason" name="Remarks" maxLength="300" + (focus)="trackFieldInteraction('Referral Reason Text')" > @@ -193,7 +210,8 @@
    {{ currentLanguageSet?.Referdetails?.revisitAndRefer }}
    (selectionChange)=" checkForOthersOption( referForm.controls['referralReasonList'].value - ) + ); + trackFieldInteraction('Referral Reason Selection') " required > @@ -216,7 +234,8 @@
    {{ currentLanguageSet?.Referdetails?.revisitAndRefer }}
    (selectionChange)=" checkForOthersOption( referForm.controls['referralReasonList'].value - ) + ); + trackFieldInteraction('Referral Reason Selection') " > {{ currentLanguageSet?.Referdetails?.revisitAndRefer }} allowText="alphaspace" formControlName="otherReferralReason" name="otherReferralReason" + (focus)="trackFieldInteraction('Other Referral Reason Input')" /> -
    {{ currentLanguageSet?.Referdetails?.revisitAndRefer }} currentLanguageSet?.Referdetails?.additionalservices }} {{ currentLanguageSet?.Referdetails?.revisitAndRefer }}
    -
    {{ currentLanguageSet?.Referdetails?.revisitAndRefer }} formControlName="revisitDate" [min]="tomorrow" (dateChange)="checkdate($event.value)" + (focus)="trackFieldInteraction('Revisit Date')" /> diff --git a/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.ts b/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.ts index 6ed14fc5..1238da12 100644 --- a/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.ts +++ b/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.ts @@ -45,6 +45,7 @@ import { MAT_MOMENT_DATE_ADAPTER_OPTIONS, } from '@angular/material-moment-adapter'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-general-refer', @@ -125,6 +126,7 @@ export class GeneralReferComponent implements OnInit, DoCheck, OnDestroy { private confirmationService: ConfirmationService, private ncdScreeningService: NcdScreeningService, readonly sessionstorage: SessionStorageService, + private trackingService: AmritTrackingService, ) {} ngOnInit() { @@ -600,4 +602,12 @@ export class GeneralReferComponent implements OnInit, DoCheck, OnDestroy { this.referForm.controls['otherReferralReason'].setValue(null); } } + + trackFieldInteraction(fieldName: string) { + try { + this.trackingService.trackFieldInteraction(fieldName, 'Refer & Revisit'); + } catch (error) { + console.error(`❌ Error tracking refer & revisit ${fieldName}:`, error); + } + } } From 17258788f0c183b3a61ff0b361f40f5be12c9d37 Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Sun, 6 Jul 2025 20:30:52 +0530 Subject: [PATCH 21/87] fix(tracking): fixed correct naming of tracking component --- .../previous-visit-details/previous-visit-details.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.ts index 672da498..26b3a215 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.ts @@ -361,7 +361,7 @@ export class PreviousVisitDetailsComponent try { this.trackingService.trackFieldInteraction( fieldName, - 'Central Nervous System', + 'Previous Visit Details', ); } catch (error) { console.error( From d22c9fd10c35eee5638b3e7b908a34cf70b3fbf6 Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Wed, 9 Jul 2025 13:16:49 +0530 Subject: [PATCH 22/87] feat(tracking): updated environment files for tracking (added tracking variables) --- scripts/ci-prebuild.js | 4 ++++ src/app/app.component.ts | 2 ++ src/environments/environment.ci.ts.template | 10 ++++++++++ src/environments/environment.dev.ts | 8 ++++++++ src/environments/environment.development.ts | 8 ++++++++ src/environments/environment.local.ts | 8 ++++++++ src/environments/environment.prod.ts | 8 ++++++++ src/environments/environment.test.ts | 8 ++++++++ 8 files changed, 56 insertions(+) diff --git a/scripts/ci-prebuild.js b/scripts/ci-prebuild.js index 53af2b50..e2d92abb 100755 --- a/scripts/ci-prebuild.js +++ b/scripts/ci-prebuild.js @@ -58,6 +58,10 @@ const defaultEnvValues = { SITE_KEY: '', CAPTCHA_CHALLENGE_URL: '', ENABLE_CAPTCHA: false, + SITE_ID: '1', + TRACKER_URL: '//matomo.pirmalswasthya.org/', + TRACKING_PLATFORM: 'matomo', + TRACKING_ENABLED: 'true', }; // Generate output data diff --git a/src/app/app.component.ts b/src/app/app.component.ts index fb0915e5..5be6bce8 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { SpinnerService } from './app-modules/core/services/spinner.service'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-root', @@ -13,6 +14,7 @@ export class AppComponent implements OnInit { constructor( private router: Router, private spinnerService: SpinnerService, + private trackingService: AmritTrackingService, ) {} ngOnInit() { diff --git a/src/environments/environment.ci.ts.template b/src/environments/environment.ci.ts.template index 6c0a6834..daf279d8 100644 --- a/src/environments/environment.ci.ts.template +++ b/src/environments/environment.ci.ts.template @@ -53,6 +53,16 @@ export const environment = { production: true, app: `MMU`, encKey: sessionStorageEncKey, + + tracking: { + platform: 'matomo', + siteId: parseInt('<%= SITE_ID %>'), + trackerUrl: '<%= TRACKER_URL %>', + trackingPlatform: '<%= TRACKING_PLATFORM %>', + enabled: '<%= TRACKING_ENABLED %>' === 'true' + }, + + RBSTest: `RBS Test`, visualAcuityTest: `Visual Acuity Test`, haemoglobinTest: `Hemoglobin Test`, diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts index 83998f99..f7ea9c5c 100644 --- a/src/environments/environment.dev.ts +++ b/src/environments/environment.dev.ts @@ -69,6 +69,14 @@ export const environment = { production: false, encKey: sessionStorageEncKey, + tracking: { + platform: 'matomo', + siteId: 1, + trackerUrl: '//127.0.0.1/', + trackingPlatform: 'development', + enabled: true, + }, + app: `MMU`, RBSTest: `RBS Test`, visualAcuityTest: `Visual Acuity Test`, diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts index f489f9e5..b096b0fa 100644 --- a/src/environments/environment.development.ts +++ b/src/environments/environment.development.ts @@ -70,6 +70,14 @@ export const environment = { production: false, encKey: sessionStorageEncKey, + tracking: { + platform: 'matomo', + siteId: 1, + trackerUrl: '//127.0.0.1/', + trackingPlatform: 'development', + enabled: true, + }, + app: `MMU`, RBSTest: `RBS Test`, visualAcuityTest: `Visual Acuity Test`, diff --git a/src/environments/environment.local.ts b/src/environments/environment.local.ts index bc67f400..31b6d6f0 100644 --- a/src/environments/environment.local.ts +++ b/src/environments/environment.local.ts @@ -70,6 +70,14 @@ export const environment = { production: false, encKey: sessionStorageEncKey, + tracking: { + platform: 'matomo', + siteId: 1, + trackerUrl: '//127.0.0.1/', + trackingPlatform: 'local', + enabled: true, + }, + app: `MMU`, RBSTest: `RBS Test`, visualAcuityTest: `Visual Acuity Test`, diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index cc914700..ac348ec8 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -70,6 +70,14 @@ export const environment = { production: true, encKey: sessionStorageEncKey, + tracking: { + platform: 'matomo', + siteId: 1, + trackerUrl: '//matomo.piramalswasthya.org/', + trackingPlatform: 'production', + enabled: true, + }, + app: `MMU`, RBSTest: `RBS Test`, visualAcuityTest: `Visual Acuity Test`, diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index f489f9e5..ecfc00fd 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -70,6 +70,14 @@ export const environment = { production: false, encKey: sessionStorageEncKey, + tracking: { + platform: 'matomo', + siteId: 1, + trackerUrl: '//127.0.0.1/', + trackingPlatform: 'test', + enabled: true, + }, + app: `MMU`, RBSTest: `RBS Test`, visualAcuityTest: `Visual Acuity Test`, From 101baf4ae52d836dcdb8d1317a1f6fbdcd4cb948 Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Wed, 9 Jul 2025 13:21:19 +0530 Subject: [PATCH 23/87] fix: corrected domain name --- scripts/ci-prebuild.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci-prebuild.js b/scripts/ci-prebuild.js index e2d92abb..2ed970ca 100755 --- a/scripts/ci-prebuild.js +++ b/scripts/ci-prebuild.js @@ -59,7 +59,7 @@ const defaultEnvValues = { CAPTCHA_CHALLENGE_URL: '', ENABLE_CAPTCHA: false, SITE_ID: '1', - TRACKER_URL: '//matomo.pirmalswasthya.org/', + TRACKER_URL: '//matomo.piramalswasthya.org/', TRACKING_PLATFORM: 'matomo', TRACKING_ENABLED: 'true', }; From 8a507c705a16ef887f10fd135d26f27c8c3e60d9 Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Wed, 9 Jul 2025 17:39:18 +0530 Subject: [PATCH 24/87] perf(tracking): remove error handeling from ts files and Added at service side(Common UI) --- .../app-header/app-header.component.html | 6 +++--- .../components/app-header/app-header.component.ts | 10 ++++------ .../diagnosis/diagnosis.component.ts | 6 +----- .../findings/findings.component.ts | 6 +----- .../prescription/prescription.component.ts | 6 +----- .../previous-significiant-findings.component.ts | 15 ++++----------- .../previous-visit-details.component.ts | 15 ++++----------- .../general-examination.component.ts | 15 ++++----------- .../head-to-toe-examination.component.ts | 15 ++++----------- .../cardio-vascular-system.component.ts | 15 ++++----------- .../central-nervous-system.component.ts | 15 ++++----------- .../genito-urinary-system.component.ts | 15 ++++----------- .../musculoskeletal-system.component.ts | 15 ++++----------- .../obstetric-examination.component.ts | 15 ++++----------- .../respiratory-system.component.ts | 12 +----------- ...comorbidity-concurrent-conditions.component.ts | 6 +----- .../family-history/family-history.component.ts | 6 +----- .../medication-history.component.ts | 12 +----------- .../menstrual-history.component.ts | 9 +-------- .../past-history/past-history.component.ts | 6 +----- .../past-obsteric-history.component.ts | 15 ++++----------- .../personal-history.component.ts | 6 +----- .../general-refer/general-refer.component.ts | 6 +----- .../chief-complaints.component.ts | 2 +- .../investigations/investigations.component.ts | 6 +----- .../upload-files/upload-files.component.ts | 2 +- .../visit-details/visit-details.component.ts | 2 +- .../general-patient-vitals.component.ts | 6 +----- 28 files changed, 63 insertions(+), 202 deletions(-) diff --git a/src/app/app-modules/core/components/app-header/app-header.component.html b/src/app/app-modules/core/components/app-header/app-header.component.html index e10af027..0319218b 100644 --- a/src/app/app-modules/core/components/app-header/app-header.component.html +++ b/src/app/app-modules/core/components/app-header/app-header.component.html @@ -180,7 +180,7 @@ [routerLink]="[item.work[1].link]" routerLinkActive="active" [ngClass]="{ active: updateCSSToShowActiveRegistrar }" - (click)="trackRoleButtonClick('Registrar')" + (click)="trackFieldInteraction('Role_Registrar')" > {{ item.work[1].label }} @@ -196,7 +196,7 @@ mat-button [routerLink]="[item.link]" routerLinkActive="active" - (click)="trackRoleButtonClick(item.role)" + (click)="trackFieldInteraction('Role_' + item.role)" > {{ item.label }} @@ -206,7 +206,7 @@ class="nav-btn" mat-button [matMenuTriggerFor]="TCitems" - (click)="trackRoleButtonClick('TC Specialist')" + (click)="trackFieldInteraction('Role_TC Specialist')" > {{ item.label }} diff --git a/src/app/app-modules/core/components/app-header/app-header.component.ts b/src/app/app-modules/core/components/app-header/app-header.component.ts index f9166e1d..1f4d456f 100644 --- a/src/app/app-modules/core/components/app-header/app-header.component.ts +++ b/src/app/app-modules/core/components/app-header/app-header.component.ts @@ -36,7 +36,7 @@ import { IotService } from '../../services/iot.service'; import { MatDialog } from '@angular/material/dialog'; import { environment } from 'src/environments/environment'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; -import { AmritTrackingService } from 'Common-UI/src/tracking'; // Add this import +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-header', @@ -75,7 +75,7 @@ export class AppHeaderComponent implements OnInit, AfterContentChecked { private dialog: MatDialog, public service: IotService, readonly sessionstorage: SessionStorageService, - private trackingService: AmritTrackingService, // Add this injection + private trackingService: AmritTrackingService, ) {} ngOnInit() { @@ -333,9 +333,7 @@ export class AppHeaderComponent implements OnInit, AfterContentChecked { }); } - trackRoleButtonClick(roleName: string) { - this.trackingService.trackButtonClick(`Role_${roleName}`); - // You can also use the more generic event tracking if you prefer: - // this.trackingService.trackEvent('Navigation', 'RoleButtonClick', roleName); + trackFieldInteraction(fieldName: string) { + this.trackingService.trackFieldInteraction(fieldName, 'Roles'); } } diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.ts index 296768ef..9ff9a874 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/diagnosis.component.ts @@ -60,10 +60,6 @@ export class DiagnosisComponent implements OnInit, DoCheck { } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction(fieldName, 'Diagnosis'); - } catch (error) { - console.error(`❌ Error tracking diagnosis ${fieldName}:`, error); - } + this.trackingService.trackFieldInteraction(fieldName, 'Diagnosis'); } } diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.ts index 2ea5234d..094b8a87 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.ts @@ -125,11 +125,7 @@ export class FindingsComponent implements OnInit, DoCheck, OnDestroy { } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction(fieldName, 'Findings'); - } catch (error) { - console.error(`❌ Error tracking findings ${fieldName}:`, error); - } + this.trackingService.trackFieldInteraction(fieldName, 'Findings'); } getComplaints(): AbstractControl[] | null { diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.ts index 3fbfc309..88ffbeeb 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/prescription/prescription.component.ts @@ -665,10 +665,6 @@ export class PrescriptionComponent implements OnInit, DoCheck, OnDestroy { } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction(fieldName, 'Prescription'); - } catch (error) { - console.error(`❌ Error tracking prescription ${fieldName}:`, error); - } + this.trackingService.trackFieldInteraction(fieldName, 'Prescription'); } } diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.ts index d830fcc0..cb8d63e9 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-significiant-findings/previous-significiant-findings.component.ts @@ -141,16 +141,9 @@ export class PreviousSignificiantFindingsComponent } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction( - fieldName, - 'Central Nervous System', - ); - } catch (error) { - console.error( - `❌ Error tracking central nervous system ${fieldName}:`, - error, - ); - } + this.trackingService.trackFieldInteraction( + fieldName, + 'Previous Significant Findings', + ); } } diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.ts index 26b3a215..b3bfd722 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/previous-visit-details/previous-visit-details.component.ts @@ -358,16 +358,9 @@ export class PreviousVisitDetailsComponent } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction( - fieldName, - 'Previous Visit Details', - ); - } catch (error) { - console.error( - `❌ Error tracking central nervous system ${fieldName}:`, - error, - ); - } + this.trackingService.trackFieldInteraction( + fieldName, + 'Previous Visit Details', + ); } } diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.ts index 1828630f..d5cccf13 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.ts +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.ts @@ -288,16 +288,9 @@ export class GeneralExaminationComponent implements OnInit, DoCheck, OnChanges { } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction( - fieldName, - 'General Examination', - ); - } catch (error) { - console.error( - `❌ Error tracking general examination ${fieldName}:`, - error, - ); - } + this.trackingService.trackFieldInteraction( + fieldName, + 'General Examination', + ); } } diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.ts index 1bf8a66e..79d0747a 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.ts +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/head-to-toe-examination/head-to-toe-examination.component.ts @@ -123,16 +123,9 @@ export class HeadToToeExaminationComponent implements OnInit, DoCheck { } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction( - fieldName, - 'Head to Toe Examination', - ); - } catch (error) { - console.error( - `❌ Error tracking head to toe examination ${fieldName}:`, - error, - ); - } + this.trackingService.trackFieldInteraction( + fieldName, + 'Head to Toe Examination', + ); } } diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.ts index 94d298d0..7c6053e2 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.ts +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/cardio-vascular-system/cardio-vascular-system.component.ts @@ -53,16 +53,9 @@ export class CardioVascularSystemComponent implements OnInit, DoCheck { } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction( - fieldName, - 'Cardiovascular System', - ); - } catch (error) { - console.error( - `❌ Error tracking cardiovascular system ${fieldName}:`, - error, - ); - } + this.trackingService.trackFieldInteraction( + fieldName, + 'Cardiovascular System', + ); } } diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.ts index 0cde482a..e0c5c134 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.ts +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/central-nervous-system/central-nervous-system.component.ts @@ -69,16 +69,9 @@ export class CentralNervousSystemComponent implements OnInit, DoCheck { } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction( - fieldName, - 'Central Nervous System', - ); - } catch (error) { - console.error( - `❌ Error tracking central nervous system ${fieldName}:`, - error, - ); - } + this.trackingService.trackFieldInteraction( + fieldName, + 'Central Nervous System', + ); } } diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.ts index 04eb0538..4a825216 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.ts +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/genito-urinary-system/genito-urinary-system.component.ts @@ -54,16 +54,9 @@ export class GenitoUrinarySystemComponent implements OnInit, DoCheck { } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction( - fieldName, - 'Genitourinary System', - ); - } catch (error) { - console.error( - `❌ Error tracking genitourinary system ${fieldName}:`, - error, - ); - } + this.trackingService.trackFieldInteraction( + fieldName, + 'Genitourinary System', + ); } } diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.ts index 2263fcd5..4186f42a 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.ts +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/musculoskeletal-system/musculoskeletal-system.component.ts @@ -176,16 +176,9 @@ export class MusculoskeletalSystemComponent } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction( - fieldName, - 'Musculoskeletal System', - ); - } catch (error) { - console.error( - `❌ Error tracking musculoskeletal system ${fieldName}:`, - error, - ); - } + this.trackingService.trackFieldInteraction( + fieldName, + 'Musculoskeletal System', + ); } } diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.ts index 2a1b6188..58200d7d 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.ts +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/obstetric-examination/obstetric-examination.component.ts @@ -506,16 +506,9 @@ export class ObstetricExaminationComponent /*END*/ trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction( - fieldName, - 'Obstetric Examination', - ); - } catch (error) { - console.error( - `❌ Error tracking obstetric examination ${fieldName}:`, - error, - ); - } + this.trackingService.trackFieldInteraction( + fieldName, + 'Obstetric Examination', + ); } } diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.ts b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.ts index 7efbb1e5..b3c56c08 100644 --- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.ts +++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/systemic-examination/respiratory-system/respiratory-system.component.ts @@ -104,16 +104,6 @@ export class RespiratorySystemComponent implements OnInit, DoCheck { } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction( - fieldName, - 'Respiratory System', - ); - } catch (error) { - console.error( - `❌ Error tracking respiratory system ${fieldName}:`, - error, - ); - } + this.trackingService.trackFieldInteraction(fieldName, 'Respiratory System'); } } diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.ts index d49c11c0..d8f92aa7 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.ts +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/comorbidity-concurrent-conditions/comorbidity-concurrent-conditions.component.ts @@ -566,10 +566,6 @@ export class ComorbidityConcurrentConditionsComponent } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction(fieldName, 'Comorbidity'); - } catch (error) { - console.error(`❌ Error tracking comorbidity ${fieldName}:`, error); - } + this.trackingService.trackFieldInteraction(fieldName, 'Comorbidity'); } } diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.ts index 4ae3b54b..e1a629c6 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.ts +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history/family-history.component.ts @@ -416,10 +416,6 @@ export class FamilyHistoryComponent implements OnInit, DoCheck, OnDestroy { } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction(fieldName, 'Family History'); - } catch (error) { - console.error(`❌ Error tracking family history ${fieldName}:`, error); - } + this.trackingService.trackFieldInteraction(fieldName, 'Family History'); } } diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.ts index 378f4e40..7e423f85 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.ts +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/medication-history/medication-history.component.ts @@ -333,16 +333,6 @@ export class MedicationHistoryComponent implements OnInit, DoCheck, OnDestroy { } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction( - fieldName, - 'Medication History', - ); - } catch (error) { - console.error( - `❌ Error tracking medication history ${fieldName}:`, - error, - ); - } + this.trackingService.trackFieldInteraction(fieldName, 'Medication History'); } } diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.ts index b522b956..0dea3dfb 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.ts +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.ts @@ -320,13 +320,6 @@ export class MenstrualHistoryComponent implements OnInit, DoCheck, OnDestroy { } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction( - fieldName, - 'Menstrual History', - ); - } catch (error) { - console.error(`❌ Error tracking menstrual history ${fieldName}:`, error); - } + this.trackingService.trackFieldInteraction(fieldName, 'Menstrual History'); } } diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.ts index f02dd87f..b9271b8b 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.ts +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-history/past-history.component.ts @@ -758,10 +758,6 @@ export class PastHistoryComponent } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction(fieldName, 'Past History'); - } catch (error) { - console.error(`❌ Error tracking past history ${fieldName}:`, error); - } + this.trackingService.trackFieldInteraction(fieldName, 'Past History'); } } diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.ts index 6f661fb1..478ea142 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.ts +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/past-obsteric-history/past-obsteric-history.component.ts @@ -821,16 +821,9 @@ export class PastObstericHistoryComponent } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction( - fieldName, - 'Past Obstetric History', - ); - } catch (error) { - console.error( - `❌ Error tracking past obstetric history ${fieldName}:`, - error, - ); - } + this.trackingService.trackFieldInteraction( + fieldName, + 'Past Obstetric History', + ); } } diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.ts index 3f461640..0d425be9 100644 --- a/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.ts +++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/personal-history/personal-history.component.ts @@ -1204,10 +1204,6 @@ export class GeneralPersonalHistoryComponent } } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction(fieldName, 'Personal History'); - } catch (error) { - console.error(`❌ Error tracking personal history ${fieldName}:`, error); - } + this.trackingService.trackFieldInteraction(fieldName, 'Personal History'); } } diff --git a/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.ts b/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.ts index 1238da12..faf0c3ba 100644 --- a/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.ts +++ b/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.ts @@ -604,10 +604,6 @@ export class GeneralReferComponent implements OnInit, DoCheck, OnDestroy { } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction(fieldName, 'Refer & Revisit'); - } catch (error) { - console.error(`❌ Error tracking refer & revisit ${fieldName}:`, error); - } + this.trackingService.trackFieldInteraction(fieldName, 'Refer & Revisit'); } } diff --git a/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.ts b/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.ts index a1d31691..89b9a443 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.ts +++ b/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.ts @@ -569,6 +569,6 @@ export class ChiefComplaintsComponent implements OnInit, DoCheck, OnDestroy { } trackFieldInteraction(fieldName: string) { - this.trackingService.trackFieldInteraction(fieldName, 'Visit Details'); + this.trackingService.trackFieldInteraction(fieldName, 'Chief Complaints'); } } diff --git a/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.ts b/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.ts index c5010653..a68ecbf9 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.ts +++ b/src/app/app-modules/nurse-doctor/visit-details/investigations/investigations.component.ts @@ -227,10 +227,6 @@ export class InvestigationsComponent implements OnInit, DoCheck, OnDestroy { } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction(fieldName, 'Investigations'); - } catch (error) { - console.error(`❌ Error tracking investigations ${fieldName}:`, error); - } + this.trackingService.trackFieldInteraction(fieldName, 'Investigations'); } } diff --git a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts index 71530ae5..9111944d 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts +++ b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts @@ -366,6 +366,6 @@ export class UploadFilesComponent implements OnChanges, OnInit, DoCheck { } } trackFieldInteraction(fieldName: string) { - this.trackingService.trackFieldInteraction(fieldName, 'Visit Details'); + this.trackingService.trackFieldInteraction(fieldName, 'Upload Files'); } } diff --git a/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.ts b/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.ts index be60c872..e8cbcca6 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.ts +++ b/src/app/app-modules/nurse-doctor/visit-details/visit-details/visit-details.component.ts @@ -847,6 +847,6 @@ export class PatientVisitDetailsComponent } trackFieldInteraction(fieldName: string) { - this.trackingService.trackFieldInteraction(fieldName, 'Registration'); + this.trackingService.trackFieldInteraction(fieldName, 'visit-details'); } } diff --git a/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts b/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts index 7e5f58db..5c8b2310 100644 --- a/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts +++ b/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.ts @@ -1187,10 +1187,6 @@ export class GeneralPatientVitalsComponent } trackFieldInteraction(fieldName: string) { - try { - this.trackingService.trackFieldInteraction(fieldName, 'Vitals'); - } catch (error) { - console.error(`❌ Error tracking vitals ${fieldName}:`, error); - } + this.trackingService.trackFieldInteraction(fieldName, 'Vitals'); } } From f21b90f7d8c10be35cafa758e06c790d5791e2d8 Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Thu, 17 Jul 2025 16:07:31 +0530 Subject: [PATCH 25/87] fix: aam-1725 provisional diagnosis rendering issue fix and performance improvement by n factor --- .../general-opd-diagnosis.component.html | 2 +- .../general-opd-diagnosis.component.ts | 16 +++++++--------- .../ncd-care-diagnosis.component.html | 2 +- .../ncd-care-diagnosis.component.ts | 16 +++++++--------- .../ncd-screening-diagnosis.component.html | 2 +- .../ncd-screening-diagnosis.component.ts | 16 +++++++--------- .../pnc-diagnosis/pnc-diagnosis.component.html | 2 +- .../pnc-diagnosis/pnc-diagnosis.component.ts | 14 ++++++-------- 8 files changed, 31 insertions(+), 39 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 65099e8b..aa8f2a5e 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 @@ -26,7 +26,7 @@
    + *ngFor="let diagnosis of provisionalDiagnosisControls; let i = index; let isLast = last">
    diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts index 87be4106..13bc4b8a 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts @@ -94,13 +94,11 @@ export class GeneralOpdDiagnosisComponent this.current_language_set = getLanguageJson.currentLanguageObject; } - getProvisionalDiagnosisList(): AbstractControl[] | null { - const provisionalDiagnosisListControl = this.generalDiagnosisForm.get( - 'provisionalDiagnosisList', + get provisionalDiagnosisControls(): AbstractControl[] { + return ( + (this.generalDiagnosisForm.get('provisionalDiagnosisList') as FormArray) + ?.controls || [] ); - return provisionalDiagnosisListControl instanceof FormArray - ? provisionalDiagnosisListControl.controls - : null; } get specialistDaignosis() { @@ -203,8 +201,8 @@ export class GeneralOpdDiagnosisComponent (diagnosisArrayList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - if (diagnosisArrayList.length < savedDiagnosisData.length) - this.addDiagnosis(); + // if (diagnosisArrayList.length < savedDiagnosisData.length) + this.addDiagnosis(); } } } @@ -280,7 +278,7 @@ export class GeneralOpdDiagnosisComponent } displayDiagnosis(diagnosis: any): string { - return diagnosis?.term || ''; + return typeof diagnosis === 'string' ? diagnosis : diagnosis?.term || ''; } onDiagnosisSelected(selected: any, index: number) { diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html index df19c075..ae17aa4c 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html @@ -106,7 +106,7 @@

    {{ current_language_set?.casesheet?.provisionalDiag }}

    + *ngFor="let diagnosis of provisionalDiagnosisControls; let i = index; let isLast = last">
    diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts index c5bdd27d..5807d1ef 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts @@ -104,13 +104,11 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck, OnDestroy { this.current_language_set = getLanguageJson.currentLanguageObject; } - getProvisionalDiagnosisList(): AbstractControl[] | null { - const provisionalDiagnosisListControl = this.generalDiagnosisForm.get( - 'provisionalDiagnosisList', + get provisionalDiagnosisControls(): AbstractControl[] { + return ( + (this.generalDiagnosisForm.get('provisionalDiagnosisList') as FormArray) + ?.controls || [] ); - return provisionalDiagnosisListControl instanceof FormArray - ? provisionalDiagnosisListControl.controls - : null; } getDoctorMasterData() { @@ -207,8 +205,8 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck, OnDestroy { (diagnosisArrayList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - if (diagnosisArrayList.length < savedDiagnosisData.length) - this.addDiagnosis(); + // if (diagnosisArrayList.length < savedDiagnosisData.length) + this.addDiagnosis(); } } } @@ -305,7 +303,7 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck, OnDestroy { } displayDiagnosis(diagnosis: any): string { - return diagnosis?.term || ''; + return typeof diagnosis === 'string' ? diagnosis : diagnosis?.term || ''; } onDiagnosisSelected(selected: any, index: number) { diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html index e5420a8b..0c10133d 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html @@ -10,7 +10,7 @@

    + *ngFor="let diagnosis of provisionalDiagnosisControls; let i = index; let isLast = last">
    diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts index 63478c7e..5f4f8446 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts @@ -153,13 +153,11 @@ export class NcdScreeningDiagnosisComponent }); } - getProvisionalDiagnosisList(): AbstractControl[] | null { - const provisionalDiagnosisListControl = this.generalDiagnosisForm.get( - 'provisionalDiagnosisList', + get provisionalDiagnosisControls(): AbstractControl[] { + return ( + (this.generalDiagnosisForm.get('provisionalDiagnosisList') as FormArray) + ?.controls || [] ); - return provisionalDiagnosisListControl instanceof FormArray - ? provisionalDiagnosisListControl.controls - : null; } ngDoCheck() { @@ -342,8 +340,8 @@ export class NcdScreeningDiagnosisComponent (diagnosisArrayList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - if (diagnosisArrayList.length < savedDiagnosisData.length) - this.addDiagnosis(); + //if (diagnosisArrayList.length < savedDiagnosisData.length) + this.addDiagnosis(); } } } @@ -556,7 +554,7 @@ export class NcdScreeningDiagnosisComponent } displayDiagnosis(diagnosis: any): string { - return diagnosis?.term || ''; + return typeof diagnosis === 'string' ? diagnosis : diagnosis?.term || ''; } onDiagnosisSelected(selected: any, index: number) { diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html index cc915855..88408df8 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html @@ -8,7 +8,7 @@

    {{ current_language_set?.casesheet?.provisionalDiag }}

    provisionalDiagnosisList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - if (provisionalDiagnosisList.length < provisionalDiagnosisDataList.length) - this.addProvisionalDiagnosis(); + //if (provisionalDiagnosisList.length < provisionalDiagnosisDataList.length) + this.addProvisionalDiagnosis(); } } From f0e5735b5628687854372ef32086ab026e3c9e8e Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Thu, 17 Jul 2025 20:15:20 +0530 Subject: [PATCH 26/87] fix: amm-1724 removed commented code --- .../general-opd-diagnosis/general-opd-diagnosis.component.ts | 1 - .../diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts | 1 - .../diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts | 1 - 3 files changed, 3 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts index 13bc4b8a..0275a848 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts @@ -201,7 +201,6 @@ export class GeneralOpdDiagnosisComponent (diagnosisArrayList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - // if (diagnosisArrayList.length < savedDiagnosisData.length) this.addDiagnosis(); } } diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts index 5807d1ef..fe64fa8d 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts @@ -205,7 +205,6 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck, OnDestroy { (diagnosisArrayList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - // if (diagnosisArrayList.length < savedDiagnosisData.length) this.addDiagnosis(); } } 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 21f5199f..46fb7fd6 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 @@ -330,7 +330,6 @@ export class PncDiagnosisComponent (provisionalDiagnosisList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - //if (provisionalDiagnosisList.length < provisionalDiagnosisDataList.length) this.addProvisionalDiagnosis(); } } From 0ab27a988e18b80d5bd8af6b8b3cbc1f03c9c1b6 Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Sun, 20 Jul 2025 10:50:53 +0530 Subject: [PATCH 27/87] fix(tracking): added https in the tracking url --- scripts/ci-prebuild.js | 2 +- src/environments/environment.prod.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci-prebuild.js b/scripts/ci-prebuild.js index 2ed970ca..389fe728 100755 --- a/scripts/ci-prebuild.js +++ b/scripts/ci-prebuild.js @@ -59,7 +59,7 @@ const defaultEnvValues = { CAPTCHA_CHALLENGE_URL: '', ENABLE_CAPTCHA: false, SITE_ID: '1', - TRACKER_URL: '//matomo.piramalswasthya.org/', + TRACKER_URL: 'https://matomo.piramalswasthya.org/', TRACKING_PLATFORM: 'matomo', TRACKING_ENABLED: 'true', }; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index ac348ec8..e9a87add 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -73,7 +73,7 @@ export const environment = { tracking: { platform: 'matomo', siteId: 1, - trackerUrl: '//matomo.piramalswasthya.org/', + trackerUrl: 'https://matomo.piramalswasthya.org/', trackingPlatform: 'production', enabled: true, }, From 0ef04e1cd7422a813e9f5815144581e63321cfed Mon Sep 17 00:00:00 2001 From: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Date: Mon, 21 Jul 2025 11:57:35 +0530 Subject: [PATCH 28/87] Update version in pom.xml to 3.4.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e93a64ef..e08c6ea7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.iemr.aam-ui aam-ui - 3.1.0 + 3.4.0 AAM-UI Piramal - AAM: Module ui war @@ -95,7 +95,7 @@ org.codehaus.mojo exec-maven-plugin - 3.1.0 + 3.4.0 npm-install @@ -170,7 +170,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.4.0 properties-updated From 199184854cfadbd6506b13b5507ebf793d4a82c9 Mon Sep 17 00:00:00 2001 From: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Date: Mon, 21 Jul 2025 15:44:28 +0530 Subject: [PATCH 29/87] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e08c6ea7..0f8898ab 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ org.codehaus.mojo exec-maven-plugin - 3.4.0 + 3.1.0 npm-install @@ -170,7 +170,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.4.0 + 3.1.0 properties-updated From d21a3901345cfc38946809d0c1c98e703a111597 Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Fri, 25 Jul 2025 16:58:26 +0530 Subject: [PATCH 30/87] fix: amm-1725 provisonal diagnosis in quick consult issue fix --- .../nurse-doctor/quick-consult/quick-consult.component.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 a88b5a2b..79de333d 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 @@ -680,8 +680,7 @@ export class QuickConsultComponent (diagnosisArrayList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - if (diagnosisArrayList.length < savedDiagnosisData.length) - this.addDiagnosis(); + this.addDiagnosis(); } } this.patchPrescriptionDetails(response.prescription); @@ -1372,7 +1371,7 @@ export class QuickConsultComponent } displayDiagnosis(diagnosis: any): string { - return diagnosis?.term || ''; + return typeof diagnosis === 'string' ? diagnosis : diagnosis?.term || ''; } onDiagnosisSelected(selected: any, index: number) { From 6b06aa231ee8f82cfd0f17c2c0214840a4a52664 Mon Sep 17 00:00:00 2001 From: Helen Grace Karyamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Date: Fri, 25 Jul 2025 17:29:16 +0530 Subject: [PATCH 31/87] Display HRP-marked Beneficiaries in Red for Easy Identification (#162) * fix(bug): default abdm facilityId not saving issue * feat: added righ risk patients from flw to nurse worklist --------- Co-authored-by: Karyamsetty Helen Grace --- .../nurse-worklist/nurse-worklist.component.css | 15 +++++++++++++++ .../nurse-worklist/nurse-worklist.component.html | 11 ++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.css b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.css index 216cea83..601d6ac8 100644 --- a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.css +++ b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.css @@ -33,6 +33,16 @@ md-input-container { text-align: center; } +.visitStatus.high-risk::before { + content: ""; + position: absolute; + left: 0; + top: 0; + bottom: 1px; + width: 4px; + background: #FF0000 !important; +} + .visitStatus.first-visit::before { content: ""; position: absolute; @@ -84,6 +94,11 @@ ul li div { } +.high-risk-marker { + background: #FF0000; + margin-right: 5px !important; +} + .totalCount, .description { padding-top: 15px; diff --git a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.html b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.html index 8ee6187b..c5ae47d5 100644 --- a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.html +++ b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.html @@ -62,9 +62,10 @@ mat-cell *matCellDef="let element" [ngClass]="{ - visitStatus: true, - 'first-visit': element?.benVisitNo === 1, - revisit: element?.benVisitNo !== 1 + 'visitStatus': true, + 'high-risk': element?.is_high_risk === true, + 'first-visit': !element?.is_high_risk && element?.benVisitNo === 1, + 'revisit': !element?.is_high_risk && element?.benVisitNo !== 1 }" > {{ element.sno }} @@ -256,6 +257,10 @@

    {{ currentLanguageSet?.common?.reVisit }}

    +
  • +
    +

    {{ currentLanguageSet?.highRiskPregnancy }}

    +
    • From 4646fc386576a593d5d19936d63e96873a9b35ba Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Wed, 30 Jul 2025 16:40:33 +0530 Subject: [PATCH 32/87] fix: amm-1668 beneficiary details addition --- .../beneficiary-details.component.html | 30 +++++++++++++++++++ src/assets/Assamese.json | 1 + src/assets/English.json | 1 + src/assets/Hindi.json | 1 + 4 files changed, 33 insertions(+) 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 5da6b0b4..7836034a 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 @@ -20,6 +20,36 @@

    {{ beneficiary?.benName }}
    + {{ 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 }} / diff --git a/src/assets/Assamese.json b/src/assets/Assamese.json index d0c18e13..f01d0e95 100644 --- a/src/assets/Assamese.json +++ b/src/assets/Assamese.json @@ -85,6 +85,7 @@ "editLocation": "অৱস্থান সম্পাদনা কৰক", "beneficiaryID": "হিতাধিকাৰী আইডি", "beneficiaryName": "হিতাধিকাৰীৰ নাম", + "lastName": "উপাধী (চাৰন্যেম)", "gender": "লিঙ্গ", "age": "বয়স", "fatherName": "পিতৃৰ নাম", diff --git a/src/assets/English.json b/src/assets/English.json index da2c24a0..da7ad030 100644 --- a/src/assets/English.json +++ b/src/assets/English.json @@ -87,6 +87,7 @@ "editLocation": "Edit Location", "beneficiaryID": "Beneficiary ID", "beneficiaryName": "Beneficiary Name", + "lastName": "Last Name", "gender": "Gender", "age": "Age", "fatherName": "Father's Name", diff --git a/src/assets/Hindi.json b/src/assets/Hindi.json index b44ef009..91b9c49b 100644 --- a/src/assets/Hindi.json +++ b/src/assets/Hindi.json @@ -84,6 +84,7 @@ "editLocation": "स्थान संपादित करें", "beneficiaryID": "लाभार्थी आईडी", "beneficiaryName": "लाभार्थी का नाम", + "lastName": "उपनाम", "gender": "लिंग", "age": "उम्र", "fatherName": "पिता का नाम", From 9de5103e09badc1fcfd369db328e0fbe47a46e3f Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Wed, 13 Aug 2025 15:33:44 +0530 Subject: [PATCH 33/87] fix: amm-1572 added data not found value for languages --- src/assets/Assamese.json | 1 + src/assets/English.json | 1 + src/assets/Hindi.json | 1 + src/assets/Kannada.json | 1 + 4 files changed, 4 insertions(+) diff --git a/src/assets/Assamese.json b/src/assets/Assamese.json index d0c18e13..0e184a77 100644 --- a/src/assets/Assamese.json +++ b/src/assets/Assamese.json @@ -1181,6 +1181,7 @@ }, "alerts": { "info": { + "beneficiaryNotFound": "লাভকাৰীৰ তথ্য পোৱা নগ’ল", "beneficiaryNotArrived": "হিতাধিকাৰীগৰাকী টি.এম. স্পোক/ কেন্দ্ৰত উপস্থিত হোৱা নাই", "scheduledForConsultation": "পৰামর্শৰ বাবে সূচী (চিডিউল ফৰ কনচালটেচন্‌)", "marriageAge": "বিবাহৰ বয়স অতিকমেও বছৰত হ'ব লাগিব", diff --git a/src/assets/English.json b/src/assets/English.json index da2c24a0..327cb96e 100644 --- a/src/assets/English.json +++ b/src/assets/English.json @@ -1190,6 +1190,7 @@ }, "alerts": { "info": { + "beneficiaryNotFound": "Beneficiary data not found", "beneficiaryNotArrived": "Beneficiary has not arrived at TM spoke/center", "scheduledForConsultation": "Scheduled for consultation", "marriageAge": "Marriage age has to be at least", diff --git a/src/assets/Hindi.json b/src/assets/Hindi.json index b44ef009..3522f967 100644 --- a/src/assets/Hindi.json +++ b/src/assets/Hindi.json @@ -1182,6 +1182,7 @@ }, "alerts": { "info": { + "beneficiaryNotFound": "लाभार्थी डेटा नहीं मिला", "confirmtoProceedFurther": "आगे बढ़ने के लिए की पुष्टि करें", "beneficiaryNotArrived": "लाभार्थी टी.एम स्पोक / केंद्र पर नहीं आया है", "scheduledForConsultation": "परामर्श के लिए अनुसूचित किया ", diff --git a/src/assets/Kannada.json b/src/assets/Kannada.json index a7b51eb8..f329c215 100644 --- a/src/assets/Kannada.json +++ b/src/assets/Kannada.json @@ -1189,6 +1189,7 @@ }, "alerts": { "info": { + "beneficiaryNotFound": "ಫಲಾನುಭವಿಯು ಡೇಟಾ ಕಂಡುಬಂದಿಲ್ಲ", "beneficiaryNotArrived": "ಫಲಾನುಭವಿಯು ಟಿಎಂ ಸ್ಪೋಕ್/ಕೇಂದ್ರಕ್ಕೆ ಬಂದಿಲ್ಲ", "scheduledForConsultation": "ಸಮಾಲೋಚನೆಗಾಗಿ ನಿಗದಿಪಡಿಸಲಾಗಿದೆ", "marriageAge": "ಮದುವೆಯ ವಯಸ್ಸು ಕನಿಷ್ಠವಾಗಿರಬೇಕು", From cc4b171da512377f3bf9b65279c66f7c1c0fdd77 Mon Sep 17 00:00:00 2001 From: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Date: Tue, 19 Aug 2025 10:12:00 +0530 Subject: [PATCH 34/87] fix: amm-1572 added data not found value for languages (#169) --- src/assets/Assamese.json | 1 + src/assets/English.json | 1 + src/assets/Hindi.json | 1 + src/assets/Kannada.json | 1 + 4 files changed, 4 insertions(+) diff --git a/src/assets/Assamese.json b/src/assets/Assamese.json index d0c18e13..0e184a77 100644 --- a/src/assets/Assamese.json +++ b/src/assets/Assamese.json @@ -1181,6 +1181,7 @@ }, "alerts": { "info": { + "beneficiaryNotFound": "লাভকাৰীৰ তথ্য পোৱা নগ’ল", "beneficiaryNotArrived": "হিতাধিকাৰীগৰাকী টি.এম. স্পোক/ কেন্দ্ৰত উপস্থিত হোৱা নাই", "scheduledForConsultation": "পৰামর্শৰ বাবে সূচী (চিডিউল ফৰ কনচালটেচন্‌)", "marriageAge": "বিবাহৰ বয়স অতিকমেও বছৰত হ'ব লাগিব", diff --git a/src/assets/English.json b/src/assets/English.json index da2c24a0..327cb96e 100644 --- a/src/assets/English.json +++ b/src/assets/English.json @@ -1190,6 +1190,7 @@ }, "alerts": { "info": { + "beneficiaryNotFound": "Beneficiary data not found", "beneficiaryNotArrived": "Beneficiary has not arrived at TM spoke/center", "scheduledForConsultation": "Scheduled for consultation", "marriageAge": "Marriage age has to be at least", diff --git a/src/assets/Hindi.json b/src/assets/Hindi.json index b44ef009..3522f967 100644 --- a/src/assets/Hindi.json +++ b/src/assets/Hindi.json @@ -1182,6 +1182,7 @@ }, "alerts": { "info": { + "beneficiaryNotFound": "लाभार्थी डेटा नहीं मिला", "confirmtoProceedFurther": "आगे बढ़ने के लिए की पुष्टि करें", "beneficiaryNotArrived": "लाभार्थी टी.एम स्पोक / केंद्र पर नहीं आया है", "scheduledForConsultation": "परामर्श के लिए अनुसूचित किया ", diff --git a/src/assets/Kannada.json b/src/assets/Kannada.json index a7b51eb8..f329c215 100644 --- a/src/assets/Kannada.json +++ b/src/assets/Kannada.json @@ -1189,6 +1189,7 @@ }, "alerts": { "info": { + "beneficiaryNotFound": "ಫಲಾನುಭವಿಯು ಡೇಟಾ ಕಂಡುಬಂದಿಲ್ಲ", "beneficiaryNotArrived": "ಫಲಾನುಭವಿಯು ಟಿಎಂ ಸ್ಪೋಕ್/ಕೇಂದ್ರಕ್ಕೆ ಬಂದಿಲ್ಲ", "scheduledForConsultation": "ಸಮಾಲೋಚನೆಗಾಗಿ ನಿಗದಿಪಡಿಸಲಾಗಿದೆ", "marriageAge": "ಮದುವೆಯ ವಯಸ್ಸು ಕನಿಷ್ಠವಾಗಿರಬೇಕು", From 54ddd77d3feb7dbc8a6aff1813ada33118c9510b Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Tue, 19 Aug 2025 13:38:33 +0530 Subject: [PATCH 35/87] fix: added common-ui to hwc-ui --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index 73567866..c2121ed1 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 7356786614ca5793589328d8abaa179a39ead119 +Subproject commit c2121ed1408a7ebf08e094b7d2a69ae3e4fe3576 From df6a1c04b06cffc6e083056aac5d54303f25febc Mon Sep 17 00:00:00 2001 From: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Date: Wed, 20 Aug 2025 12:20:29 +0530 Subject: [PATCH 36/87] Sn/dev/3.5.0 (#171) * fix: amm-1572 added data not found value for languages * fix: added common-ui to hwc-ui --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index 73567866..c2121ed1 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 7356786614ca5793589328d8abaa179a39ead119 +Subproject commit c2121ed1408a7ebf08e094b7d2a69ae3e4fe3576 From a3917756b2a9ac3a7602fde9db2948afd8e678b9 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Wed, 20 Aug 2025 13:48:07 +0530 Subject: [PATCH 37/87] fix: changed version to 3.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e93a64ef..096e6b1c 100644 --- a/pom.xml +++ b/pom.xml @@ -170,7 +170,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.4.0 properties-updated From 0cd124b0e6982a4a4d8d75e704745aa5013aa5a0 Mon Sep 17 00:00:00 2001 From: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Date: Wed, 20 Aug 2025 13:55:56 +0530 Subject: [PATCH 38/87] Sn/dev/3.5.0 (#172) * fix: amm-1572 added data not found value for languages * fix: added common-ui to hwc-ui * fix: changed version to 3.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e93a64ef..096e6b1c 100644 --- a/pom.xml +++ b/pom.xml @@ -170,7 +170,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.4.0 properties-updated From 1f94f373820ad0c9de252b9769fad1278d666836 Mon Sep 17 00:00:00 2001 From: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Date: Wed, 20 Aug 2025 15:32:29 +0530 Subject: [PATCH 39/87] version 3.4.0 (#173) * fix: amm-1572 added data not found value for languages * fix: added common-ui to hwc-ui * fix: changed version to 3.4.0 From 14601998e3f66936e9c5da7bb972fca18916fc1c Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Wed, 20 Aug 2025 15:38:34 +0530 Subject: [PATCH 40/87] fix: changed version to 3.4.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 096e6b1c..fa9b0567 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.iemr.aam-ui aam-ui - 3.1.0 + 3.4.0 AAM-UI Piramal - AAM: Module ui war @@ -152,7 +152,7 @@ org.apache.maven.plugins maven-war-plugin - 3.4.0 + 3.1.0 false From 84fcd531e0e443242c136539ed55e58531f250c7 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Wed, 20 Aug 2025 16:09:15 +0530 Subject: [PATCH 41/87] fix: reverted maven-war-plugin version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fa9b0567..0f8898ab 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ org.apache.maven.plugins maven-war-plugin - 3.1.0 + 3.4.0 false @@ -170,7 +170,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.4.0 + 3.1.0 properties-updated From 2285878f45c2418ec1431f5c0ea9f3af32a361ca Mon Sep 17 00:00:00 2001 From: Helen Grace Karyamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Date: Fri, 22 Aug 2025 22:44:21 +0530 Subject: [PATCH 42/87] fix: aam-1725 provisional diagnosis rendering issue fix and performance improvement by n factor (#164) (#174) * fix: aam-1725 provisional diagnosis rendering issue fix and performance improvement by n factor * fix: amm-1725 provisonal diagnosis in quick consult issue fix Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Co-authored-by: Mithun James --- .../general-opd-diagnosis.component.html | 2 +- .../general-opd-diagnosis.component.ts | 16 +++++++--------- .../ncd-care-diagnosis.component.html | 2 +- .../ncd-care-diagnosis.component.ts | 16 +++++++--------- .../ncd-screening-diagnosis.component.html | 2 +- .../ncd-screening-diagnosis.component.ts | 16 +++++++--------- .../pnc-diagnosis/pnc-diagnosis.component.html | 2 +- .../pnc-diagnosis/pnc-diagnosis.component.ts | 14 ++++++-------- .../quick-consult/quick-consult.component.ts | 5 ++--- 9 files changed, 33 insertions(+), 42 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 65099e8b..aa8f2a5e 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 @@ -26,7 +26,7 @@
    + *ngFor="let diagnosis of provisionalDiagnosisControls; let i = index; let isLast = last">
    diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts index 87be4106..13bc4b8a 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts @@ -94,13 +94,11 @@ export class GeneralOpdDiagnosisComponent this.current_language_set = getLanguageJson.currentLanguageObject; } - getProvisionalDiagnosisList(): AbstractControl[] | null { - const provisionalDiagnosisListControl = this.generalDiagnosisForm.get( - 'provisionalDiagnosisList', + get provisionalDiagnosisControls(): AbstractControl[] { + return ( + (this.generalDiagnosisForm.get('provisionalDiagnosisList') as FormArray) + ?.controls || [] ); - return provisionalDiagnosisListControl instanceof FormArray - ? provisionalDiagnosisListControl.controls - : null; } get specialistDaignosis() { @@ -203,8 +201,8 @@ export class GeneralOpdDiagnosisComponent (diagnosisArrayList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - if (diagnosisArrayList.length < savedDiagnosisData.length) - this.addDiagnosis(); + // if (diagnosisArrayList.length < savedDiagnosisData.length) + this.addDiagnosis(); } } } @@ -280,7 +278,7 @@ export class GeneralOpdDiagnosisComponent } displayDiagnosis(diagnosis: any): string { - return diagnosis?.term || ''; + return typeof diagnosis === 'string' ? diagnosis : diagnosis?.term || ''; } onDiagnosisSelected(selected: any, index: number) { diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html index df19c075..ae17aa4c 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html @@ -106,7 +106,7 @@

    {{ current_language_set?.casesheet?.provisionalDiag }}

    + *ngFor="let diagnosis of provisionalDiagnosisControls; let i = index; let isLast = last">
    diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts index c5bdd27d..5807d1ef 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts @@ -104,13 +104,11 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck, OnDestroy { this.current_language_set = getLanguageJson.currentLanguageObject; } - getProvisionalDiagnosisList(): AbstractControl[] | null { - const provisionalDiagnosisListControl = this.generalDiagnosisForm.get( - 'provisionalDiagnosisList', + get provisionalDiagnosisControls(): AbstractControl[] { + return ( + (this.generalDiagnosisForm.get('provisionalDiagnosisList') as FormArray) + ?.controls || [] ); - return provisionalDiagnosisListControl instanceof FormArray - ? provisionalDiagnosisListControl.controls - : null; } getDoctorMasterData() { @@ -207,8 +205,8 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck, OnDestroy { (diagnosisArrayList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - if (diagnosisArrayList.length < savedDiagnosisData.length) - this.addDiagnosis(); + // if (diagnosisArrayList.length < savedDiagnosisData.length) + this.addDiagnosis(); } } } @@ -305,7 +303,7 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck, OnDestroy { } displayDiagnosis(diagnosis: any): string { - return diagnosis?.term || ''; + return typeof diagnosis === 'string' ? diagnosis : diagnosis?.term || ''; } onDiagnosisSelected(selected: any, index: number) { diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html index e5420a8b..0c10133d 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html @@ -10,7 +10,7 @@

    + *ngFor="let diagnosis of provisionalDiagnosisControls; let i = index; let isLast = last">
    diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts index 63478c7e..5f4f8446 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts @@ -153,13 +153,11 @@ export class NcdScreeningDiagnosisComponent }); } - getProvisionalDiagnosisList(): AbstractControl[] | null { - const provisionalDiagnosisListControl = this.generalDiagnosisForm.get( - 'provisionalDiagnosisList', + get provisionalDiagnosisControls(): AbstractControl[] { + return ( + (this.generalDiagnosisForm.get('provisionalDiagnosisList') as FormArray) + ?.controls || [] ); - return provisionalDiagnosisListControl instanceof FormArray - ? provisionalDiagnosisListControl.controls - : null; } ngDoCheck() { @@ -342,8 +340,8 @@ export class NcdScreeningDiagnosisComponent (diagnosisArrayList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - if (diagnosisArrayList.length < savedDiagnosisData.length) - this.addDiagnosis(); + //if (diagnosisArrayList.length < savedDiagnosisData.length) + this.addDiagnosis(); } } } @@ -556,7 +554,7 @@ export class NcdScreeningDiagnosisComponent } displayDiagnosis(diagnosis: any): string { - return diagnosis?.term || ''; + return typeof diagnosis === 'string' ? diagnosis : diagnosis?.term || ''; } onDiagnosisSelected(selected: any, index: number) { diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html index cc915855..88408df8 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html @@ -8,7 +8,7 @@

    {{ current_language_set?.casesheet?.provisionalDiag }}

    provisionalDiagnosisList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - if (provisionalDiagnosisList.length < provisionalDiagnosisDataList.length) - this.addProvisionalDiagnosis(); + //if (provisionalDiagnosisList.length < provisionalDiagnosisDataList.length) + this.addProvisionalDiagnosis(); } } 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 a88b5a2b..79de333d 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 @@ -680,8 +680,7 @@ export class QuickConsultComponent (diagnosisArrayList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - if (diagnosisArrayList.length < savedDiagnosisData.length) - this.addDiagnosis(); + this.addDiagnosis(); } } this.patchPrescriptionDetails(response.prescription); @@ -1372,7 +1371,7 @@ export class QuickConsultComponent } displayDiagnosis(diagnosis: any): string { - return diagnosis?.term || ''; + return typeof diagnosis === 'string' ? diagnosis : diagnosis?.term || ''; } onDiagnosisSelected(selected: any, index: number) { From 2377949718a2ec8f57240a9c439933abbeafd7b0 Mon Sep 17 00:00:00 2001 From: Helen Grace Karyamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Date: Fri, 22 Aug 2025 22:52:42 +0530 Subject: [PATCH 43/87] fix: aam-1725 provisional diagnosis rendering issue fix and performance improvement by n factor (#164) (#176) * fix: aam-1725 provisional diagnosis rendering issue fix and performance improvement by n factor * fix: amm-1725 provisonal diagnosis in quick consult issue fix Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Co-authored-by: Mithun James From 222de3be96d86f348b0783b759c48d1881a2608c Mon Sep 17 00:00:00 2001 From: Helen Grace Karyamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Date: Fri, 22 Aug 2025 23:30:52 +0530 Subject: [PATCH 44/87] fix(feat): highRisk flw patients display in red colorfor doctor worklist (#177) * fix(bug): default abdm facilityId not saving issue * feat: added righ risk patients from flw to nurse worklist * Release 3.4.0 (#1) * fix(bug): hwc block matching issue * fix(bug): saving abdm facilityid in session storage * fix: updated commonui commitid (#143) Co-authored-by: Karyamsetty Helen Grace * Abdm Facility Id default not saving issue (#149) * fix: updated commonui commitid * fix(bug): default abdm facilityId not saving issue --------- Co-authored-by: Karyamsetty Helen Grace * fix: aam-1725 provisional diagnosis rendering issue fix and performance improvement by n factor * fix: amm-1724 removed commented code * Update version in pom.xml to 3.4.0 * Update pom.xml * fix: amm-1725 provisonal diagnosis in quick consult issue fix * Display HRP-marked Beneficiaries in Red for Easy Identification (#162) * fix(bug): default abdm facilityId not saving issue * feat: added righ risk patients from flw to nurse worklist --------- Co-authored-by: Karyamsetty Helen Grace --------- Co-authored-by: Karyamsetty Helen Grace Co-authored-by: Devika S <57424483+devikasuresh20@users.noreply.github.com> Co-authored-by: 5Amogh Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> * fix(feat): highRisk flw patients display in red colorfor doctor worklist * fix: latest common-ui commit * Update pom.xml --------- Co-authored-by: Karyamsetty Helen Grace Co-authored-by: Devika S <57424483+devikasuresh20@users.noreply.github.com> Co-authored-by: 5Amogh Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> --- Common-UI | 2 +- pom.xml | 2 +- .../doctor-worklist/doctor-worklist.component.css | 5 +++++ .../doctor-worklist.component.html | 3 ++- .../nurse-worklist/nurse-worklist.component.css | 15 +++++++++++++++ .../nurse-worklist/nurse-worklist.component.html | 11 ++++++++--- 6 files changed, 32 insertions(+), 6 deletions(-) diff --git a/Common-UI b/Common-UI index c2121ed1..bb57ecfa 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit c2121ed1408a7ebf08e094b7d2a69ae3e4fe3576 +Subproject commit bb57ecfac052a50bd85dc30eba1ca93335c34344 diff --git a/pom.xml b/pom.xml index 0f8898ab..3c92e59c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.iemr.aam-ui aam-ui - 3.4.0 + 3.5.0 AAM-UI Piramal - AAM: Module ui war diff --git a/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.css b/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.css index 60fe44a1..5d015dd8 100644 --- a/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.css +++ b/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.css @@ -96,6 +96,11 @@ ul li div { } +::ng-deep .marker-h-r-c, +::ng-deep .marker-h-r-c td { + color: #FF0000 !important; +} + .color-rows>td { padding: 0; border: 0; diff --git a/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.html b/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.html index 5b6694cc..5b476550 100644 --- a/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.html +++ b/src/app/app-modules/nurse-doctor/doctor-worklist/doctor-worklist.component.html @@ -365,7 +365,8 @@

    {{ element.sno }} @@ -256,6 +257,10 @@

    {{ currentLanguageSet?.common?.reVisit }}

    • +
  • +
    +

    {{ currentLanguageSet?.highRiskPregnancy }}

    +
    • From d0118b9f4c66845dd8d7e68d45803862e4667824 Mon Sep 17 00:00:00 2001 From: Helen Grace Karyamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Date: Mon, 25 Aug 2025 13:27:12 +0530 Subject: [PATCH 45/87] common ui commit to release-3.5.0 (#178) * fix(bug): default abdm facilityId not saving issue * feat: added righ risk patients from flw to nurse worklist * Release 3.4.0 (#1) * fix(bug): hwc block matching issue * fix(bug): saving abdm facilityid in session storage * fix: updated commonui commitid (#143) Co-authored-by: Karyamsetty Helen Grace * Abdm Facility Id default not saving issue (#149) * fix: updated commonui commitid * fix(bug): default abdm facilityId not saving issue --------- Co-authored-by: Karyamsetty Helen Grace * fix: aam-1725 provisional diagnosis rendering issue fix and performance improvement by n factor * fix: amm-1724 removed commented code * Update version in pom.xml to 3.4.0 * Update pom.xml * fix: amm-1725 provisonal diagnosis in quick consult issue fix * Display HRP-marked Beneficiaries in Red for Easy Identification (#162) * fix(bug): default abdm facilityId not saving issue * feat: added righ risk patients from flw to nurse worklist --------- Co-authored-by: Karyamsetty Helen Grace --------- Co-authored-by: Karyamsetty Helen Grace Co-authored-by: Devika S <57424483+devikasuresh20@users.noreply.github.com> Co-authored-by: 5Amogh Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> * fix(feat): highRisk flw patients display in red colorfor doctor worklist * fix: latest common-ui commit * Update pom.xml * fix: updated latest common-ui commit --------- Co-authored-by: Karyamsetty Helen Grace Co-authored-by: Devika S <57424483+devikasuresh20@users.noreply.github.com> Co-authored-by: 5Amogh Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index bb57ecfa..1827cdfb 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit bb57ecfac052a50bd85dc30eba1ca93335c34344 +Subproject commit 1827cdfbc1f59b7901ea6140ff6e513729e902e6 From 11c0a9fa8f0980572ead6f84817623480ce6c56c Mon Sep 17 00:00:00 2001 From: Helen Grace Karyamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Date: Tue, 26 Aug 2025 10:50:42 +0530 Subject: [PATCH 46/87] Revert "Display HRP-marked Beneficiaries in Red for Easy Identification (#162)" (#179) This reverts commit 6b06aa231ee8f82cfd0f17c2c0214840a4a52664. --- .../nurse-worklist/nurse-worklist.component.css | 15 --------------- .../nurse-worklist/nurse-worklist.component.html | 11 +++-------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.css b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.css index 601d6ac8..216cea83 100644 --- a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.css +++ b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.css @@ -33,16 +33,6 @@ md-input-container { text-align: center; } -.visitStatus.high-risk::before { - content: ""; - position: absolute; - left: 0; - top: 0; - bottom: 1px; - width: 4px; - background: #FF0000 !important; -} - .visitStatus.first-visit::before { content: ""; position: absolute; @@ -94,11 +84,6 @@ ul li div { } -.high-risk-marker { - background: #FF0000; - margin-right: 5px !important; -} - .totalCount, .description { padding-top: 15px; diff --git a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.html b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.html index c5ae47d5..8ee6187b 100644 --- a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.html +++ b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.html @@ -62,10 +62,9 @@ mat-cell *matCellDef="let element" [ngClass]="{ - 'visitStatus': true, - 'high-risk': element?.is_high_risk === true, - 'first-visit': !element?.is_high_risk && element?.benVisitNo === 1, - 'revisit': !element?.is_high_risk && element?.benVisitNo !== 1 + visitStatus: true, + 'first-visit': element?.benVisitNo === 1, + revisit: element?.benVisitNo !== 1 }" > {{ element.sno }} @@ -257,10 +256,6 @@

    {{ currentLanguageSet?.common?.reVisit }}

    -
  • -
    -

    {{ currentLanguageSet?.highRiskPregnancy }}

    -
    • From 72d328fa84facc6d52c55f929571508af64613b7 Mon Sep 17 00:00:00 2001 From: Helen Grace Karyamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Date: Tue, 26 Aug 2025 16:00:59 +0530 Subject: [PATCH 47/87] fix: aam-1725 provisional diagnosis rendering issue fix and performance improvement by n factor (#164) (#180) * fix: aam-1725 provisional diagnosis rendering issue fix and performance improvement by n factor * fix: amm-1725 provisonal diagnosis in quick consult issue fix Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Co-authored-by: Mithun James From dec1fd2024226631924aea376fa522093dd136e9 Mon Sep 17 00:00:00 2001 From: Abhijeet <149177534+abhijeetw035@users.noreply.github.com> Date: Thu, 28 Aug 2025 11:47:06 +0530 Subject: [PATCH 48/87] feat(tracking): added userID tracking after login success (#165) Co-authored-by: Abhijeet --- src/app/user-login/login/login.component.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/app/user-login/login/login.component.ts b/src/app/user-login/login/login.component.ts index 65536d54..ac026ed0 100644 --- a/src/app/user-login/login/login.component.ts +++ b/src/app/user-login/login/login.component.ts @@ -34,6 +34,7 @@ import { MasterDownloadComponent } from 'src/app/app-modules/data-sync/master-do import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; import { CaptchaComponent } from '../captcha/captcha.component'; import { environment } from 'src/environments/environment'; +import { AmritTrackingService } from 'Common-UI/src/tracking'; @Component({ selector: 'app-login-cmp', @@ -66,6 +67,7 @@ export class LoginComponent implements OnInit { private confirmationService: ConfirmationService, private fb: FormBuilder, readonly sessionstorage: SessionStorageService, + private trackingService: AmritTrackingService, ) { this._keySize = 256; this._ivSize = 128; @@ -219,6 +221,13 @@ export class LoginComponent implements OnInit { .subscribe((userLoggedIn: any) => { if (userLoggedIn.statusCode === 200) { if (userLoggedIn?.data?.previlegeObj[0]) { + this.sessionstorage.setItem( + 'loginDataResponse', + JSON.stringify(userLoggedIn.data), + ); + this.trackingService.setUserId( + userLoggedIn.data.userID, + ); this.authService.sessionExpiredHandled = false; this.sessionstorage.setItem( @@ -280,6 +289,7 @@ export class LoginComponent implements OnInit { loginDataResponse.isAuthenticated, ); this.sessionstorage.setItem('userID', loginDataResponse.userID); + this.trackingService.setUserId(loginDataResponse.userID); this.sessionstorage.setItem('userName', loginDataResponse.userName); this.sessionstorage.setItem('username', userName); this.sessionstorage.setItem('fullName', loginDataResponse.fullName); From a10bcca605fd84dd646afb649e7b1801b12f0bbf Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Wed, 3 Sep 2025 19:47:09 +0530 Subject: [PATCH 49/87] feat: amm-1830 infinite scroll for provisional diagnosis --- .../general-opd-diagnosis.component.html | 8 +- .../general-opd-diagnosis.component.ts | 135 ++++++++++++-- .../ncd-care-diagnosis.component.html | 7 +- .../ncd-care-diagnosis.component.ts | 128 ++++++++++++- .../ncd-screening-diagnosis.component.html | 15 +- .../ncd-screening-diagnosis.component.ts | 130 +++++++++++++- .../pnc-diagnosis.component.html | 129 ++++++++----- .../pnc-diagnosis/pnc-diagnosis.component.ts | 170 +++++++++++++++++- .../nurse-doctor/nurse-doctor.module.ts | 2 + .../quick-consult.component.html | 27 ++- .../quick-consult/quick-consult.component.ts | 126 ++++++++++++- .../autocomplete-scroller.directive.ts | 119 ++++++++++++ 12 files changed, 906 insertions(+), 90 deletions(-) create mode 100644 src/app/app-modules/nurse-doctor/shared/utility/autocomplete-scroller.directive.ts 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 aa8f2a5e..f684b395 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 @@ -38,12 +38,16 @@ (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" /> - + {{ diag.term }} + Loading… + End of results +
    diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts index 13bc4b8a..8f9b7432 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts @@ -64,6 +64,17 @@ export class GeneralOpdDiagnosisComponent designation: any; specialist = false; suggestedDiagnosisList: any = []; + private readonly PAGE_BASE = 0; + pageSize: number | undefined = undefined; + + 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, public httpServiceService: HttpServiceService, @@ -110,7 +121,6 @@ export class GeneralOpdDiagnosisComponent const beneficiaryRegID = this.sessionstorage.getItem('beneficiaryRegID'); const visitID = this.sessionstorage.getItem('visitID'); const visitCategory = this.sessionstorage.getItem('visitCategory'); - const specialistFlagString = this.sessionstorage.getItem('specialist_flag'); @@ -201,7 +211,6 @@ export class GeneralOpdDiagnosisComponent (diagnosisArrayList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - // if (diagnosisArrayList.length < savedDiagnosisData.length) this.addDiagnosis(); } } @@ -263,16 +272,28 @@ export class GeneralOpdDiagnosisComponent if (this.diagnosisSubscription) { this.diagnosisSubscription.unsubscribe(); } + if (this.MMUdiagnosisSubscription) { + this.MMUdiagnosisSubscription.unsubscribe?.(); + } } onDiagnosisInputKeyup(value: string, index: number) { - if (value.length >= 3) { - this.masterdataService - .searchDiagnosisBasedOnPageNo(value, index) - .subscribe((results: any) => { - this.suggestedDiagnosisList[index] = results?.data?.sctMaster; - }); + 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] = []; } } @@ -282,17 +303,111 @@ export class GeneralOpdDiagnosisComponent } 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, }); } + + 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/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html index ae17aa4c..fd266224 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html @@ -117,11 +117,14 @@

    {{ current_language_set?.casesheet?.provisionalDiag }}

    [matAutocomplete]="autoDiagnosis" (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" /> - + {{ diag.term }} + Loading… + End of results diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts index 5807d1ef..3c0417c3 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts @@ -63,6 +63,16 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck, OnDestroy { attendantType: any; enableNCDCondition = false; suggestedDiagnosisList: any = []; + private readonly PAGE_BASE = 0; + pageSize: number | undefined = undefined; + + 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, @@ -205,7 +215,6 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck, OnDestroy { (diagnosisArrayList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - // if (diagnosisArrayList.length < savedDiagnosisData.length) this.addDiagnosis(); } } @@ -291,13 +300,22 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck, OnDestroy { } } onDiagnosisInputKeyup(value: string, index: number) { - if (value.length >= 3) { - this.masterdataService - .searchDiagnosisBasedOnPageNo(value, index) - .subscribe((results: any) => { - this.suggestedDiagnosisList[index] = results?.data?.sctMaster; - }); + 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] = []; } } @@ -320,4 +338,100 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck, OnDestroy { 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/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html index 0c10133d..a41e4aad 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html @@ -21,12 +21,15 @@

    [matAutocomplete]="autoDiagnosis" (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" /> - - - {{ diag.term }} - - + + + {{ diag.term }} + + Loading… + End of results + diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts index 5f4f8446..4ceaf249 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts @@ -98,6 +98,16 @@ export class NcdScreeningDiagnosisComponent previousVisitConfirmedDiseasesSubscription!: Subscription; enableProvisionalDiag = false; suggestedDiagnosisList: any = []; + private readonly PAGE_BASE = 0; + pageSize: number | undefined = undefined; + + 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, @@ -539,16 +549,28 @@ export class NcdScreeningDiagnosisComponent if (this.previousVisitConfirmedDiseasesSubscription) { this.previousVisitConfirmedDiseasesSubscription.unsubscribe(); } + if (this.MMUdiagnosisSubscription) { + this.MMUdiagnosisSubscription.unsubscribe(); + } } onDiagnosisInputKeyup(value: string, index: number) { - if (value.length >= 3) { - this.masterdataService - .searchDiagnosisBasedOnPageNo(value, index) - .subscribe((results: any) => { - this.suggestedDiagnosisList[index] = results?.data?.sctMaster; - }); + 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] = []; } } @@ -571,4 +593,100 @@ export class NcdScreeningDiagnosisComponent 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/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html index 88408df8..6ef708aa 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.html @@ -7,6 +7,7 @@

    {{ current_language_set?.casesheet?.provisionalDiag }}

    - search + + + + {{ 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 79de333d..e798bc28 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,15 @@ 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, @@ -1359,13 +1368,22 @@ export class QuickConsultComponent } onDiagnosisInputKeyup(value: string, index: number) { - if (value.length >= 3) { - this.masterdataService - .searchDiagnosisBasedOnPageNo(value, index) - .subscribe((results: any) => { - this.suggestedDiagnosisList[index] = results?.data?.sctMaster; - }); + 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] = []; } } @@ -1387,4 +1405,100 @@ export class QuickConsultComponent 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 00000000..629a9966 --- /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 eedbf98ee7528931f77e7e717f3eda197562333f Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Thu, 4 Sep 2025 15:07:26 +0530 Subject: [PATCH 50/87] feat: amm56-1337 work in progress for feedback module --- Common-UI | 2 +- src/app/app-routing.module.ts | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index 1827cdfb..d6ef3846 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 1827cdfbc1f59b7901ea6140ff6e513729e902e6 +Subproject commit d6ef38461138fe39666edb6cdf68f7a08ecc55c8 diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 9bc5555c..06d5041b 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -109,6 +109,13 @@ const routes: Routes = [ (module) => module.DataSYNCModule, ), }, + { + path: 'feedback', + loadChildren: () => + import('Common-UI/src/feedback/feedback.module').then( + (m) => m.FeedbackModule, + ), + }, ]; @NgModule({ From 52e97b8f56f323dd04ee5420619760c13904b367 Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Fri, 5 Sep 2025 07:29:45 +0530 Subject: [PATCH 51/87] fix: deployment issue fix --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index 1827cdfb..3d17432e 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 1827cdfbc1f59b7901ea6140ff6e513729e902e6 +Subproject commit 3d17432e2138b2e9a7e2d4bffc5b3e24a1d68e6d From f9c285f917a62b00bfa0e18e9d6665a0f0f28aa4 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Fri, 5 Sep 2025 12:36:59 +0530 Subject: [PATCH 52/87] fix: amm-1478 fixed Preview casessheet problem in previous history --- .../core/services/http-service.service.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/app-modules/core/services/http-service.service.ts b/src/app/app-modules/core/services/http-service.service.ts index b305e09e..ab249160 100644 --- a/src/app/app-modules/core/services/http-service.service.ts +++ b/src/app/app-modules/core/services/http-service.service.ts @@ -22,7 +22,13 @@ export class HttpServiceService { constructor( private _http: HttpClient, private http: HttpClient, - ) {} + ) { + const storedLang = localStorage.getItem('appLanguage'); + this.language = storedLang ? JSON.parse(storedLang) : null; + + this.appCurrentLanguge = new BehaviorSubject(this.language); + this.currentLangugae$ = this.appCurrentLanguge.asObservable(); + } fetchLanguageSet() { console.log('Here i come'); @@ -34,10 +40,8 @@ export class HttpServiceService { } getCurrentLanguage(response: any) { - console.log('here at one', response); this.language = response; - console.log('teste', this.language); this.appCurrentLanguge.next(response); - console.log('here at two', this.appCurrentLanguge.value); + localStorage.setItem('appLanguage', JSON.stringify(response)); } } From 3a3a5765ec600d0b6a70c18f94144eaf190cbb50 Mon Sep 17 00:00:00 2001 From: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Date: Fri, 5 Sep 2025 13:22:53 +0530 Subject: [PATCH 53/87] fix: amm-1478 fixed Preview casessheet problem in previous history (#184) --- .../app-modules/core/services/http-service.service.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/app-modules/core/services/http-service.service.ts b/src/app/app-modules/core/services/http-service.service.ts index b305e09e..9b850e68 100644 --- a/src/app/app-modules/core/services/http-service.service.ts +++ b/src/app/app-modules/core/services/http-service.service.ts @@ -22,7 +22,10 @@ export class HttpServiceService { constructor( private _http: HttpClient, private http: HttpClient, - ) {} + ) { + const storedLang = localStorage.getItem('appLanguage'); + this.language = storedLang ? JSON.parse(storedLang) : null; + } fetchLanguageSet() { console.log('Here i come'); @@ -34,10 +37,8 @@ export class HttpServiceService { } getCurrentLanguage(response: any) { - console.log('here at one', response); this.language = response; - console.log('teste', this.language); + localStorage.setItem('appLanguage', JSON.stringify(response)); this.appCurrentLanguge.next(response); - console.log('here at two', this.appCurrentLanguge.value); } } From a9b33547254ef20bb12688c73845e386d96112fe Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Fri, 5 Sep 2025 18:56:08 +0530 Subject: [PATCH 54/87] fix: amm-1785 doctor signature in casesheet --- .../doctor-diagnosis-case-sheet.component.ts | 27 +++++++++---------- .../shared/services/doctor.service.ts | 6 ++--- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.ts b/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.ts index efcede90..4dff55af 100644 --- a/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.ts +++ b/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.ts @@ -577,20 +577,19 @@ export class DoctorDiagnosisCaseSheetComponent return len > 0 ? new Array(len).join('0') + this : this; } downloadSign() { - if (this.beneficiaryDetails && this.beneficiaryDetails.tCSpecialistUserID) { - const tCSpecialistUserID = this.beneficiaryDetails.tCSpecialistUserID; - this.doctorService.downloadSign(tCSpecialistUserID).subscribe( - (response: any) => { - const blob = new Blob([response], { type: response.type }); - this.showSign(blob); - }, - (err: any) => { - console.log('error'); - }, - ); - } else { - console.log('No tCSpecialistUserID found'); - } + const userId = + this.beneficiaryDetails?.tCSpecialistUserID ?? + this.sessionstorage.getItem('userID'); + + this.doctorService.downloadSign(userId).subscribe( + (response: any) => { + const blob = new Blob([response], { type: response.type }); + this.showSign(blob); + }, + (err: any) => { + console.error('Error downloading signature:', err); + }, + ); } showSign(blob: any) { const reader = new FileReader(); diff --git a/src/app/app-modules/nurse-doctor/shared/services/doctor.service.ts b/src/app/app-modules/nurse-doctor/shared/services/doctor.service.ts index 9281c5db..38446256 100644 --- a/src/app/app-modules/nurse-doctor/shared/services/doctor.service.ts +++ b/src/app/app-modules/nurse-doctor/shared/services/doctor.service.ts @@ -3015,9 +3015,9 @@ export class DoctorService { } /* Doctor Signature download */ downloadSign(userID: any) { - return this.http - .get(environment.downloadSignUrl + userID, { responseType: 'blob' }) - .pipe(map((res: any) => res.blob())); + return this.http.get(environment.downloadSignUrl + userID, { + responseType: 'blob' as 'json', + }); } getIDRSDetails(beneficiaryID: string, visitID: string): Observable { const visitCategory = this.sessionstorage.getItem('visitCategory'); From 09f024460bc899d3f0ce83d510948db5afc48173 Mon Sep 17 00:00:00 2001 From: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Date: Tue, 9 Sep 2025 13:29:27 +0530 Subject: [PATCH 55/87] fix: update pom.xml 3.4.0 to 3.4.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0f8898ab..608c5629 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.iemr.aam-ui aam-ui - 3.4.0 + 3.4.1 AAM-UI Piramal - AAM: Module ui war From e68be945fa8c3bc183ac59b14c8a7490d35de4a2 Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Tue, 9 Sep 2025 20:59:38 +0530 Subject: [PATCH 56/87] feat: amm-1337 work in progress for feedback module --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index d6ef3846..4235e464 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit d6ef38461138fe39666edb6cdf68f7a08ecc55c8 +Subproject commit 4235e46491d03a6232ed2b80954abbbc72933ca5 From 931e06cc205828d199d2e6997c019b7fab9f876c Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Wed, 10 Sep 2025 20:07:09 +0530 Subject: [PATCH 57/87] feat: amm-1337 feedback module integration --- Common-UI | 2 +- .../app-footer/app-footer.component.html | 18 ++++++++++-- .../app-header/app-header.component.ts | 16 +++++----- .../core/services/http-interceptor.service.ts | 29 +++++++++++++------ 4 files changed, 45 insertions(+), 20 deletions(-) diff --git a/Common-UI b/Common-UI index 4235e464..b8a0d220 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 4235e46491d03a6232ed2b80954abbbc72933ca5 +Subproject commit b8a0d220a5aae508ca04b56f6e6911fd48326704 diff --git a/src/app/app-modules/core/components/app-footer/app-footer.component.html b/src/app/app-modules/core/components/app-footer/app-footer.component.html index e0e99a6d..2a3b4e35 100644 --- a/src/app/app-modules/core/components/app-footer/app-footer.component.html +++ b/src/app/app-modules/core/components/app-footer/app-footer.component.html @@ -1,6 +1,6 @@