Release 3.6.0 into main

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.iemr.aam-ui</groupId>
 	<artifactId>aam-ui</artifactId>
-	<version>3.1.0</version>
+	<version>3.6.0</version>
 	<name>AAM-UI</name>
 	<description>Piramal - AAM: Module ui</description>
 	<packaging>war</packaging>

scripts/ci-prebuild.js

@@ -58,6 +58,12 @@ const defaultEnvValues = {
   SITE_KEY: '',
   CAPTCHA_CHALLENGE_URL: '',
   ENABLE_CAPTCHA: false,
+  SITE_ID: '1',
+  TRACKER_URL: 'https://matomo.piramalswasthya.org/',
+  TRACKING_PLATFORM: 'matomo',
+  TRACKING_ENABLED: 'true',
+  ENABLE_CHO_REPORT_BUTTON: true,
+  DHIS_URL:'',
 };
 
 // Generate output data

src/app/app-modules/core/components/app-footer/app-footer.component.html

@@ -1,6 +1,6 @@
 <footer class="footer container-fluid">
   <div class="row">
-    <div class="col-4 text-left">
+    <div class="col-3 text-left">
       <span
         class="footer-text"
         *ngIf="currentLanguageSet === null || currentLanguageSet === undefined"
@@ -12,7 +12,7 @@
         >{{ currentLanguageSet?.coreComponents?.poweredByWipro }}</span
       >
     </div>
-    <div class="col-4 text-center">
+    <div class="col-3 text-center">
       <p
         class="footer-text"
         *ngIf="currentLanguageSet === null || currentLanguageSet === undefined"
@@ -28,7 +28,21 @@
         {{version }}
       </p>
     </div>
-    <div class="col-4 text-end">
+    <div
+      class="col-3 text-end"
+      style="cursor: pointer"
+      [routerLink]="['/feedback']"
+      [queryParams]="{ sl: 'AAM' }"
+      role="link"
+    >
+      <mat-icon style="vertical-align: top; font-size: medium; margin-right: 2%"
+        >mail</mat-icon
+      >
+      <span class="footer-text"
+        >{{ currentLanguageSet?.platform_feedback?.feedback ?? "Feedback" }}
+      </span>
+    </div>
+    <div class="col-3 text-end">
       <p class="footer-text">
         <span
           class="footer-text"

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)="trackFieldInteraction('Role_Registrar')"
           >
             {{ item.work[1].label }}
           </button>
@@ -195,12 +196,18 @@
             mat-button
             [routerLink]="[item.link]"
             routerLinkActive="active"
+            (click)="trackFieldInteraction('Role_' + item.role)"
           >
             {{ item.label }}
           </button>
         </li>
         <li class="nav-item" *ngIf="item.role === 'TC Specialist'">
-          <button class="nav-btn" mat-button [matMenuTriggerFor]="TCitems">
+          <button 
+            class="nav-btn" 
+            mat-button 
+            [matMenuTriggerFor]="TCitems"
+            (click)="trackFieldInteraction('Role_TC Specialist')"
+          >
             {{ item.label }}
             <span class="caret"></span>
           </button>

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';
 
 @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,
   ) {}
 
   ngOnInit() {
@@ -260,13 +262,15 @@ export class AppHeaderComponent implements OnInit, AfterContentChecked {
 
   logout() {
     this.auth.logout().subscribe((res) => {
-      this.router.navigate(['/login']).then((result) => {
-        if (result) {
-          this.changeLanguage('English');
-          this.sessionstorage.clear();
-          sessionStorage.clear();
-        }
-      });
+      this.router
+        .navigate(['/feedback'], { queryParams: { sl: 'HWC' } })
+        .then((result) => {
+          if (result) {
+            this.changeLanguage('English');
+            this.sessionstorage.clear();
+            sessionStorage.clear();
+          }
+        });
     });
   }
   getSwymedLogout() {
@@ -330,4 +334,8 @@ export class AppHeaderComponent implements OnInit, AfterContentChecked {
       width: '600px',
     });
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Roles');
+  }
 }

src/app/app-modules/core/components/beneficiary-details/beneficiary-details.component.html

@@ -20,6 +20,36 @@
         <tr style="color: #595959; font-size: 14px">
           <td>{{ beneficiary?.benName }}</td>
         </tr>
