diff --git a/pom.xml b/pom.xml
index 2e04373..7c8e092 100644
--- a/pom.xml
+++ b/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.1</version>
+	<version>3.6.0</version>
 	<name>AAM-Inventory-UI</name>
 	<description>Piramal - inventory: Module ui</description>
 	<packaging>war</packaging>
diff --git a/scripts/ci-prebuild.js b/scripts/ci-prebuild.js
index 3561c5f..61039fd 100755
--- a/scripts/ci-prebuild.js
+++ b/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
diff --git a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.html b/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.html
index ae055f3..3fded14 100644
--- a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.html
+++ b/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>
diff --git a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.ts b/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.ts
index e970bef..0f8876d 100644
--- a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.ts
+++ b/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');
+  }
 }
diff --git a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.html b/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.html
index 1de2eec..d824373 100644
--- a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.html
+++ b/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>
diff --git a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.ts b/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.ts
index cb7f3d1..a09f087 100644
--- a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.ts
+++ b/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');
+  }
 }
diff --git a/src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.html b/src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.html
index b0e9d47..c50d8d3 100644
--- a/src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.html
+++ b/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"
diff --git a/src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.ts b/src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.ts
index db910be..6d2ca1f 100644
--- a/src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.ts
+++ b/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');
+  }
 }
diff --git a/src/app/app-modules/inventory/patient-return/patient-return.component.html b/src/app/app-modules/inventory/patient-return/patient-return.component.html
index c6d36fa..9482594 100644
--- a/src/app/app-modules/inventory/patient-return/patient-return.component.html
+++ b/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"
diff --git a/src/app/app-modules/inventory/patient-return/patient-return.component.ts b/src/app/app-modules/inventory/patient-return/patient-return.component.ts
index 11335b5..3987aad 100644
--- a/src/app/app-modules/inventory/patient-return/patient-return.component.ts
+++ b/src/app/app-modules/inventory/patient-return/patient-return.component.ts
@@ -28,6 +28,7 @@ import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { LanguageService } from '../../core/services/language.service';
 import { BenificiaryDetailsComponent } from './benificiary-details/benificiary-details.component';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-patient-return',
@@ -53,6 +54,7 @@ export class PatientReturnComponent implements OnInit, DoCheck {
     private inventoryService: InventoryService,
     private confirmationService: ConfirmationService,
     readonly sessionstorage:SessionStorageService,
+    private trackingService: AmritTrackingService
   ) {}
 
   ngOnInit() {
@@ -216,4 +218,8 @@ export class PatientReturnComponent implements OnInit, DoCheck {
     this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   }
   //--End--
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Patient Return');
+  }
 }
diff --git a/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.html b/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.html
index 00f4f4c..6d421b6 100644
--- a/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.html
+++ b/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.html
@@ -13,6 +13,7 @@ <h4>
           type="button"
           color="primary"
           routerLink="View"
+          (click)="trackFieldInteraction('Previous Records Button')"
         >
           {{ currentLanguageSet?.inventory?.previousRecords }}
         </button>
@@ -22,7 +23,7 @@ <h4>
     <div class="row m-t-10">
       <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
         <mat-form-field
-          class="input-full-width  mat_form_field_background_color_padding"
+          class="input-full-width mat_form_field_background_color_padding"
         >
           <mat-label>{{
             currentLanguageSet?.inventory?.referenceNumber
@@ -35,6 +36,7 @@ <h4>
             formControlName="referenceNumber"
             #referenceNumber
             required
+            (focus)="trackFieldInteraction('Reference Number')"
           />
         </mat-form-field>
         <mat-hint>
@@ -52,9 +54,7 @@ <h4>
       </div>
 
       <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
-        <mat-form-field
-          class="input-full-width"
-        >
+        <mat-form-field class="input-full-width">
           <mat-label>{{ currentLanguageSet?.inventory?.date }}</mat-label>
           <input
             readonly
@@ -62,6 +62,7 @@ <h4>
             [matDatepicker]="picker"
             name="stockEntryDate"
             [formControl]="stockEntryDate"
+            (focus)="trackFieldInteraction('Date')"
           />
           <mat-datepicker-toggle
             [disabled]="true"
@@ -120,6 +121,7 @@ <h4>
                         formControlName="itemName"
                         #itemName
                         maxlength="100"
+                        (focus)="trackFieldInteraction('Item Name')"
                       />
                       <mat-icon
                         *ngIf="!stock.controls['itemName'].disabled"
@@ -157,6 +159,7 @@ <h4>
                         [required]="true"
                         [readonly]="!stock.value.itemID"
                         [(ngModel)]="stock.quantity"
+                        (focus)="trackFieldInteraction('Qty (In Lowest Unit)')"
                       />
                     </mat-form-field>
                   </td>
@@ -185,6 +188,7 @@ <h4>
                         formControlName="totalCostPrice"
                         [required]="true"
                         [readonly]="!stock.value.itemID"
+                        (focus)="trackFieldInteraction('Unit Cost Price')"
                       />
                     </mat-form-field>
                   </td>
@@ -213,6 +217,7 @@ <h4>
                         [required]="true"
                         [readonly]="!stock.value.itemID"
                         (change)="checkForDuplicateBatch(stock, i)"
+                        (focus)="trackFieldInteraction('Batch No')"
                       />
                     </mat-form-field>
                   </td>
@@ -248,6 +253,7 @@ <h4>
                         name="expiryDate"
                         formControlName="expiryDate"
                         (keydown)="preventTyping($event)"
+                        (focus)="trackFieldInteraction('Expiry Date')"
                       />
                       <mat-datepicker-toggle
                         [disabled]="!stock.value.itemID"
@@ -273,6 +279,7 @@ <h4>
                       class="cursorPointer"
                       (click)="removeStock(i, stock)"
                       matTooltip="{{ currentLanguageSet?.inventory?.delete }}"
+                      (click)="trackFieldInteraction('Delete Button')"
                       >delete</mat-icon
                     >
                   </td>
@@ -290,7 +297,11 @@ <h4>
               style="margin-top: 15px"
               *ngIf="physicalStockEntryForm.controls['physicalStock'].valid"
             >
-              <button mat-mini-fab color="primary" (click)="addStock()">
+              <button
+                mat-mini-fab
+                color="primary"
+                (click)="addStock(); trackFieldInteraction('Add Button')"
+              >
                 <mat-icon>add</mat-icon>
               </button>
             </div>
@@ -307,7 +318,7 @@ <h4>
           color="primary"
           class="pull-right m-r-5"
           [disabled]="physicalStockEntryForm.pristine"
-          (click)="reset()"
+          (click)="reset(); trackFieldInteraction('Clear Button')"
         >
           {{ currentLanguageSet?.inventory?.clear }}
         </button>
@@ -318,7 +329,7 @@ <h4>
           mat-raised-button
           class="pull-right m-r-5"
           [disabled]="physicalStockEntryForm.invalid"
-          (click)="savePhysicalStock()"
+          (click)="savePhysicalStock(); trackFieldInteraction('Save Button')"
         >
           {{ currentLanguageSet?.common?.save }}
         </button>
diff --git a/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.ts b/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.ts
index 3c73ff1..2d3d8fd 100644
--- a/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.ts
+++ b/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.ts
@@ -41,6 +41,7 @@ import { SetLanguageComponent } from '../../core/components/set-language.compone
 import { LanguageService } from '../../core/services/language.service';
 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-physical-stock-entry',
@@ -87,7 +88,8 @@ export class PhysicalStockEntryComponent implements OnInit, OnChanges, DoCheck {
     private http_service: LanguageService,
     private dialogService: ConfirmationService,
     private fb: FormBuilder,
-    readonly sessionstorage:SessionStorageService,
+    readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService
   ) {}
   dataSource = new MatTableDataSource<any>();
 
@@ -312,4 +314,8 @@ export class PhysicalStockEntryComponent implements OnInit, OnChanges, DoCheck {
     this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   }
   //--End--
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Physical Stock Entry');
+  }
 }
