Merge Release 3.6.1 to main

pom.xml

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

src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/manual-indent-dispense/manual-indent-dispense.component.ts

@@ -136,6 +136,13 @@ export class ManualIndentDispenseComponent implements OnInit, DoCheck {
           console.log('Batch list response', batchlistResponse);
           this.batchlist = batchlistResponse.data;
           console.log('this.batchList', this.batchlist);
+          if (this.batchlist.length === 0) {
+            this.confirmationService.alert(
+              this.currentLanguageSet.noBatchesAvailable,
+              'error',
+            );
+            return;
+          } 
           this.openSelectBatchDialog(
             selectedItem,
             this.batchlist,

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

@@ -231,7 +231,9 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
                 <button
                   mat-mini-fab
                   color="primary"
-                  (click)="addToindentItemList(); trackFieldInteraction('Add Button')"
+                  (click)="
+                    addToindentItemList(); trackFieldInteraction('Add Button')
+                  "
                 >
                   <mat-icon>add</mat-icon>
                 </button>
@@ -266,7 +268,10 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
             class="pull-right m-r-5 mat_green"
             *ngIf="!editMode"
             [disabled]="indentRequestForm.invalid"
-            (click)="submitIndentRequest(indentRequestForm); trackFieldInteraction('Save Button')"
+            (click)="
+              submitIndentRequest(indentRequestForm);
+              trackFieldInteraction('Save Button')
+            "
           >
             {{ currentLanguageSet?.common?.save }}
           </button>
@@ -277,7 +282,10 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
             *ngIf="editMode"
             class="pull-right m-r-5 mat_green"
             [disabled]="indentRequestForm.invalid"
-            (click)="updateIndentRequest(indentRequestForm); trackFieldInteraction('Update Button')"
+            (click)="
+              updateIndentRequest(indentRequestForm);
+              trackFieldInteraction('Update Button')
+            "
           >
             {{ currentLanguageSet?.inventory?.update }}
           </button>
@@ -288,7 +296,9 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
             color="primary"
             class="pull-right m-r-5"
             [disabled]="indentRequestForm.pristine"
-            (click)="resetIndentRequestForm(); trackFieldInteraction('Clear Button')"
+            (click)="
+              resetIndentRequestForm(); trackFieldInteraction('Clear Button')
+            "
           >
             {{ currentLanguageSet?.inventory?.clear }}
           </button>

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

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

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

@@ -11,7 +11,9 @@ <h4 class="inline-block" style="font-size: larger">
         class="pull-right button-full-width m-l-5"
         type="button"
         color="primary"
-        (click)="openSearchDialog(); trackFieldInteraction('Advance Search Button')"
+        (click)="
+          openSearchDialog(); trackFieldInteraction('Advance Search Button')
+        "
       >
         {{ currentLanguageSet?.bendetails?.advanceSearch }}
       </button>
@@ -63,9 +65,7 @@ <h4 class="inline-block" style="font-size: larger">
                     !beneficiaryDetailForm.get('beneficiaryID')?.value
                   "
                   (selectionChange)="getVisitDetail()"
-                  (selectionChange)="
-                    trackFieldInteraction('Visit Code')
-                  "
+                  (selectionChange)="trackFieldInteraction('Visit Code')"
                 >
                   <mat-option
                     *ngFor="let visit of beneficiaryDetail"

src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.css

@@ -54,7 +54,29 @@
 .mat_form_field_background_color_table >>> .mdc-text-field--filled, .mdc-text-field--focused {
     /* background-color: #f9f9f9 !important; */
     background-color:unset !important;
+} 
+
+ /* floating label (NO blur) */
+.mat_form_field_background_color_table >>> 
+.mdc-text-field--filled.mdc-text-field--focused {
+    background-color: unset !important;
+}
+.mat_form_field_background_color_table >>> 
+.mdc-floating-label {
+    transform-origin: left top !important;
+    -webkit-font-smoothing: antialiased;
+    text-rendering: optimizeLegibility;
 }
+
+/* Float ABOVE without scaling */
+.mat_form_field_background_color_table >>> 
+.mdc-floating-label--float-above {
+    transform: translateY(-22px) !important;
+    font-size: 12px !important;   
+    line-height: 14px;
+    opacity: 1 !important;
+}
+
 .mat_form_field_background_color_table >>> .mdc-text-field{
     padding: unset !important;
 }

src/app/app-modules/inventory/reports/beneficiary-drug-issue-report/beneficiary-drug-issue-report.component.html

@@ -24,7 +24,7 @@ <h4>{{ currentLanguageSet?.inventory?.beneficiaryDrugIssueReport }}</h4>
               (change)="checkEndDate()"
               [max]="maxEndDate"
               [disabled]="true"
-                (focus)="trackFieldInteraction('Start Date')"
+              (focus)="trackFieldInteraction('Start Date')"
             />
             <mat-datepicker-toggle
               matPrefix
@@ -49,7 +49,7 @@ <h4>{{ currentLanguageSet?.inventory?.beneficiaryDrugIssueReport }}</h4>
               [min]="minEndDate"
               [max]="maxEndDate"
               [disabled]="true"
-                (focus)="trackFieldInteraction('End Date')"
+              (focus)="trackFieldInteraction('End Date')"
             />
             <mat-datepicker-toggle
               matPrefix
@@ -58,21 +58,21 @@ <h4>{{ currentLanguageSet?.inventory?.beneficiaryDrugIssueReport }}</h4>
             <mat-datepicker [style.width]="'100%'" #pickerEnd></mat-datepicker>
           </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
             class="mat_green"
             color="accent"
             type="submit"
             [disabled]="!beneficiaryDrugIssueForm.valid"
-            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
+            (click)="
+              downloadReport(true); trackFieldInteraction('Download Button')
+            "
           >
             {{ currentLanguageSet?.inventory?.download }}
           </button>
         </div>
       </form>
     </div>
-
-
   </div>
 </div>

src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.html

@@ -84,7 +84,9 @@ <h4>{{ currentLanguageSet?.inventory?.consumptionReport }}</h4>
             class="mat_green"
             type="submit"
             [disabled]="!consumptionForm.valid"
-            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
+            (click)="
+              downloadReport(true); trackFieldInteraction('Download Button')
+            "
           >
             {{ currentLanguageSet?.inventory?.download }}
           </button>

src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.html

@@ -85,7 +85,9 @@ <h4>{{ currentLanguageSet?.inventory?.dailyStockDetailsReport }}</h4>
             class="mat_green"
             type="submit"
             [disabled]="!dailyStockDetailsForm.valid"
-            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
+            (click)="
+              downloadReport(true); trackFieldInteraction('Download Button')
+            "
           >
             {{ currentLanguageSet?.inventory?.download }}
           </button>

src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.html

@@ -81,7 +81,9 @@ <h4>{{ currentLanguageSet?.inventory?.dailyStockSummaryReport }}</h4>
           type="submit"
           class="mat_green"
           [disabled]="!dailyStockSummaryForm.valid"
-          (click)="downloadReport(true); trackFieldInteraction('Download Button')"
+          (click)="
+            downloadReport(true); trackFieldInteraction('Download Button')
+          "
         >
           {{ currentLanguageSet?.inventory?.download }}
         </button>

src/app/app-modules/inventory/reports/expiry-report/expiry-report.component.html

@@ -65,7 +65,9 @@ <h4>{{ currentLanguageSet?.inventory?.expiryReport }}</h4>
             type="submit"
             class="mat_green"
             [disabled]="!expiryForm.valid"
-            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
+            (click)="
+              downloadReport(true); trackFieldInteraction('Download Button')
+            "
           >
             {{ currentLanguageSet?.inventory?.download }}
           </button>

src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.css

@@ -1,7 +1,20 @@
-/* CSS files should not be empty SonarQube Bug Fix */
+/* Fix for overlapping at different zoom levels */
+.mat_form_field_background_width {
+    width: 100% !important;
+}
 
+.input-full-width {
+    width: 100% !important;
+}
 
-.mat_form_field_background_width>>>.mat-mdc-text-field-wrapper {
-    width: 125% !important;
+/* Ensure Material form field doesn't overflow */
+::ng-deep .mat_form_field_background_width .mat-mdc-text-field-wrapper {
+    width: 100% !important;
+    max-width: 100% !important;
 }
 
+/* Add some spacing between columns to prevent overlap */
+.row > [class*='col-'] {
+    padding-left: 8px;
+    padding-right: 8px;
+}