From 7636f95bb17fef51c6efb98155d681710436d7c7 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Thu, 7 Aug 2025 16:48:40 +0530 Subject: [PATCH 1/6] fix: amm-636 short expiry report --- .../short-expiry-report.component.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) 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 b7fb41e..45bd914 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 { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; @Component({ selector: 'app-short-expiry-report', @@ -45,6 +46,7 @@ export class ShortExpiryReportComponent implements OnInit, DoCheck { private inventoryService: InventoryService, private http_service: LanguageService, private confirmationService: ConfirmationService, + private sessionstorage: SessionStorageService ) {} today!: Date; @@ -82,15 +84,9 @@ export class ShortExpiryReportComponent implements OnInit, DoCheck { startDate.setSeconds(0); startDate.setMilliseconds(0); - console.log( - 'Data form value...', - JSON.stringify(this.shortExpiryForm.value), - ); - const reqObjForShortExpiryReport = {}; - console.log( - 'Data form data', - JSON.stringify(reqObjForShortExpiryReport, null, 4), - ); + const reqObjForShortExpiryReport = { + facilityID: this.sessionstorage.getItem('facilityID') + }; this.inventoryService .getShortExpiryReports(reqObjForShortExpiryReport) From 514c3a2b93cd22fbd2bf49162428bcb485e6dd40 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Thu, 29 Jan 2026 16:01:26 +0530 Subject: [PATCH 2/6] fix: amm-1967 floating label getting blur --- .../physical-stock-entry.component.css | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.css b/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.css index 8fe7b28..7217cc9 100644 --- a/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.css +++ b/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; } From efa088041c674f2339a4405a950a89f4b34fcdd2 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Mon, 2 Feb 2026 14:06:12 +0530 Subject: [PATCH 3/6] fix: amm-1969 batch not appearing after approval or unable to save --- .../manual-indent-dispense.component.ts | 7 +++++++ src/assets/Assamese.json | 3 ++- src/assets/English.json | 3 ++- src/assets/Hindi.json | 3 ++- src/assets/Kannada.json | 3 ++- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/manual-indent-dispense/manual-indent-dispense.component.ts b/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/manual-indent-dispense/manual-indent-dispense.component.ts index 13fd33b..ec0a269 100644 --- a/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/manual-indent-dispense/manual-indent-dispense.component.ts +++ b/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, diff --git a/src/assets/Assamese.json b/src/assets/Assamese.json index ad2a10d..0c30ab6 100644 --- a/src/assets/Assamese.json +++ b/src/assets/Assamese.json @@ -391,6 +391,7 @@ "failedStock": "ব্যৰ্থ ষ্টক" }, - "healthId":"হেল্থ আইডি" + "healthId":"হেল্থ আইডি", + "noBatchesAvailable": "নির্বাচিত আইটেমৰ বাবে কোনো বেচ উপলব্ধ নহয়" } } \ No newline at end of file diff --git a/src/assets/English.json b/src/assets/English.json index cda5c61..08119f0 100644 --- a/src/assets/English.json +++ b/src/assets/English.json @@ -384,6 +384,7 @@ "drugName": "Drug Name", "failedStock": "Failed Stock" }, - "healthId":"Health ID" + "healthId":"Health ID", + "noBatchesAvailable":"No batches available for the selected item" } } diff --git a/src/assets/Hindi.json b/src/assets/Hindi.json index 5892f3b..418581e 100644 --- a/src/assets/Hindi.json +++ b/src/assets/Hindi.json @@ -388,6 +388,7 @@ "drugName": "दवा का नाम", "failedStock": "विफल स्टॉक" }, - "healthId": "हेल्थ आईडी" + "healthId": "हेल्थ आईडी", + "noBatchesAvailable": "चयनित आइटम के लिए कोई बैच उपलब्ध नहीं है" } } \ No newline at end of file diff --git a/src/assets/Kannada.json b/src/assets/Kannada.json index 9a327b1..ea6a164 100644 --- a/src/assets/Kannada.json +++ b/src/assets/Kannada.json @@ -385,6 +385,7 @@ }, "healthId":"ಆರೋಗ್ಯ ಐಡಿ", - "list": "ಪಟ್ಟಿ" + "list": "ಪಟ್ಟಿ", + "noBatchesAvailable":"ಆಯ್ಕೆಮಾಡಿದ ಐಟಂಗೆ ಯಾವುದೇ ಬ್ಯಾಚ್ ಲಭ್ಯವಿಲ್ಲ" } } From 588582db71d89245a4449f1d131b27467ffe58d4 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Mon, 2 Feb 2026 14:45:25 +0530 Subject: [PATCH 4/6] fix: pointing common ui to latest branch 3.6.1 --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index 27a185b..bc6c63e 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 27a185ba15fbefd6333683f5a6bf8495b837f3af +Subproject commit bc6c63e14dce0649fe6f7c0c1de665ce49955680 From 7da10169adad9cb0a0486ee621faa636b78920d5 Mon Sep 17 00:00:00 2001 From: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Date: Wed, 18 Mar 2026 13:41:54 +0530 Subject: [PATCH 5/6] Moving 1971 from Release 3.6.2 to Release-3.6.1 (#116) * fix: amm-1971 overlapping icons * Bump version from 3.6.0 to 3.6.2 * Downgrade version from 3.6.2 to 3.6.1 (#117) --- pom.xml | 2 +- .../inward-stock-report.component.css | 19 +- .../inward-stock-report.component.html | 174 ++++++++---------- 3 files changed, 98 insertions(+), 97 deletions(-) diff --git a/pom.xml b/pom.xml index 7c8e092..8c3ff41 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 com.iemr.aam-inventory-ui aam-inventory-ui - 3.6.0 + 3.6.1 AAM-Inventory-UI Piramal - inventory: Module ui war diff --git a/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.css b/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.css index bad2176..e536358 100644 --- a/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.css +++ b/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; +} \ No newline at end of file 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 83c4eee..32187e6 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 @@ -1,96 +1,84 @@ -
-
-
-

{{ currentLanguageSet?.inventory?.inwardStockReport }}

-
-
- -
-
-
-
- - - {{ currentLanguageSet?.inventory?.startDate }} - - - - - -
-
- - - {{ currentLanguageSet?.inventory?.endDate }} - - - - - -
-
- - - {{ currentLanguageSet?.inventory?.facility }} - - - {{ - item - }} - - -
-
- -
-
-
+ {{ + item + }} + + +
+
+ +
+
From 3ce1f0689f228786eb0e34d4c3582b3e1d62df59 Mon Sep 17 00:00:00 2001 From: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Date: Wed, 18 Mar 2026 13:42:27 +0530 Subject: [PATCH 6/6] Bump version from 3.6.0 to 3.6.1 (#118)