diff --git a/src/app/app-modules/inventory/reports/beneficiary-drug-issue-report/beneficiary-drug-issue-report.component.html b/src/app/app-modules/inventory/reports/beneficiary-drug-issue-report/beneficiary-drug-issue-report.component.html
index 761a2e5..6925390 100644
--- a/src/app/app-modules/inventory/reports/beneficiary-drug-issue-report/beneficiary-drug-issue-report.component.html
+++ b/src/app/app-modules/inventory/reports/beneficiary-drug-issue-report/beneficiary-drug-issue-report.component.html
@@ -24,6 +24,7 @@ <h4>{{ currentLanguageSet?.inventory?.beneficiaryDrugIssueReport }}</h4>
               (change)="checkEndDate()"
               [max]="maxEndDate"
               [disabled]="true"
+                (focus)="trackFieldInteraction('Start Date')"
             />
             <mat-datepicker-toggle
               matPrefix
@@ -48,6 +49,7 @@ <h4>{{ currentLanguageSet?.inventory?.beneficiaryDrugIssueReport }}</h4>
               [min]="minEndDate"
               [max]="maxEndDate"
               [disabled]="true"
+                (focus)="trackFieldInteraction('End Date')"
             />
             <mat-datepicker-toggle
               matPrefix
@@ -63,7 +65,7 @@ <h4>{{ currentLanguageSet?.inventory?.beneficiaryDrugIssueReport }}</h4>
             color="accent"
             type="submit"
             [disabled]="!beneficiaryDrugIssueForm.valid"
-            (click)="downloadReport(true)"
+            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
           >
             {{ currentLanguageSet?.inventory?.download }}
           </button>
diff --git a/src/app/app-modules/inventory/reports/beneficiary-drug-issue-report/beneficiary-drug-issue-report.component.ts b/src/app/app-modules/inventory/reports/beneficiary-drug-issue-report/beneficiary-drug-issue-report.component.ts
index 52ad2cc..0bc8d9c 100644
--- a/src/app/app-modules/inventory/reports/beneficiary-drug-issue-report/beneficiary-drug-issue-report.component.ts
+++ b/src/app/app-modules/inventory/reports/beneficiary-drug-issue-report/beneficiary-drug-issue-report.component.ts
@@ -27,6 +27,7 @@ import { InventoryService } from '../../shared/service/inventory.service';
 import { ConfirmationService } from '../../../core/services/confirmation.service';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { LanguageService } from 'src/app/app-modules/core/services/language.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 declare global {
   interface Navigator {
@@ -50,6 +51,7 @@ export class BeneficiaryDrugIssueReportComponent implements OnInit, DoCheck {
     private inventoryService: InventoryService,
     private http_service: LanguageService,
     private confirmationService: ConfirmationService,
+    private trackingService: AmritTrackingService
   ) {}
 
   today!: Date;
@@ -295,4 +297,11 @@ export class BeneficiaryDrugIssueReportComponent implements OnInit, DoCheck {
     this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   }
   //--End--
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(
+      fieldName,
+      'Beneficiary Drug Issue Report',
+    );
+  }
 }
diff --git a/src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.html b/src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.html
index e74e0cd..4615241 100644
--- a/src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.html
+++ b/src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.html
@@ -24,6 +24,7 @@ <h4>{{ currentLanguageSet?.inventory?.consumptionReport }}</h4>
               (change)="checkEndDate()"
               [max]="maxEndDate"
               [disabled]="true"
+              (focus)="trackFieldInteraction('Start Date')"
             />
             <mat-datepicker-toggle
               matSuffix
@@ -48,6 +49,7 @@ <h4>{{ currentLanguageSet?.inventory?.consumptionReport }}</h4>
               [disabled]="true"
               [min]="minEndDate"
               [max]="maxEndDate"
+              (focus)="trackFieldInteraction('End Date')"
             />
             <mat-datepicker-toggle
               matSuffix
@@ -67,6 +69,7 @@ <h4>{{ currentLanguageSet?.inventory?.consumptionReport }}</h4>
               [style.width]="'100%'"
               class="input-full-width"
               formControlName="facilityName"
+              (selectionChange)="trackFieldInteraction('Facility')"
             >
               <mat-option *ngFor="let item of facilities" [value]="item">{{
                 item
@@ -74,21 +77,19 @@ <h4>{{ currentLanguageSet?.inventory?.consumptionReport }}</h4>
             </mat-select>
           </mat-form-field>
         </div>
-        <div class="col-3" style="text-align: start;margin-top: 20px;">
+        <div class="col-3" style="text-align: start; margin-top: 20px">
           <button
             mat-raised-button
             color="accent"
             class="mat_green"
             type="submit"
             [disabled]="!consumptionForm.valid"
-            (click)="downloadReport(true)"
+            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
           >
             {{ currentLanguageSet?.inventory?.download }}
           </button>
         </div>
       </form>
     </div>
-
-    
   </div>
 </div>
diff --git a/src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.ts b/src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.ts
index 2cb1919..3865620 100644
--- a/src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.ts
+++ b/src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.ts
@@ -29,6 +29,7 @@ import { ConfirmationService } from '../../../core/services/confirmation.service
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { LanguageService } from 'src/app/app-modules/core/services/language.service';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-consumption-report',
@@ -47,6 +48,7 @@ export class ConsumptionReportComponent implements OnInit, DoCheck {
     private http_service: LanguageService,
     private confirmationService: ConfirmationService,
     readonly sessionstorage:SessionStorageService,
+    private trackingService: AmritTrackingService
   ) {}
 
   today!: Date;
@@ -321,4 +323,8 @@ export class ConsumptionReportComponent implements OnInit, DoCheck {
     this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   }
   //--End--
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Consumption Report');
+  }
 }
diff --git a/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.html b/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.html
index 2e5c5b7..a6e19bf 100644
--- a/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.html
+++ b/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.html
@@ -24,6 +24,7 @@ <h4>{{ currentLanguageSet?.inventory?.dailyStockDetailsReport }}</h4>
               formControlName="startDate"
               [max]="maxEndDate"
               [disabled]="true"
+              (focus)="trackFieldInteraction('Start Date')"
             />
             <mat-datepicker-toggle
               matPrefix
@@ -49,6 +50,7 @@ <h4>{{ currentLanguageSet?.inventory?.dailyStockDetailsReport }}</h4>
               (dateChange)="checkStartDate($event)"
               [max]="maxEndDate"
               [disabled]="true"
+              (click)="trackFieldInteraction('End Date')"
             />
             <mat-datepicker-toggle
               matPrefix
@@ -68,6 +70,7 @@ <h4>{{ currentLanguageSet?.inventory?.dailyStockDetailsReport }}</h4>
               [style.width]="'100%'"
               class="input-full-width"
               formControlName="facilityName"
+              (selectionChange)="trackFieldInteraction('Facility')"
             >
               <mat-option *ngFor="let item of facilities" [value]="item">{{
                 item
@@ -75,21 +78,19 @@ <h4>{{ currentLanguageSet?.inventory?.dailyStockDetailsReport }}</h4>
             </mat-select>
           </mat-form-field>
         </div>
-        
-    <div class="col-3" style="text-align:start;margin-top: 20px;">
-      <button
-        mat-raised-button
-        color="accent"
-        class="mat_green"
-        type="submit"
-        [disabled]="!dailyStockDetailsForm.valid"
-        (click)="downloadReport(true)"
-      >
-        {{ currentLanguageSet?.inventory?.download }}
-      </button>
-    </div>
+        <div class="col-3" style="text-align: start; margin-top: 20px">
+          <button
+            mat-raised-button
+            color="accent"
+            class="mat_green"
+            type="submit"
+            [disabled]="!dailyStockDetailsForm.valid"
+            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
+          >
+            {{ currentLanguageSet?.inventory?.download }}
+          </button>
+        </div>
       </form>
     </div>
-
   </div>
 </div>
diff --git a/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.ts b/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.ts
index 78ca9f4..392e4d9 100644
--- a/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.ts
+++ b/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.ts
@@ -29,6 +29,7 @@ import { ConfirmationService } from '../../../core/services/confirmation.service
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { LanguageService } from 'src/app/app-modules/core/services/language.service';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-daily-stock-details-report',
@@ -47,6 +48,7 @@ export class DailyStockDetailsReportComponent implements OnInit, DoCheck {
     private http_service: LanguageService,
     private confirmationService: ConfirmationService,
     readonly sessionstorage:SessionStorageService,
+    private trackingService: AmritTrackingService
   ) {}
 
   today!: Date;
@@ -316,4 +318,8 @@ export class DailyStockDetailsReportComponent implements OnInit, DoCheck {
     this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   }
   //--End-
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Daily Stock Details Report');
+  }
 }
