Release 3.6.0 into main

pom.xml

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

scripts/ci-prebuild.js

@@ -47,6 +47,10 @@ const defaultEnvValues = {
   SITE_KEY:'',
   CAPTCHA_CHALLENGE_URL:'',
   ENABLE_CAPTCHA: false,
+  SITE_ID: '2',
+  TRACKER_URL: 'https://matomo.piramalswasthya.org/',
+  TRACKING_PLATFORM: 'ci',
+  TRACKING_ENABLED: 'true',
 };
 
 // Generate output data

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

@@ -79,6 +79,17 @@ export class HttpInterceptorService implements HttpInterceptor {
       catchError((error: HttpErrorResponse) => {
         console.error(error);
 
+        if (error.status === 401 || error.status === 403) {
+          this.confirmationService.alert(
+            "Session expired. Please log in again to continue", 'error'
+          );
+        } else this.confirmationService.alert(
+          error.error.errorMessage || "Something went wrong. Please try again later.",
+          'error',
+        );
+        this.router.navigate(['/login']);
+        sessionStorage.clear();
+        localStorage.clear();
         this.spinnerService.show();
         return throwError(error.error);
       }),

src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.html

@@ -20,6 +20,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
             id="requestDate"
             formControlName="requestDate"
             [disabled]="true"
+            (focus)="trackFieldInteraction('Indent Date')"
           />
           <mat-datepicker-toggle
             matPrefix
@@ -39,6 +40,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
             allowText="alphanumeric"
             maxlength="20"
             formControlName="referenceNumber"
+            (focus)="trackFieldInteraction('Reference No')"
           />
         </mat-form-field>
       </div>
@@ -53,6 +55,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
             allowText="alphanumericspace"
             maxlength="250"
             formControlName="indentReason"
+            (focus)="trackFieldInteraction('Reason')"
           />
         </mat-form-field>
       </div>
@@ -101,6 +104,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
                         "
                         [itemListForm]="element"
                         required
+                        (focus)="trackFieldInteraction('Item Name')"
                       />
                       <!-- *ngIf="!element.itemNameView.disabled" -->
                       <mat-icon
@@ -138,6 +142,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
                         name="qOH"
                         formControlName="qOH"
                         required
+                        (focus)="trackFieldInteraction('Quantity On Hand')"
                       />
                     </mat-form-field>
                   </td>
@@ -165,6 +170,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
                         [attr.maxlength]="('' + element.qOH).length"
                         (blur)="checkQuantity(element)"
                         required
+                        (focus)="trackFieldInteraction('Required Quantity')"
                       />
                       <!--  -->
                     </mat-form-field>
@@ -189,6 +195,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
                         name="remarks"
                         formControlName="remarks"
                         allowText="alphanumericspace"
+                        (focus)="trackFieldInteraction('Remarks')"
                       />
                     </mat-form-field>
                   </td>
@@ -224,7 +231,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
                 <button
                   mat-mini-fab
                   color="primary"
-                  (click)="addToindentItemList()"
+                  (click)="addToindentItemList(); trackFieldInteraction('Add Button')"
                 >
                   <mat-icon>add</mat-icon>
                 </button>
@@ -245,7 +252,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
             mat-raised-button
             matTooltip="{{ currentLanguageSet?.inventory?.back }}"
             matTooltipPosition="right"
-            (click)="goBack()"
+            (click)="goBack(); trackFieldInteraction('Back Button')"
           >
             {{ currentLanguageSet?.inventory?.back }}
           </button>
@@ -259,7 +266,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
             class="pull-right m-r-5 mat_green"
             *ngIf="!editMode"
             [disabled]="indentRequestForm.invalid"
-            (click)="submitIndentRequest(indentRequestForm)"
+            (click)="submitIndentRequest(indentRequestForm); trackFieldInteraction('Save Button')"
           >
             {{ currentLanguageSet?.common?.save }}
           </button>
@@ -270,7 +277,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
             *ngIf="editMode"
             class="pull-right m-r-5 mat_green"
             [disabled]="indentRequestForm.invalid"
-            (click)="updateIndentRequest(indentRequestForm)"
+            (click)="updateIndentRequest(indentRequestForm); trackFieldInteraction('Update Button')"
           >
             {{ currentLanguageSet?.inventory?.update }}
           </button>
@@ -281,7 +288,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
             color="primary"
             class="pull-right m-r-5"
             [disabled]="indentRequestForm.pristine"
-            (click)="resetIndentRequestForm()"
+            (click)="resetIndentRequestForm(); trackFieldInteraction('Clear Button')"
           >
             {{ currentLanguageSet?.inventory?.clear }}
           </button>

src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.ts

@@ -39,6 +39,7 @@ import { LanguageService } from 'src/app/app-modules/core/services/language.serv
 import { MatTableDataSource } from '@angular/material/table';
 import { Subscription } from 'rxjs';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-indent-request',
@@ -77,6 +78,7 @@ export class IndentRequestComponent implements OnInit, DoCheck {
     private confirmationService: ConfirmationService,
     private dataStorageService: DataStorageService,
     readonly sessionstorage:SessionStorageService,
+    private trackingService: AmritTrackingService
   ) {
     this.subs = this.inventoryService
       .getDialogClosedObservable()
@@ -402,4 +404,8 @@ export class IndentRequestComponent implements OnInit, DoCheck {
     this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   }
   // -----End------
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Indent Request');
+  }
 }