+        <ng-container *ngIf="beneficiary?.fatherName">
+          <tr style="font-size: 14px; color: #000000">
+            <th id="fatherName">
+              {{ current_language_set?.bendetails?.fatherName }}:
+            </th>
+          </tr>
+          <tr style="color: #595959; font-size: 14px">
+            <td>{{ beneficiary?.fatherName }}</td>
+          </tr>
+        </ng-container>
+        <ng-container *ngIf="beneficiary?.lastName">
+          <tr style="font-size: 14px; color: #000000">
+            <th id="lastName">
+              {{ current_language_set?.bendetails?.lastName }}:
+            </th>
+          </tr>
+          <tr style="color: #595959; font-size: 14px">
+            <td>{{ beneficiary?.lastName }}</td>
+          </tr>
+        </ng-container>
+        <ng-container *ngIf="beneficiary?.preferredPhoneNum">
+          <tr style="font-size: 14px; color: #000000">
+            <th id="phoneNo">
+              {{ current_language_set?.bendetails?.phoneNo }}:
+            </th>
+          </tr>
+          <tr style="color: #595959; font-size: 14px">
+            <td>{{ beneficiary?.preferredPhoneNum }}</td>
+          </tr>
+        </ng-container>
         <tr style="font-size: 14px; color: #000000">
           <th id="gender">
             {{ current_language_set?.bendetails?.gender }} /

src/app/app-modules/core/services/http-interceptor.service.ts