diff --git a/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.html b/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.html
index c3e936c..9576a9c 100644
--- a/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.html
+++ b/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.html
@@ -23,6 +23,7 @@ <h4>{{ currentLanguageSet?.inventory?.dailyStockSummaryReport }}</h4>
             (dateChange)="checkEndDate($event)"
             [max]="maxEndDate"
             [disabled]="true"
+            (focus)="trackFieldInteraction('Start Date')"
           />
           <mat-datepicker-toggle
             matSuffix
@@ -48,6 +49,7 @@ <h4>{{ currentLanguageSet?.inventory?.dailyStockSummaryReport }}</h4>
             (dateChange)="checkStartDate($event)"
             [min]="minEndDate"
             [max]="maxEndDate"
+            (focus)="trackFieldInteraction('End Date')"
           />
           <mat-datepicker-toggle
             matSuffix
@@ -57,32 +59,33 @@ <h4>{{ currentLanguageSet?.inventory?.dailyStockSummaryReport }}</h4>
         </mat-form-field>
       </div>
       <div class="col-3">
-        <mat-form-field
-          class="mat_form_field_background_width"
-        >
+        <mat-form-field class="mat_form_field_background_width">
           <mat-label>
             {{ currentLanguageSet?.inventory?.facility }}
           </mat-label>
-          <mat-select [style.width]="'100%'" formControlName="facilityName">
+          <mat-select
+            [style.width]="'100%'"
+            formControlName="facilityName"
+            (selectionChange)="trackFieldInteraction('Facility')"
+          >
             <mat-option *ngFor="let item of facilities" [value]="item">{{
               item
             }}</mat-option>
           </mat-select>
         </mat-form-field>
       </div>
-      <div class="col-3" style="text-align:start;margin-top: 20px;">
+      <div class="col-3" style="text-align: start; margin-top: 20px">
         <button
           mat-raised-button
           color="accent"
           type="submit"
           class="mat_green"
           [disabled]="!dailyStockSummaryForm.valid"
-          (click)="downloadReport(true)"
+          (click)="downloadReport(true); trackFieldInteraction('Download Button')"
         >
           {{ currentLanguageSet?.inventory?.download }}
         </button>
       </div>
     </form>
-    
   </div>
 </div>
diff --git a/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.ts b/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.ts
index 0f96f09..ac9a52f 100644
--- a/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.ts
+++ b/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.ts
@@ -29,6 +29,7 @@ import { ConfirmationService } from '../../../core/services/confirmation.service
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { LanguageService } from 'src/app/app-modules/core/services/language.service';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 @Component({
   selector: 'app-daily-stock-summary-report',
   templateUrl: './daily-stock-summary-report.component.html',
@@ -46,6 +47,7 @@ export class DailyStockSummaryReportComponent implements OnInit, DoCheck {
     private inventoryService: InventoryService,
     private confirmationService: ConfirmationService,
     readonly sessionstorage:SessionStorageService,
+    private trackingService: AmritTrackingService
   ) {}
 
   today!: Date;
@@ -313,4 +315,8 @@ export class DailyStockSummaryReportComponent implements OnInit, DoCheck {
     this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   }
   //--End--
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Daily Stock Summary Report');
+  }
 }
diff --git a/src/app/app-modules/inventory/reports/expiry-report/expiry-report.component.html b/src/app/app-modules/inventory/reports/expiry-report/expiry-report.component.html
index 211d5d3..13be292 100644
--- a/src/app/app-modules/inventory/reports/expiry-report/expiry-report.component.html
+++ b/src/app/app-modules/inventory/reports/expiry-report/expiry-report.component.html
@@ -24,6 +24,7 @@ <h4>{{ currentLanguageSet?.inventory?.expiryReport }}</h4>
               (change)="checkEndDate()"
               [max]="maxEndDate"
               [disabled]="true"
+              (focus)="trackFieldInteraction('Start Date')"
             />
             <mat-datepicker-toggle
               matSuffix
@@ -48,6 +49,7 @@ <h4>{{ currentLanguageSet?.inventory?.expiryReport }}</h4>
               [min]="minEndDate"
               [max]="maxEndDate"
               [disabled]="true"
+              (focus)="trackFieldInteraction('End Date')"
             />
             <mat-datepicker-toggle
               matSuffix
@@ -56,21 +58,19 @@ <h4>{{ currentLanguageSet?.inventory?.expiryReport }}</h4>
             <mat-datepicker [style.width]="'100%'" #pickerEnd></mat-datepicker>
           </mat-form-field>
         </div>
-        
-    <div class="col-3" style="text-align:start;margin-top: 20px;">
-      <button
-        mat-raised-button
-        color="accent"
-        type="submit"
-        class="mat_green"
-        [disabled]="!expiryForm.valid"
-        (click)="downloadReport(true)"
-      >
-        {{ currentLanguageSet?.inventory?.download }}
-      </button>
-    </div>
+        <div class="col-3" style="text-align: start; margin-top: 20px">
+          <button
+            mat-raised-button
+            color="accent"
+            type="submit"
+            class="mat_green"
+            [disabled]="!expiryForm.valid"
+            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
+          >
+            {{ currentLanguageSet?.inventory?.download }}
+          </button>
+        </div>
       </form>
     </div>
-
   </div>
 </div>
diff --git a/src/app/app-modules/inventory/reports/expiry-report/expiry-report.component.ts b/src/app/app-modules/inventory/reports/expiry-report/expiry-report.component.ts
index a72ea60..535b13e 100644
--- a/src/app/app-modules/inventory/reports/expiry-report/expiry-report.component.ts
+++ b/src/app/app-modules/inventory/reports/expiry-report/expiry-report.component.ts
@@ -28,6 +28,7 @@ import { InventoryService } from '../../shared/service/inventory.service';
 import { ConfirmationService } from '../../../core/services/confirmation.service';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { LanguageService } from 'src/app/app-modules/core/services/language.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-expiry-report',
@@ -45,6 +46,7 @@ export class ExpiryReportComponent implements OnInit, DoCheck {
     private inventoryService: InventoryService,
     private http_service: LanguageService,
     private confirmationService: ConfirmationService,
+    private trackingService: AmritTrackingService
   ) {}
   today!: Date;
   minEndDate!: Date;
@@ -283,4 +285,8 @@ export class ExpiryReportComponent implements OnInit, DoCheck {
     this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   }
   //--End--
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Expiry Report');
+  }
 }
diff --git a/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.html b/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.html
index 87357c9..ed0013d 100644
--- a/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.html
+++ b/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.html
@@ -10,7 +10,7 @@ <h4>{{ currentLanguageSet?.inventory?.inwardStockReport }}</h4>
       <form [formGroup]="inwardStockForm" class="row">
         <div class="col-3">
           <mat-form-field
-            class="input-full-width  mat_form_field_background_width"
+            class="input-full-width mat_form_field_background_width"
           >
             <mat-label>
               {{ currentLanguageSet?.inventory?.startDate }}
@@ -24,6 +24,7 @@ <h4>{{ currentLanguageSet?.inventory?.inwardStockReport }}</h4>
               (change)="checkEndDate()"
               [max]="maxEndDate"
               [disabled]="true"
+              (focus)="trackFieldInteraction('Start Date')"
             />
             <mat-datepicker-toggle
               matSuffix
@@ -34,7 +35,7 @@ <h4>{{ currentLanguageSet?.inventory?.inwardStockReport }}</h4>
         </div>
         <div class="col-3">
           <mat-form-field
-            class="input-full-width  mat_form_field_background_width"
+            class="input-full-width mat_form_field_background_width"
           >
             <mat-label>
               {{ currentLanguageSet?.inventory?.endDate }}
@@ -48,6 +49,7 @@ <h4>{{ currentLanguageSet?.inventory?.inwardStockReport }}</h4>
               [min]="minEndDate"
               [max]="maxEndDate"
               [disabled]="true"
+              (focus)="trackFieldInteraction('End Date')"
             />
             <mat-datepicker-toggle
               matSuffix
@@ -58,32 +60,35 @@ <h4>{{ currentLanguageSet?.inventory?.inwardStockReport }}</h4>
         </div>
         <div class="col-3">
           <mat-form-field