src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.html

@@ -9,7 +9,7 @@ <h4>{{ currentLanguageSet?.inventory?.subStoreIndentOrderWorklist }}</h4>
         class="pull-right button-full-width"
         type="button"
         color="primary"
-        (click)="routeToRaiseRequest()"
+        (click)="routeToRaiseRequest(); trackFieldInteraction('Raise Request Button')"
       >
         {{ currentLanguageSet?.inventory?.raiseRequest }}
       </button>

src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.ts

@@ -31,6 +31,7 @@ import { LanguageService } from 'src/app/app-modules/core/services/language.serv
 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-sub-store-indent-order-worklist',
@@ -60,6 +61,7 @@ export class SubStoreIndentOrderWorklistComponent implements OnInit, DoCheck {
     private confirmationService: ConfirmationService,
     private dataStorageService: DataStorageService,
     readonly sessionstorage:SessionStorageService,
+    private trackingService: AmritTrackingService
   ) {}
 
   ngOnInit() {
@@ -141,4 +143,8 @@ export class SubStoreIndentOrderWorklistComponent implements OnInit, DoCheck {
     this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   }
   // -----End------
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Sub Store Indent Order Worklist');
+  }
 }

src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.html

@@ -11,7 +11,7 @@ <h4 class="inline-block" style="font-size: larger">
         class="pull-right button-full-width m-l-5"
         type="button"
         color="primary"
-        (click)="openSearchDialog()"
+        (click)="openSearchDialog(); trackFieldInteraction('Advance Search Button')"
       >
         {{ currentLanguageSet?.bendetails?.advanceSearch }}
       </button>
@@ -21,6 +21,7 @@ <h4 class="inline-block" style="font-size: larger">
         type="button"
         color="primary"
         routerLink="View"
+        (click)="trackFieldInteraction('Previous Records Button')"
       >
         {{ currentLanguageSet?.inventory?.previousRecords }}
       </button>
@@ -44,6 +45,7 @@ <h4 class="inline-block" style="font-size: larger">
                   id="beneficiaryID"
                   formControlName="beneficiaryID"
                   (keyup)="checkBeneficiary()"
+                  (focus)="trackFieldInteraction('Beneficiary ID')"
                 />
               </mat-form-field>
             </div>
@@ -61,6 +63,9 @@ <h4 class="inline-block" style="font-size: larger">
                     !beneficiaryDetailForm.get('beneficiaryID')?.value
                   "
                   (selectionChange)="getVisitDetail()"
+                  (selectionChange)="
+                    trackFieldInteraction('Visit Code')
+                  "
                 >
                   <mat-option
                     *ngFor="let visit of beneficiaryDetail"
@@ -83,6 +88,7 @@ <h4 class="inline-block" style="font-size: larger">
                   autocomplete="off"
                   formControlName="visitDate"
                   [readonly]="true"
+                  (focus)="trackFieldInteraction('Visit Date')"
                 />
                 <mat-datepicker-toggle
                   matPrefix
@@ -104,6 +110,7 @@ <h4 class="inline-block" style="font-size: larger">
                   id="beneficiaryName"
                   formControlName="beneficiaryName"
                   [readonly]="true"
+                  (focus)="trackFieldInteraction('Patient Name')"
                 />
               </mat-form-field>
             </div>
@@ -118,6 +125,7 @@ <h4 class="inline-block" style="font-size: larger">
                   id="beneficiaryAge"
                   formControlName="beneficiaryAge"
                   [readonly]="true"
+                  (focus)="trackFieldInteraction('Age')"
                 />
               </mat-form-field>
             </div>
@@ -134,6 +142,7 @@ <h4 class="inline-block" style="font-size: larger">
                   id="genderName"
                   formControlName="genderName"
                   [readonly]="true"
+                  (focus)="trackFieldInteraction('Gender')"
                 />
               </mat-form-field>
             </div>