@@ -51,16 +51,27 @@ export class HttpInterceptorService implements HttpInterceptor {
     this.assignSelectedLanguage();
     const key: any = sessionStorage.getItem('key');
     let modifiedReq = null;
-    if (key !== undefined && key !== null) {
-      modifiedReq = req.clone({
-        headers: req.headers
-          .set('Authorization', key)
-          .set('Content-Type', 'application/json'),
-      });
+
+    const isPlatformFeedback =
+      req.url && req.url.toLowerCase().includes('/platform-feedback');
+
+    if (isPlatformFeedback) {
+      const headers = req.headers
+        .delete('Authorization')
+        .set('Content-Type', 'application/json');
+      modifiedReq = req.clone({ headers });
     } else {
-      modifiedReq = req.clone({
-        headers: req.headers.set('Authorization', ''),
-      });
+      if (key !== undefined && key !== null) {
+        modifiedReq = req.clone({
+          headers: req.headers
+            .set('Authorization', key)
+            .set('Content-Type', 'application/json'),
+        });
+      } else {
+        modifiedReq = req.clone({
+          headers: req.headers.set('Authorization', ''),
+        });
+      }
     }
     return next.handle(modifiedReq).pipe(
       tap((event: HttpEvent<any>) => {
@@ -76,6 +87,29 @@ export class HttpInterceptorService implements HttpInterceptor {
       catchError((error: HttpErrorResponse) => {
         console.error(error);
         this.spinnerService.setLoading(false);
+        if (error.status === 401) {
+          this.handleSessionExpiry(
+            this.currentLanguageSet.sessionExpiredPleaseLogin ||
+              'Session has expired, please login again.',
+          );
+        } else if (error.status === 403) {
+          this.handleSessionExpiry(
+            this.currentLanguageSet.accessDenied ||
+              'Access Denied. You do not have permission to access this resource.',
+          );
+        } else if (error.status === 500) {
+          this.handleSessionExpiry(
+            this.currentLanguageSet.internaleServerError,
+          );
+        } else {
+          this.handleSessionExpiry(
+            error.message ||
+              this.currentLanguageSet.somethingWentWrong ||
+              'Something went wrong. Please try again later.',
+          );
+        }
+        sessionStorage.clear();
+        this.sessionstorage.clear();
         return throwError(error.error);
       }),
     );
@@ -98,7 +132,8 @@ export class HttpInterceptorService implements HttpInterceptor {
         'Unable to fetch session object from Redis server'
     ) {
       this.handleSessionExpiry(
-        this.currentLanguageSet.sessionExpiredPleaseLogin,
+        this.currentLanguageSet.sessionExpiredPleaseLogin ||
+          'Session has expired, please login again.',
       );
     } else {
       this.startTimer();
@@ -140,7 +175,8 @@ export class HttpInterceptorService implements HttpInterceptor {
                 sessionStorage.clear();
                 this.sessionstorage.clear();
                 this.confirmationService.alert(
-                  this.currentLanguageSet.sessionExpired,
+                  this.currentLanguageSet.sessionExpired ||
+                    'Session has expired, please login again.',
                   'error',
                 );
                 this.router.navigate(['/login']);
@@ -150,7 +186,8 @@ export class HttpInterceptorService implements HttpInterceptor {
                   sessionStorage.clear();
                   this.sessionstorage.clear();
                   this.confirmationService.alert(
-                    this.currentLanguageSet.sessionExpired,
+                    this.currentLanguageSet.sessionExpired ||
+                      'Session has expired, please login again.',
                     'error',
                   );
                   this.router.navigate(['/login']);

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);
+    localStorage.setItem('appLanguage', JSON.stringify(response));
     this.appCurrentLanguge.next(response);
-    console.log('here at two', this.appCurrentLanguge.value);
   }
 }

src/app/app-modules/lab/worklist/worklist.component.ts

@@ -139,6 +139,9 @@ export class WorklistComponent implements OnInit, OnDestroy, DoCheck {
         }
       },
       (err) => {
+        if (err?.handled) {
+          return;
+        }
         this.confirmationService.alert(err, 'error');
       },
     );

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')"
   ></app-general-opd-diagnosis>
   <app-anc-diagnosis
     *ngIf="visitCategory === 'ANC'"
     [caseRecordMode]="caseRecordMode"
     [generalDiagnosisForm]="generalDiagnosisForm"
+    (click)="trackFieldInteraction('ANC Diagnosis Component')"
   ></app-anc-diagnosis>
   <app-pnc-diagnosis
     *ngIf="visitCategory === 'PNC'"
     [caseRecordMode]="caseRecordMode"
     [generalDiagnosisForm]="generalDiagnosisForm"
+    (click)="trackFieldInteraction('PNC Diagnosis Component')"
   ></app-pnc-diagnosis>
   <app-ncd-care-diagnosis
     *ngIf="visitCategory === 'NCD care'"
     [caseRecordMode]="caseRecordMode"
     [generalDiagnosisForm]="generalDiagnosisForm"
+    (click)="trackFieldInteraction('NCD Care Diagnosis Component')"
   ></app-ncd-care-diagnosis>
   <app-covid-diagnosis
     *ngIf="visitCategory === 'COVID-19 Screening'"
     [caseRecordMode]="caseRecordMode"
     [generalDiagnosisForm]="generalDiagnosisForm"
+    (click)="trackFieldInteraction('COVID Diagnosis Component')"
   ></app-covid-diagnosis>
   <app-ncd-screening-diagnosis
     *ngIf="visitCategory === 'NCD screening'"
     [caseRecordMode]="caseRecordMode"
     [generalDiagnosisForm]="generalDiagnosisForm"
+    (click)="trackFieldInteraction('NCD Screening Diagnosis Component')"
   ></app-ncd-screening-diagnosis>
 </section>

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,8 @@ export class DiagnosisComponent implements OnInit, DoCheck {
     getLanguageJson.setLanguage();
     this.current_language_set = getLanguageJson.currentLanguageObject;
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Diagnosis');
+  }
 }

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)" />
                     </mat-form-field>
 
-                    <mat-autocomplete #autoDiagnosis="matAutocomplete" autoActiveFirstOption [displayWith]="displayDiagnosis"
-                      (optionSelected)="onDiagnosisSelected($event.option.value, i)">
+                    <mat-autocomplete #autoDiagnosis="matAutocomplete" appAutocompleteScroller [threshold]="0.6"
+                      (nearEnd)="onAutoNearEnd(i)" (panelReady)="onPanelReady(i, $event)" autoActiveFirstOption
+                      [displayWith]="displayDiagnosis" (optionSelected)="onDiagnosisSelected($event.option.value, i)">
                       <mat-option *ngFor="let diag of suggestedDiagnosisList[i]" [value]="diag">
                         {{ diag.term }}
                       </mat-option>
+                      <mat-option *ngIf="loadingMore[i]" disabled>Loading…</mat-option>
+                      <mat-option *ngIf="noMore[i]" disabled>End of results</mat-option>
                     </mat-autocomplete>
+
                   </div>
 
                   <!-- Action Buttons (Add & Remove) -->