-            class="input-full-width  mat_form_field_background_width"
+            class="input-full-width mat_form_field_background_width"
           >
             <mat-label>
               {{ currentLanguageSet?.inventory?.facility }}
             </mat-label>
-            <mat-select [style.width]="'100%'" formControlName="facilityName">
+            <mat-select
+              [style.width]="'100%'"
+              formControlName="facilityName"
+              (selectionChange)="trackFieldInteraction('Facility')"
+            >
               <mat-option *ngFor="let item of facilities" [value]="item">{{
                 item
               }}</mat-option>
             </mat-select>
           </mat-form-field>
         </div>
-        <div class="col-3" style="text-align:start;margin-top: 20px;">
+        <div class="col-3" style="text-align: start; margin-top: 20px">
           <button
             mat-raised-button
             color="accent"
             class="mat_green"
             type="submit"
             [disabled]="!inwardStockForm.valid"
-            (click)="downloadReport(true)"
+            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
           >
             {{ currentLanguageSet?.inventory?.download }}
           </button>
         </div>
       </form>
     </div>
-    
   </div>
 </div>
diff --git a/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.ts b/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.ts
index a76b7e1..e3cbcc2 100644
--- a/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.ts
+++ b/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.ts
@@ -31,6 +31,7 @@ import { ConfirmationService } from '../../../core/services/confirmation.service
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { LanguageService } from 'src/app/app-modules/core/services/language.service';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-inward-stock-report',
@@ -49,6 +50,7 @@ export class InwardStockReportComponent implements OnInit, DoCheck {
     private http_service: LanguageService,
     private confirmationService: ConfirmationService,
     readonly sessionstorage:SessionStorageService,
+    private trackingService: AmritTrackingService
   ) {}
 
   today!: Date;
@@ -317,4 +319,8 @@ export class InwardStockReportComponent implements OnInit, DoCheck {
     this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   }
   //--End--
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Inward Stock Report');
+  }
 }
diff --git a/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.html b/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.html
index 5002ede..b86cec4 100644
--- a/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.html
+++ b/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.html
@@ -9,9 +9,7 @@ <h4>{{ currentLanguageSet?.inventory?.monthlyReport }}</h4>
     <div class="col-12">
       <form [formGroup]="monthlyForm" class="row">
         <div class="col-3 box">
-          <mat-form-field
-            class="input-full-width  "
-          >
+          <mat-form-field class="input-full-width">
             <mat-label>
               {{ currentLanguageSet?.inventory?.selectmonth }}
             </mat-label>
@@ -21,6 +19,7 @@ <h4>{{ currentLanguageSet?.inventory?.monthlyReport }}</h4>
               id="month"
               formControlName="month"
               required
+              (selectionChange)="trackFieldInteraction('Select month')"
             >
               <mat-option *ngFor="let month of months" [value]="month">{{
                 month.name
@@ -30,9 +29,7 @@ <h4>{{ currentLanguageSet?.inventory?.monthlyReport }}</h4>
         </div>
 
         <div class="col-3 box">
-          <mat-form-field
-            class="input-full-width  "
-          >
+          <mat-form-field class="input-full-width">
             <mat-label>
               {{ currentLanguageSet?.inventory?.selectyear }}
             </mat-label>
@@ -42,6 +39,7 @@ <h4>{{ currentLanguageSet?.inventory?.monthlyReport }}</h4>
               id="year"
               formControlName="year"
               required
+              (selectionChange)="trackFieldInteraction('Select year')"
             >
               <mat-option *ngFor="let year of years" [value]="year">{{
                 year
@@ -50,34 +48,34 @@ <h4>{{ currentLanguageSet?.inventory?.monthlyReport }}</h4>
           </mat-form-field>
         </div>
         <div class="col-3">
-          <mat-form-field
-            class="input-full-width  "
-          >
+          <mat-form-field class="input-full-width">
             <mat-label>
               {{ currentLanguageSet?.inventory?.facility }}
             </mat-label>
-            <mat-select [style.width]="'100%'" formControlName="facilityName">
+            <mat-select
+              [style.width]="'100%'"
+              formControlName="facilityName"
+              (selectionChange)="trackFieldInteraction('Facility')"
+            >
               <mat-option *ngFor="let item of facilities" [value]="item">{{
                 item
               }}</mat-option>
             </mat-select>
           </mat-form-field>
         </div>
-        <div class="col-3" style="text-align:start;margin-top: 20px;">
+        <div class="col-3" style="text-align: start; margin-top: 20px">
           <button
             mat-raised-button
             color="accent"
             class="mat_green"
             type="submit"
             [disabled]="!monthlyForm.valid"
-            (click)="downloadReport(true)"
+            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
           >
             {{ currentLanguageSet?.inventory?.download }}
           </button>
         </div>
       </form>
     </div>
-
-    
   </div>
 </div>
diff --git a/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.ts b/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.ts
index bfece5f..26a7ea5 100644
--- a/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.ts
+++ b/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.ts
@@ -29,6 +29,7 @@ import { ConfirmationService } from '../../../core/services/confirmation.service
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { LanguageService } from 'src/app/app-modules/core/services/language.service';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-monthly-report',
@@ -47,6 +48,7 @@ export class MonthlyReportComponent implements OnInit, DoCheck {
     private http_service: LanguageService,
     private confirmationService: ConfirmationService,
     readonly sessionstorage:SessionStorageService,
+    private trackingService: AmritTrackingService
   ) {}
 
   today!: Date;
@@ -311,4 +313,8 @@ export class MonthlyReportComponent implements OnInit, DoCheck {
     this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   }
   //--End--
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Monthly Report');
+  }
 }
diff --git a/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.html b/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.html
index 893a8ee..7c99011 100644
--- a/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.html
+++ b/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.html
@@ -22,6 +22,7 @@ <h4>{{ currentLanguageSet?.inventory?.shortExpiryReport }}</h4>
             [max]="maxEndDate"
             formControlName="startDate"
             [readonly]="true"
+            (focus)="trackFieldInteraction('Date')"
           />
 
           <mat-datepicker-toggle
@@ -41,7 +42,7 @@ <h4>{{ currentLanguageSet?.inventory?.shortExpiryReport }}</h4>
           color="accent"
           class="mat_green"
           type="submit"
-          (click)="downloadReport(true)"
+          (click)="downloadReport(true); trackFieldInteraction('Download Button')"
         >
           {{ currentLanguageSet?.inventory?.download }}
         </button>
diff --git a/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.ts b/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.ts
index 45bd914..7ee6c25 100644
--- a/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.ts
+++ b/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.ts
@@ -28,6 +28,7 @@ import { InventoryService } from '../../shared/service/inventory.service';
 import { ConfirmationService } from '../../../core/services/confirmation.service';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { LanguageService } from 'src/app/app-modules/core/services/language.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 
 @Component({
@@ -46,6 +47,7 @@ export class ShortExpiryReportComponent implements OnInit, DoCheck {
     private inventoryService: InventoryService,
     private http_service: LanguageService,
     private confirmationService: ConfirmationService,
+    private trackingService: AmritTrackingService
     private sessionstorage: SessionStorageService
   ) {}
 
@@ -249,4 +251,11 @@ export class ShortExpiryReportComponent implements OnInit, DoCheck {
     this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   }
   //--End--
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(
+      fieldName,
+      'Short Expiry Report',
+    );
+  }
 }
diff --git a/src/app/app-modules/inventory/reports/transit-report/transit-report.component.html b/src/app/app-modules/inventory/reports/transit-report/transit-report.component.html
index b562c33..562426d 100644
--- a/src/app/app-modules/inventory/reports/transit-report/transit-report.component.html
+++ b/src/app/app-modules/inventory/reports/transit-report/transit-report.component.html
@@ -23,6 +23,7 @@ <h4>{{ currentLanguageSet?.inventory?.transitReport }}</h4>
             (change)="checkEndDate()"
             [max]="maxEndDate"
             [disabled]="true"
+            (focus)="trackFieldInteraction('Start Date')"
           />
           <mat-datepicker-toggle
             matSuffix
@@ -47,6 +48,7 @@ <h4>{{ currentLanguageSet?.inventory?.transitReport }}</h4>
             [min]="minEndDate"
             [max]="maxEndDate"
             [disabled]="true"
+            (focus)="trackFieldInteraction('End Date')"
           />
           <mat-datepicker-toggle
             matSuffix
@@ -62,7 +64,7 @@ <h4>{{ currentLanguageSet?.inventory?.transitReport }}</h4>
           class="mat_green"
           type="submit"
           [disabled]="!transitForm.valid"
-          (click)="downloadReport(true)"
+          (click)="downloadReport(true); trackFieldInteraction('Download Button')"
         >
           {{ currentLanguageSet?.inventory?.download }}
         </button>
diff --git a/src/app/app-modules/inventory/reports/transit-report/transit-report.component.ts b/src/app/app-modules/inventory/reports/transit-report/transit-report.component.ts
index 3a489ec..b999f4e 100644
--- a/src/app/app-modules/inventory/reports/transit-report/transit-report.component.ts
+++ b/src/app/app-modules/inventory/reports/transit-report/transit-report.component.ts
@@ -28,6 +28,7 @@ import { InventoryService } from '../../shared/service/inventory.service';
 import { ConfirmationService } from '../../../core/services/confirmation.service';
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { LanguageService } from 'src/app/app-modules/core/services/language.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-transit-report',
@@ -45,6 +46,7 @@ export class TransitReportComponent implements OnInit, DoCheck {
     private inventoryService: InventoryService,
     private http_service: LanguageService,
     private confirmationService: ConfirmationService,
+    private trackingService: AmritTrackingService
   ) {}
 
   today!: Date;
@@ -285,4 +287,8 @@ export class TransitReportComponent implements OnInit, DoCheck {
     this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   }
   //--End--
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Transit Report');
+  }
 }