@@ -150,6 +159,7 @@ <h4 class="inline-block" style="font-size: larger">
                   id="doctorName"
                   formControlName="doctorName"
                   [readonly]="true"
+                  (focus)="trackFieldInteraction('Doctor Name')"
                 />
               </mat-form-field>
             </div>
@@ -167,6 +177,7 @@ <h4 class="inline-block" style="font-size: larger">
                   formControlName="reference"
                   maxlength="50"
                   [readonly]="!dateBool"
+                  (focus)="trackFieldInteraction('Remarks')"
                 />
               </mat-form-field>
             </div>
@@ -182,6 +193,7 @@ <h4 class="inline-block" style="font-size: larger">
                 formControlName="medicineDispenseType"
                 [disabled]="!beneficiaryDetailForm.get('visitCode')?.value"
                 (change)="getBeneficiaryDetail()"
+                (change)="trackFieldInteraction('Type of Dispense')"
               >
                 <mat-radio-button
                   color="primary"

src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.ts

@@ -28,6 +28,7 @@ import { LanguageService } from '../../core/services/language.service';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { SearchComponent } from '../../core/components/search/search.component';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-medicine-dispense',
@@ -49,7 +50,8 @@ export class MedicineDispenseComponent implements OnInit, OnDestroy, DoCheck {
     private inventoryService: InventoryService,
     public http_service: LanguageService,
     private dialog: MatDialog,
-    readonly sessionstorage:SessionStorageService,
+    readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService
   ) {}
 
   ngOnInit() {
@@ -316,4 +318,8 @@ export class MedicineDispenseComponent implements OnInit, OnDestroy, DoCheck {
     this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   }
   // -----End------
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Medicine Dispense');
+  }
 }

src/app/app-modules/inventory/patient-return/patient-return.component.html

@@ -16,6 +16,7 @@ <h4 style="font-size: larger">
           type="button"
           color="primary"
           routerLink="previousRecord"
+          (click)="trackFieldInteraction('Previous Records Button')"
         >
           {{ currentLanguageSet?.inventory?.previousRecords }}
         </button>
@@ -24,9 +25,7 @@ <h4 style="font-size: larger">
 
     <div class="row m-t-10">
       <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3" *ngIf="!benSelected">
-        <mat-form-field
-          class="input-full-width "
-        >
+        <mat-form-field class="input-full-width">
           <mat-label>{{
             currentLanguageSet?.inventory?.beneficiaryIDPhoneNumber
           }}</mat-label>
@@ -38,6 +37,7 @@ <h4 style="font-size: larger">
             name="beneficiaryIDOrPhoneNumber"
             formControlName="beneficiaryIDOrPhoneNumber"
             (keyup.enter)="identityQuickSearch(beneficiaryIDOrPhoneNumber)"
+            (focus)="trackFieldInteraction('Beneficiary ID / Phone Number')"
           />
           <mat-icon
             class="search-btn"
@@ -54,9 +54,7 @@ <h4 style="font-size: larger">
         style="display: flex; gap: 10px; margin-top: 30px"
       >
         <div class="col-xs-12 col-sm-4 col-md-4 col-lg-3 box">
-          <mat-form-field
-            class="input-full-width "
-          >
+          <mat-form-field class="input-full-width">
             <mat-label>{{
               currentLanguageSet?.bendetails?.beneficiaryID
             }}</mat-label>
@@ -71,9 +69,7 @@ <h4 style="font-size: larger">
           </mat-form-field>
         </div>
         <div class="col-xs-12 col-sm-4 col-md-4 col-lg-3 box">
-          <mat-form-field
-            class="input-full-width "
-          >
+          <mat-form-field class="input-full-width">
             <mat-label>{{
               currentLanguageSet?.bendetails?.beneficiaryName
             }}</mat-label>
@@ -88,9 +84,7 @@ <h4 style="font-size: larger">
           </mat-form-field>
         </div>
         <div class="col-xs-12 col-sm-4 col-md-4 col-lg-3 box">
-          <mat-form-field
-            class="input-full-width "
-          >
+          <mat-form-field class="input-full-width">
             <mat-label>
               {{ currentLanguageSet?.bendetails?.age }}
             </mat-label>
@@ -105,9 +99,7 @@ <h4 style="font-size: larger">
           </mat-form-field>
         </div>
         <div class="col-xs-12 col-sm-4 col-md-4 col-lg-3 box">
-          <mat-form-field
-            class="input-full-width "
-          >
+          <mat-form-field class="input-full-width">
             <mat-label>{{ currentLanguageSet?.bendetails?.gender }}</mat-label>
             <input
               autocomplete="off"