diff --git a/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.html b/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.html
index 963bfd7..89b31b9 100644
--- a/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.html
+++ b/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.html
@@ -9,9 +9,7 @@ <h4>{{ currentLanguageSet?.inventory?.yearlyReport }}</h4>
     <div class="col-12">
       <form [formGroup]="yearlyForm" class="row">
         <div class="col-3">
-          <mat-form-field
-            class="mat_form_field_background_width "
-          >
+          <mat-form-field class="mat_form_field_background_width ">
             <mat-label>
               {{ currentLanguageSet?.inventory?.selectyear }}
             </mat-label>
@@ -21,6 +19,7 @@ <h4>{{ currentLanguageSet?.inventory?.yearlyReport }}</h4>
               id="year"
               formControlName="year"
               required
+              (selectionChange)="trackFieldInteraction('Select year')"
             >
               <mat-option *ngFor="let year of years" [value]="year">{{
                 year
@@ -29,9 +28,7 @@ <h4>{{ currentLanguageSet?.inventory?.yearlyReport }}</h4>
           </mat-form-field>
         </div>
         <div class="col-3">
-          <mat-form-field
-            class="mat_form_field_background_width "
-          >
+          <mat-form-field class="mat_form_field_background_width ">
             <mat-label>
               {{ currentLanguageSet?.inventory?.facility }}
             </mat-label>
@@ -39,6 +36,7 @@ <h4>{{ currentLanguageSet?.inventory?.yearlyReport }}</h4>
               [style.width]="'100%'"
               class="input-full-width"
               formControlName="facilityName"
+              (selectionChange)="trackFieldInteraction('Facility')"
             >
               <mat-option *ngFor="let item of facilities" [value]="item">{{
                 item
@@ -53,7 +51,7 @@ <h4>{{ currentLanguageSet?.inventory?.yearlyReport }}</h4>
             class="mat_green"
             type="submit"
             [disabled]="!yearlyForm.valid"
-            (click)="downloadReport(true)"
+            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
           >
             {{ currentLanguageSet?.inventory?.download }}
           </button>
diff --git a/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.ts b/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.ts
index c666d51..d6d1e85 100644
--- a/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.ts
+++ b/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.ts
@@ -29,6 +29,7 @@ import { ConfirmationService } from '../../../core/services/confirmation.service
 import { SetLanguageComponent } from 'src/app/app-modules/core/components/set-language.component';
 import { LanguageService } from 'src/app/app-modules/core/services/language.service';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-yearly-report',
@@ -47,6 +48,7 @@ export class YearlyReportComponent implements OnInit, DoCheck {
     private http_service: LanguageService,
     private confirmationService: ConfirmationService,
     readonly sessionstorage:SessionStorageService,
+    private trackingService: AmritTrackingService
   ) {}
 
   today!: Date;
@@ -280,4 +282,8 @@ export class YearlyReportComponent implements OnInit, DoCheck {
     this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   }
   //--End--
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Yearly Report');
+  }
 }
diff --git a/src/app/app-modules/inventory/store-self-consumption/store-self-consumption.component.html b/src/app/app-modules/inventory/store-self-consumption/store-self-consumption.component.html
index b1daf9c..7093ec2 100644
--- a/src/app/app-modules/inventory/store-self-consumption/store-self-consumption.component.html
+++ b/src/app/app-modules/inventory/store-self-consumption/store-self-consumption.component.html
@@ -14,6 +14,7 @@ <h4 style="font-size: larger">
           type="button"
           color="primary"
           routerLink="View"
+          (click)="trackFieldInteraction('Previous Records Button')"
         >
           {{ currentLanguageSet?.inventory?.previousRecords }}
         </button>
@@ -21,9 +22,7 @@ <h4 style="font-size: larger">
     </div>
 
     <div class="row m-t-10">
-      <div
-        class="col-xs-12 col-sm-4 col-md-4 col-lg-3 "
-      >
+      <div class="col-xs-12 col-sm-4 col-md-4 col-lg-3">
         <mat-form-field class="input-full-width">
           <mat-label>{{
             currentLanguageSet?.inventory?.referenceNumber
@@ -36,6 +35,7 @@ <h4 style="font-size: larger">
             name="referenceNumber"
             formControlName="referenceNumber"
             #referenceNumber
+            (focus)="trackFieldInteraction('Reference Number')"
           />
         </mat-form-field>
         <mat-hint>
@@ -52,9 +52,7 @@ <h4 style="font-size: larger">
         </mat-hint>
       </div>
       <div class="col-xs-12 col-sm-4 col-md-4 col-lg-3">
-        <mat-form-field
-          class="input-full-width "
-        >
+        <mat-form-field class="input-full-width">
           <mat-label>{{
             currentLanguageSet?.inventory?.consumptionReason
           }}</mat-label>
@@ -65,6 +63,7 @@ <h4 style="font-size: larger">
             maxlength="100"
             name="dispenseReason"
             formControlName="dispenseReason"
+            (focus)="trackFieldInteraction('Consumption Reason')"
           />
         </mat-form-field>
       </div>
@@ -118,6 +117,7 @@ <h4 style="font-size: larger">
                       required
                       name="itemName"
                       formControlName="itemName"
+                      (focus)="trackFieldInteraction('Item Name')"
                     />
                     <mat-icon
                       *ngIf="!element.controls?.['itemName']?.disabled"
@@ -152,6 +152,7 @@ <h4 style="font-size: larger">
                       name="batchNo"
                       formControlName="batchNo"
                       readonly
+                      (focus)="trackFieldInteraction('Batch No')"
                     />
                   </mat-form-field>
                 </td>
@@ -177,6 +178,7 @@ <h4 style="font-size: larger">
                       name="quantityInHand"
                       formControlName="quantityInHand"
                       readonly
+                      (focus)="trackFieldInteraction('QOH')"
                     />
                   </mat-form-field>
                 </td>
@@ -208,6 +210,7 @@ <h4 style="font-size: larger">
                         ('' + element.value?.quantityInHand).length
                       "
                       (blur)="validateRequestedQuantity(element)"
+                      (focus)="trackFieldInteraction('Quantity')"
                     />
                   </mat-form-field>
                 </td>
@@ -224,7 +227,7 @@ <h4 style="font-size: larger">
                   <mat-icon
                     class="icon-remove cursorPointer"
                     matTooltip="{{ currentLanguageSet?.inventory?.delete }}"
-                    (click)="removeDispensedStock(i, element)"
+                    (click)="removeDispensedStock(i, element); trackFieldInteraction('Delete Button')"
                     >delete</mat-icon
                   >
                 </td>
@@ -245,7 +248,7 @@ <h4 style="font-size: larger">
                 type="button"
                 class="pull-right"
                 color="primary"
-                (click)="addDispensedStock()"
+                (click)="addDispensedStock(); trackFieldInteraction('Add Button')"
               >
                 <mat-icon>add</mat-icon>
               </button>
@@ -262,7 +265,7 @@ <h4 style="font-size: larger">
           mat-raised-button
           class="pull-right m-r-5"
           [disabled]="storeSelfConsumptionForm.invalid"
-          (click)="saveSelfConsumptionStock()"
+          (click)="saveSelfConsumptionStock(); trackFieldInteraction('Save Button')"
         >
           {{ currentLanguageSet?.common?.save }}
         </button>
@@ -271,7 +274,7 @@ <h4 style="font-size: larger">
           mat-raised-button
           class="pull-right m-r-5"
           [disabled]="storeSelfConsumptionForm.pristine"
-          (click)="reset()"
+          (click)="reset(); trackFieldInteraction('Clear Button')"
         >
           {{ currentLanguageSet?.inventory?.clear }}
         </button>
diff --git a/src/app/app-modules/inventory/store-self-consumption/store-self-consumption.component.ts b/src/app/app-modules/inventory/store-self-consumption/store-self-consumption.component.ts
index 860f3b9..2711a8d 100644
--- a/src/app/app-modules/inventory/store-self-consumption/store-self-consumption.component.ts
+++ b/src/app/app-modules/inventory/store-self-consumption/store-self-consumption.component.ts
@@ -35,6 +35,7 @@ import { SetLanguageComponent } from '../../core/components/set-language.compone
 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';
 
 export interface PeriodicElement {
   itemName: string;
@@ -75,6 +76,7 @@ export class StoreSelfConsumptionComponent implements OnInit, DoCheck {
     private inventoryService: InventoryService,
     private alertService: ConfirmationService,
     readonly sessionstorage:SessionStorageService,
+    private trackingService: AmritTrackingService 
   ) {
     this.subs = this.inventoryService
       .getDialogClosedObservable()
@@ -277,4 +279,8 @@ export class StoreSelfConsumptionComponent implements OnInit, DoCheck {
     this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   }
   //--End--
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Store Self Consumption');
+  }
 }
diff --git a/src/app/app-modules/inventory/store-stock-adjustment/store-stock-adjustment.component.html b/src/app/app-modules/inventory/store-stock-adjustment/store-stock-adjustment.component.html
index e7c7a94..f3b6825 100644
--- a/src/app/app-modules/inventory/store-stock-adjustment/store-stock-adjustment.component.html
+++ b/src/app/app-modules/inventory/store-stock-adjustment/store-stock-adjustment.component.html
@@ -14,6 +14,7 @@ <h4 style="font-size: larger">
         type="button"
         color="primary"
         routerLink="/inventory/storeStockAdjustment/view"
+        (click)="trackFieldInteraction('Previous Records Button')"
       >
         {{ currentLanguageSet?.inventory?.previousRecords }}
       </button>
@@ -25,6 +26,7 @@ <h4 style="font-size: larger">
         type="button"
         color="primary"
         routerLink="/inventory/storeStockAdjustmentDraft/view"
+        (click)="trackFieldInteraction('Previous Draft Records Button')"
       >
         {{ currentLanguageSet?.inventory?.previousDraftRecords }}
       </button>
@@ -35,6 +37,7 @@ <h4 style="font-size: larger">
         class="pull-right button-full-width"
         type="button"
         color="primary"
+        (click)="trackFieldInteraction('Add E-Aushadhi Stock Button')"
       >
         Add E-Aushadhi Stock
       </button>
@@ -51,11 +54,9 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
     </div>
   </div>
   <form [formGroup]="storeStockAdjustmentForm" autocomplete="off" novalidate>
-    <div class="row m-t-20 ">
+    <div class="row m-t-20">
       <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3 box">
-        <mat-form-field
-          class="input-full-width "
-        >
+        <mat-form-field class="input-full-width">
           <mat-label>{{
             currentLanguageSet?.inventory?.adjustmentDate
           }}</mat-label>
@@ -65,6 +66,7 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
             autocomplete="off"
             name="adjustmentDate"
             formControlName="adjustmentDate"
+            (focus)="trackFieldInteraction('Adjustment Date')"
           />
           <mat-datepicker-toggle
             matPrefix
@@ -76,7 +78,7 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
 
       <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3 box">
         <mat-form-field
-          class="input-full-width  mat_form_field_background_color_padding"
+          class="input-full-width mat_form_field_background_color_padding"
         >
           <mat-label>{{
             currentLanguageSet?.inventory?.referenceNumber
@@ -87,6 +89,7 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
             name="refNo"
             formControlName="refNo"
             required
+            (focus)="trackFieldInteraction('Reference Number')"
           />
         </mat-form-field>
       </div>
@@ -144,6 +147,7 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
                       formControlName="itemName"
                       maxlength="100"
                       required
+                      (focus)="trackFieldInteraction('Item Name')"
                     />
                     <mat-icon
                       *ngIf="!stock.controls['itemName'].disabled"
@@ -180,6 +184,7 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
                       formControlName="batchID"
                       required
                       readonly
+                      (focus)="trackFieldInteraction('Batch ID')"
                     />
                   </mat-form-field>
                 </td>
@@ -206,6 +211,7 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
                       formControlName="quantityInHand"
                       required
                       readonly
+                      (focus)="trackFieldInteraction('QOH')"
                     />
                   </mat-form-field>
                 </td>
@@ -230,6 +236,9 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
                       name="adjustmentType"
                       formControlName="adjustmentType"
                       (selectionChange)="calculateQOHAfterAdjustment(stock)"
+                      (selectionChange)="
+                        trackFieldInteraction('Adjustment Type')
+                      "
                       required
                     >
                       <mat-option
@@ -267,6 +276,7 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
                       (input)="calculateQOHAfterAdjustment(stock)"
                       allowMax="item.value.quantityInHand"
                       required
+                      (focus)="trackFieldInteraction('Adjustment Quantity')"
                     />
                   </mat-form-field>
 
@@ -285,6 +295,7 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
                       (input)="calculateQOHAfterAdjustment(stock)"
                       allowMax="9999"
                       required
+                      (focus)="trackFieldInteraction('Adjustment Quantity')"
                     />
                   </mat-form-field>
                 </td>
@@ -311,6 +322,7 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
                       formControlName="qohAfterAdjustment"
                       required
                       readonly
+                      (focus)="trackFieldInteraction('QOH After Adjustment')"
                     />
                   </mat-form-field>
                 </td>
@@ -335,6 +347,7 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
                       name="reason"
                       formControlName="reason"
                       required
+                      (focus)="trackFieldInteraction('Reason')"
                     />
                   </mat-form-field>
                 </td>
@@ -353,7 +366,7 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
                   <mat-icon
                     class="icon-remove cursorPointer"
                     matTooltip="{{ currentLanguageSet?.inventory?.delete }}"
-                    (click)="removeFromStockAdjustmentList(i, stock)"
+                    (click)="removeFromStockAdjustmentList(i, stock); trackFieldInteraction('Delete Button')"
                     >delete</mat-icon
                   >
                 </td>
@@ -376,7 +389,7 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
                 mat-mini-fab
                 type="button"
                 color="primary"
-                (click)="addToStockAdjustmentList()"
+                (click)="addToStockAdjustmentList(); trackFieldInteraction('Add Button')"
               >
                 <mat-icon>add</mat-icon>
               </button>
@@ -396,7 +409,7 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
           mat-raised-button
           matTooltip="{{ currentLanguageSet?.inventory?.back }}"
           matTooltipPosition="right"
-          (click)="goBack()"
+          (click)="goBack(); trackFieldInteraction('Back Button')"
         >
           {{ currentLanguageSet?.inventory?.back }}
         </button>
@@ -405,7 +418,7 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
           mat-raised-button
           class="pull-right m-r-5"
           [disabled]="storeStockAdjustmentForm.invalid"
-          (click)="submitStockAdjustmentFinal(storeStockAdjustmentForm)"
+          (click)="submitStockAdjustmentFinal(storeStockAdjustmentForm); trackFieldInteraction('Save Button')"
         >
           {{ currentLanguageSet?.common?.save }}
         </button>
@@ -414,7 +427,7 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
           mat-raised-button
           class="pull-right m-r-5"
           [disabled]="storeStockAdjustmentForm.invalid"
-          (click)="submitStockAdjustmentDraft(storeStockAdjustmentForm)"
+          (click)="submitStockAdjustmentDraft(storeStockAdjustmentForm); trackFieldInteraction('Save Draft Button')"
         >
           {{ currentLanguageSet?.inventory?.saveDraft }}
         </button>
diff --git a/src/app/app-modules/inventory/store-stock-adjustment/store-stock-adjustment.component.ts b/src/app/app-modules/inventory/store-stock-adjustment/store-stock-adjustment.component.ts
index 14fffc4..7abdebd 100644
--- a/src/app/app-modules/inventory/store-stock-adjustment/store-stock-adjustment.component.ts
+++ b/src/app/app-modules/inventory/store-stock-adjustment/store-stock-adjustment.component.ts
@@ -36,6 +36,7 @@ import { InventoryService } from '../shared/service/inventory.service';
 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-store-stock-adjustment',
@@ -77,6 +78,7 @@ export class StoreStockAdjustmentComponent
     private confirmationService: ConfirmationService,
     private inventoryService: InventoryService,
     readonly sessionstorage:SessionStorageService,
+    private trackingService: AmritTrackingService
   ) {
     this.subs = this.inventoryService
       .getDialogClosedObservable()
@@ -469,4 +471,8 @@ export class StoreStockAdjustmentComponent
       },
     );
   }
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Store Stock Adjustment');
+  }
 }
diff --git a/src/app/app-modules/inventory/store-stock-transfer/store-stock-transfer.component.html b/src/app/app-modules/inventory/store-stock-transfer/store-stock-transfer.component.html
index 9cb7232..5109bf2 100644
--- a/src/app/app-modules/inventory/store-stock-transfer/store-stock-transfer.component.html
+++ b/src/app/app-modules/inventory/store-stock-transfer/store-stock-transfer.component.html
@@ -12,6 +12,7 @@ <h4 style="font-size: larger">
         type="button"
         color="primary"
         routerLink="View"
+        (click)="trackFieldInteraction('Previous Records Button')"
       >
         {{ currentLanguageSet?.inventory?.previousRecords }}
       </button>
@@ -21,18 +22,18 @@ <h4 style="font-size: larger">
   <form [formGroup]="stockTransferForm" autocomplete="off">
     <div class="row m-t-10">
       <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
-        <mat-form-field
-          [style.width]="'100%'"
-        >
+        <mat-form-field [style.width]="'100%'">
           <mat-label>{{ currentLanguageSet?.inventory?.date }}</mat-label>
-          <input matInput allowText="alphaspace" formControlName="dated" />
+          <input
+            matInput
+            allowText="alphaspace"
+            formControlName="dated"
+            (focus)="trackFieldInteraction('Date')"
+          />
         </mat-form-field>
       </div>
       <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
-        <mat-form-field
-          [style.width]="'100%'"
-          class=" "
-        >
+        <mat-form-field [style.width]="'100%'" class=" ">
           <mat-label>{{
             currentLanguageSet?.inventory?.referenceNumber
           }}</mat-label>
@@ -42,6 +43,7 @@ <h4 style="font-size: larger">
             allowText="alphanumeric"
             maxlength="20"
             formControlName="referenceNumber"
+            (focus)="trackFieldInteraction('Reference Number')"
           />
         </mat-form-field>
       </div>
@@ -55,6 +57,7 @@ <h4 style="font-size: larger">
         required="true"
         formControlName="transferTo"
         (selectionChange)="resetItemArray()"
+        (selectionChange)="trackFieldInteraction('Transfer To')"
       >
         <mat-option *ngFor="let store of filterStore" [value]="store">
           {{ store.facilityName }}
@@ -348,7 +351,7 @@ <h4 style="font-size: larger">
           class="pull-right m-r-5"
           type="button"
           [disabled]="!stockTransferForm.touched"
-          (click)="resetForm()"
+          (click)="resetForm(); trackFieldInteraction('Clear Button')"
         >
           {{ currentLanguageSet?.inventory?.clear }}
         </button>
@@ -358,7 +361,7 @@ <h4 style="font-size: larger">
           class="pull-right m-r-5"
           type="button"
           [disabled]="!stockTransferForm.valid"
-          (click)="submitTransfers()"
+          (click)="submitTransfers(); trackFieldInteraction('Save Button')"
         >
           {{ currentLanguageSet?.common?.save }}
         </button>
diff --git a/src/app/app-modules/inventory/store-stock-transfer/store-stock-transfer.component.ts b/src/app/app-modules/inventory/store-stock-transfer/store-stock-transfer.component.ts
index d3f7869..337119b 100644
--- a/src/app/app-modules/inventory/store-stock-transfer/store-stock-transfer.component.ts
+++ b/src/app/app-modules/inventory/store-stock-transfer/store-stock-transfer.component.ts
@@ -36,6 +36,7 @@ import { LanguageService } from '../../core/services/language.service';
 import * as moment from 'moment';
 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-store-stock-transfer',
   templateUrl: './store-stock-transfer.component.html',
@@ -77,7 +78,8 @@ export class StoreStockTransferComponent implements OnInit, DoCheck {
     private router: Router,
     private http_service: LanguageService,
     private confirmationService: ConfirmationService,
-    readonly sessionstorage:SessionStorageService,
+    readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService 
   ) {
     this.checkFacility();
   }
@@ -319,4 +321,8 @@ createdBy: this.sessionstorage.getItem('username'),
     this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   }
   //--End--
+
+  trackFieldInteraction(fieldName: string) {
+    this.trackingService.trackFieldInteraction(fieldName, 'Stock Transfer');
+  }
 }
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 06be132..59614d0 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, NavigationStart, NavigationEnd, NavigationError } from '@angular/router';
 import { SpinnerService } from './app-modules/core/services/spinner.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 // import { SpinnerService } from './app-modules/core/services/spinner.service';
 
 @Component({
@@ -12,7 +13,8 @@ export class AppComponent implements OnInit {
 
   constructor(
     private router: Router,
-    private spinnerService: SpinnerService
+    private spinnerService: SpinnerService,
+    private trackingService: AmritTrackingService
   ) { }
 
   ngOnInit() {
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 769d0b2..5768bb5 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -8,6 +8,7 @@ import { BrowserModule } from "@angular/platform-browser";
 import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { AppRoutingModule } from "./app-routing.module";
 import { CookieService } from 'ngx-cookie-service';
+import { TrackingModule } from "Common-UI/src/tracking";
 
 // import { RouteReuseStrategy } from '@angular/router';
 // import { CustomRouteReuseStrategy } from './custom-route-reuse-strategy';
@@ -115,6 +116,7 @@ import { CaptchaComponent } from "./captcha/captcha.component";
     AppRoutingModule,
     CoreModule.forRoot(),
     // Ng2GoogleChartsModule
+    TrackingModule.forRoot(),
   ],
   providers: [
     AuthenticationService,
diff --git a/src/app/facility-selection/facility-selection.component.html b/src/app/facility-selection/facility-selection.component.html
index b36166f..077be98 100644
--- a/src/app/facility-selection/facility-selection.component.html
+++ b/src/app/facility-selection/facility-selection.component.html
@@ -10,10 +10,13 @@
         </div>
             <div class="row">
               <div class="col-xs-12 m-t-25">
-                <mat-radio-group name='isMainStore' formControlName="isMainStore" (change)='checkStores()' (change)='toContinue()'>
+                <mat-radio-group name='isMainStore' formControlName="isMainStore" (change)='checkStores()' (change)='toContinue()'
+                  (change)="trackFieldInteraction('Type of Stores')">
                   <h4><strong>{{currentLanguageSet?.inventory?.typeofStores}}</strong>
-                  <mat-radio-button color="primary" class="radio-btn" value="true">{{currentLanguageSet?.inventory?.mainStore}}</mat-radio-button>
-                  <mat-radio-button color="primary" class="radio-btn" value="false">{{currentLanguageSet?.inventory?.subStore}}</mat-radio-button>
+                  <mat-radio-button color="primary" class="radio-btn" value="true"
+                    (click)="trackFieldInteraction('Main Store')">{{currentLanguageSet?.inventory?.mainStore}}</mat-radio-button>
+                  <mat-radio-button color="primary" class="radio-btn" value="false"
+                    (click)="trackFieldInteraction('Sub Store')">{{currentLanguageSet?.inventory?.subStore}}</mat-radio-button>
                 </h4>
                 </mat-radio-group>
               </div>
@@ -26,6 +29,7 @@ <h4><strong>{{currentLanguageSet?.inventory?.typeofStores}}</strong>
                   formControlName="facility"
                   (selectionChange)="getSubFacility()"
                   (selectionChange)="toContinue()"
+                  (selectionChange)="trackFieldInteraction('Facility Dropdown')"
                 >
                   <mat-option
                     *ngFor="let facility of facilities"
@@ -52,6 +56,7 @@ <h4><strong>{{currentLanguageSet?.inventory?.typeofStores}}</strong>
                   formControlName="subFacility"
                   (selectionChange)='checkSubFacility()'
                   (selectionChange)="toContinue()"
+                  (selectionChange)="trackFieldInteraction('Sub Facility Dropdown')"
                   [disabled]="
                     facilityForm.controls.isMainStore.value === 'true'
                       ? true
@@ -78,9 +83,9 @@ <h4><strong>{{currentLanguageSet?.inventory?.typeofStores}}</strong>
             <div class="row m-t-10 m-b-10">
               <div class="col-xs-12">
                 <button mat-raised-button color="primary" *ngIf="facilityForm.value.isMainStore !== 'false'" class="pull-right submit button-disabled" [disabled]="!facilityForm.value.facility"
-                  (click)='proceedFurther()'>{{currentLanguageSet?.inventory?.continue}}</button>
+                  (click)="proceedFurther(); trackFieldInteraction('Continue Button (Main Store)')">{{currentLanguageSet?.inventory?.continue}}</button>
                 <button mat-raised-button color="primary" *ngIf="facilityForm.value.isMainStore === 'false'" class="pull-right submit button-disabled" [disabled]="!facilityForm.value.facility || !facilityForm.value.subFacility"
-                  (click)='proceedFurther()'>{{currentLanguageSet?.inventory?.continue}}</button>
+                  (click)="proceedFurther(); trackFieldInteraction('Continue Button (Sub Store)')">{{currentLanguageSet?.inventory?.continue}}</button>
               </div>
             </div>
           <!-- </md-card-content> -->
diff --git a/src/app/facility-selection/facility-selection.component.ts b/src/app/facility-selection/facility-selection.component.ts
index 26611fd..175120d 100644
--- a/src/app/facility-selection/facility-selection.component.ts
+++ b/src/app/facility-selection/facility-selection.component.ts
@@ -7,6 +7,7 @@ import { ConfirmationService } from '../app-modules/core/services';
 import { SetLanguageComponent } from '../app-modules/core/components/set-language.component';
 import { LanguageService } from '../app-modules/core/services/language.service';
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 
 @Component({
@@ -33,6 +34,7 @@ export class FacilitySelectionComponent implements OnInit, DoCheck {
     private http_service: LanguageService,
     private confirmationService: ConfirmationService,
     readonly sessionstorage:SessionStorageService,
+    private trackingService: AmritTrackingService
   ) {}
 
   facilityForm = this.fb.group({
@@ -219,4 +221,8 @@ export class FacilitySelectionComponent implements OnInit, DoCheck {
   //   this.languageComponent.setLanguage();
   //   this.currentLanguageSet = this.languageComponent.currentLanguageObject;
   // }
+
+    trackFieldInteraction(fieldName: string) {
+      this.trackingService.trackFieldInteraction(fieldName, 'Facility Selection');
+    }
 }
diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts
index 5d10c71..8031bf2 100644
--- a/src/app/login/login.component.ts
+++ b/src/app/login/login.component.ts
@@ -7,6 +7,7 @@ import * as CryptoJS from 'crypto-js';
 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',
@@ -34,6 +35,7 @@ export class LoginComponent implements OnInit {
     private authService: AuthenticationService,
     private confirmationService: ConfirmationService,
     readonly sessionstorage:SessionStorageService,
+    private trackingService: AmritTrackingService,
     private router: Router) {
       this._keySize = 256;
       this._ivSize = 128;
@@ -122,7 +124,8 @@ export class LoginComponent implements OnInit {
               this.authService.login(this.userName, encryptPassword, true,this.enableCaptcha ? this.captchaToken : undefined).subscribe((userLoggedIn) => {
                 if (userLoggedIn.statusCode == '200') {
                 if (userLoggedIn.data.previlegeObj != null && userLoggedIn.data.previlegeObj != undefined && userLoggedIn.data.previlegeObj[0]) {
-                 
+                 this.sessionstorage.setItem('loginDataResponse', JSON.stringify(userLoggedIn.data));
+                  this.trackingService.setUserId(userLoggedIn.data.userID);
                   this.checkRoleMapped(userLoggedIn.data);
                 } else {
                   this.resetCaptcha();
@@ -223,6 +226,7 @@ export class LoginComponent implements OnInit {
       //localStorage.setItem('userID', loginDataResponse.userID);
       // localStorage.setItem('userName', loginDataResponse.userName);
       this.sessionstorage.setItem('userID', loginDataResponse.userID);
+      this.trackingService.setUserId(loginDataResponse.userID);
       this.sessionstorage.setItem('userName', loginDataResponse.userName);
       // localStorage.setItem('username', this.userName);
       this.sessionstorage.setItem('username', loginDataResponse.userName);
diff --git a/src/environments/environment.ci.ts.template b/src/environments/environment.ci.ts.template
index 2980b0c..a6f6563 100644
--- a/src/environments/environment.ci.ts.template
+++ b/src/environments/environment.ci.ts.template
@@ -14,11 +14,20 @@ const siteKey = '<%= SITE_KEY %>';
 const captchaChallengeURL = '<%= CAPTCHA_CHALLENGE_URL %>';
 const enableCaptcha = <%= ENABLE_CAPTCHA %>;
 
+
 export const environment = {
   production: true,
   countryId: 1,
   encKey: sessionStorageEncKey,
 
+  tracking: {
+    platform: 'matomo',
+    siteId: parseInt('<%= SITE_ID %>'),
+    trackerUrl: '<%= TRACKER_URL %>',
+    trackingPlatform: '<%= TRACKING_PLATFORM %>',
+    enabled: '<%= TRACKING_ENABLED %>' === 'true'
+  },
+
   getBeneficiaryDetail: `registrar/get/benDetailsByRegIDForLeftPanelNew`,
   getBeneficiaryImage: `registrar/getBenImage`,
   getPrescriptions: `${INVENTORY_API}RX/getPrescribedMedicines`,
diff --git a/src/environments/environment.local.ts b/src/environments/environment.local.ts
index 60aab52..15400f0 100644
--- a/src/environments/environment.local.ts
+++ b/src/environments/environment.local.ts
@@ -29,6 +29,14 @@ export const environment = {
   countryId: 1,
   encKey: sessionStorageEncKey,
 
+  tracking: {
+    platform: 'matomo',
+    siteId: 2,  
+    trackerUrl: '//127.0.0.1/',
+    trackingPlatform: 'local',
+    enabled: true 
+  },
+
   getBeneficiaryDetail: `registrar/get/benDetailsByRegIDForLeftPanelNew`,
   getBeneficiaryImage: `registrar/getBenImage`,
   getPrescriptions: `${INVENTORY_API}RX/getPrescribedMedicines`,
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 51e7053..bd52b42 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -30,6 +30,14 @@ export const environment = {
   countryId: 1,
   encKey: sessionStorageEncKey,
 
+  tracking: {
+    platform: 'matomo',
+    siteId: 2,  
+    trackerUrl: 'https://matomo.piramalswasthya.org/',
+    trackingPlatform: 'production',
+    enabled: true 
+  },
+
   getBeneficiaryDetail: `registrar/get/benDetailsByRegIDForLeftPanelNew`,
   getBeneficiaryImage: `registrar/getBenImage`,
   getPrescriptions: `${INVENTORY_API}RX/getPrescribedMedicines`,
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 0edb0e8..e12747a 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -24,6 +24,14 @@ export const environment = {
   countryId: 1,
   encKey: sessionStorageEncKey,
 
+  tracking: {
+    platform: 'matomo',
+    siteId: 2,  
+    trackerUrl: '//127.0.0.1/',
+    trackingPlatform: 'test',
+    enabled: true 
+  },
+
   getBeneficiaryDetail: `registrar/get/benDetailsByRegIDForLeftPanelNew`,
   getBeneficiaryImage: `registrar/getBenImage`,
   getPrescriptions: `${INVENTORY_API}RX/getPrescribedMedicines`,