From 3c2cec6e1808a66892700c0994484a0046d19efb Mon Sep 17 00:00:00 2001 From: devikasuresh20 Date: Tue, 10 Jun 2025 11:11:42 +0530 Subject: [PATCH 1/7] fix: dispense screen changes --- .../rx-batch-view.component.html | 4 -- .../rx-batch-view/rx-batch-view.component.ts | 8 ++-- .../rx-item-dispense.component.html | 8 ---- .../shared/utility/prescribed-drug.utility.ts | 40 +++++++++---------- 4 files changed, 24 insertions(+), 36 deletions(-) diff --git a/src/app/app-modules/core/components/rx-batch-view/rx-batch-view.component.html b/src/app/app-modules/core/components/rx-batch-view/rx-batch-view.component.html index 419d921..ae9eb56 100644 --- a/src/app/app-modules/core/components/rx-batch-view/rx-batch-view.component.html +++ b/src/app/app-modules/core/components/rx-batch-view/rx-batch-view.component.html @@ -74,7 +74,6 @@

autocomplete="off" matInput defaultNull - [disabled]="true" name="batchNo" formControlName="batchNo" /> @@ -90,7 +89,6 @@

autocomplete="off" matInput defaultNull - [disabled]="true" name="quantityInHand" formControlName="quantityInHand" /> @@ -109,7 +107,6 @@

matInput defaultNull [required]="batch.value.selection" - [disabled]="editSelection === 1" name="quantity" formControlName="quantity" (blur)=" @@ -125,7 +122,6 @@

}} diff --git a/src/app/app-modules/core/components/rx-batch-view/rx-batch-view.component.ts b/src/app/app-modules/core/components/rx-batch-view/rx-batch-view.component.ts index 9901188..32c555c 100644 --- a/src/app/app-modules/core/components/rx-batch-view/rx-batch-view.component.ts +++ b/src/app/app-modules/core/components/rx-batch-view/rx-batch-view.component.ts @@ -165,10 +165,10 @@ export class RxBatchViewComponent implements OnInit, DoCheck { 'MM/dd/yyyy', ); return this.fb.group({ - expiryDate: formatedExpDate, - batchNo: batch.batchNo, - quantity: batch.quantity, - quantityInHand: batch.qty || batch.quantityInHand, + expiryDate: [{ value: formatedExpDate, disabled: true }], + batchNo: [{ value: batch.batchNo, disabled: true }], + quantity: [{ value: batch.quantity, disabled: selection === 1 ? true : false }], + quantityInHand: [{ value: batch.qty || batch.quantityInHand, disabled: true }], expiresIn: batch.expiresIn, itemStockEntryID: batch.itemStockEntryID, selection: batch.selection || selection === 1 ? true : false, diff --git a/src/app/app-modules/rx/rx-item-dispense/rx-item-dispense.component.html b/src/app/app-modules/rx/rx-item-dispense/rx-item-dispense.component.html index 3b50261..eb09619 100644 --- a/src/app/app-modules/rx/rx-item-dispense/rx-item-dispense.component.html +++ b/src/app/app-modules/rx/rx-item-dispense/rx-item-dispense.component.html @@ -39,7 +39,6 @@ }} diff --git a/src/app/app-modules/rx/shared/utility/prescribed-drug.utility.ts b/src/app/app-modules/rx/shared/utility/prescribed-drug.utility.ts index d59f1ed..8363662 100644 --- a/src/app/app-modules/rx/shared/utility/prescribed-drug.utility.ts +++ b/src/app/app-modules/rx/shared/utility/prescribed-drug.utility.ts @@ -44,26 +44,26 @@ export class PrescribedDrugsUtils { return batches; } - initPrescribedDrugs(drug: any, selection: any): FormGroup { - return this.fb.group({ - duration: drug.duration, - durationUnit: drug.durationUnit, - durationView: `${drug.duration} ${drug.durationUnit}`, - dose: drug.dose, - route: drug.route, - genericDrugName: drug.genericDrugName, - drugStrength: drug.drugStrength, - specialInstruction: drug.specialInstruction, - qtyDispensed: null, - qtyPrescribed: drug.qtyPrescribed, - drugID: drug.drugID, - drugForm: drug.drugForm, - frequency: drug.frequency, - batchList: this.fb.array([]), - selectionBatchList: this.fb.array([]), - preDefinedBatchList: this.initBatchListArray(drug.batchList, selection), - }); - } +initPrescribedDrugs(drug: any, selection: any): FormGroup { + return this.fb.group({ + duration: [{ value: drug.duration, disabled: true }], + durationUnit: [{ value: drug.durationUnit, disabled: true }], + durationView: [{ value: `${drug.duration} ${drug.durationUnit}`, disabled: true }], + dose: [{ value: drug.dose, disabled: true }], + route: [{ value: drug.route, disabled: true }], + genericDrugName: drug.genericDrugName, + drugStrength: drug.drugStrength, + specialInstruction: [{ value: drug.specialInstruction, disabled: true }], + qtyDispensed: [{ value: null, disabled: true }], + qtyPrescribed: [{ value: drug.qtyPrescribed, disabled: true }], + drugID: drug.drugID, + drugForm: [{ value: drug.drugForm, disabled: true }], + frequency: [{ value: drug.frequency, disabled: true }], + batchList: this.fb.array([]), + selectionBatchList: this.fb.array([]), + preDefinedBatchList: this.initBatchListArray(drug.batchList, selection), + }); +} initPrescribedDrugsArray(itemList: any, selection: any): FormArray { const drugArray: FormArray = this.fb.array([]); From 3ac90722ee29232a23caade8373fe1c6499c8072 Mon Sep 17 00:00:00 2001 From: devikasuresh20 Date: Tue, 10 Jun 2025 12:43:20 +0530 Subject: [PATCH 2/7] fix: hwc to aam changes --- README.md | 2 +- src/index.html | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index cee1891..e4aa31d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# HWCInventoryUI +# AAM InventoryUI This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 16.2.10. diff --git a/src/index.html b/src/index.html index 0a4801e..761c2d1 100644 --- a/src/index.html +++ b/src/index.html @@ -1,28 +1,28 @@ - - - HWC Inventory Next - - - + + + AAM Inventory Next + + + - - - - - We are loading your data.....Kindly wait ......... - + + + + We are loading your data.....Kindly wait ......... + + src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" + integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" + crossorigin="anonymous" +> From 6ccff9e2ac89d8e1793fcff6f041f416af4bfcb9 Mon Sep 17 00:00:00 2001 From: devikasuresh20 Date: Tue, 10 Jun 2025 12:45:09 +0530 Subject: [PATCH 3/7] fix: hwc to aam changes --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index 0c71b24..cdaf019 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 0c71b24ce2567446a260c53017c7b304b77c5457 +Subproject commit cdaf01914fd38b26937b5149b31c3b8bf83cb997 From 57d0da6bc7af3e16273e825d237c9c6b5c3078e0 Mon Sep 17 00:00:00 2001 From: devikasuresh20 Date: Tue, 10 Jun 2025 15:46:48 +0530 Subject: [PATCH 4/7] commonui commit changes --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index cdaf019..d4d0658 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit cdaf01914fd38b26937b5149b31c3b8bf83cb997 +Subproject commit d4d0658df8d7b066c1e2a72bc3ad7fdbeda8228f From f493ff5c200be885b1187a889f050514c14af04e Mon Sep 17 00:00:00 2001 From: devikasuresh20 Date: Tue, 10 Jun 2025 16:02:19 +0530 Subject: [PATCH 5/7] adding commonui --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index d4d0658..23b0231 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit d4d0658df8d7b066c1e2a72bc3ad7fdbeda8228f +Subproject commit 23b0231fe0aa9df630289ed20de381b267ed47b2 From 188d523297685ca9b4a457c60c7e8bc783f9bdd3 Mon Sep 17 00:00:00 2001 From: devikasuresh20 Date: Wed, 25 Jun 2025 16:14:58 +0530 Subject: [PATCH 6/7] fix: edit indent screen changes --- .../indent-request/indent-request.component.html | 13 +++++-------- .../indent-request/indent-request.component.ts | 2 +- src/environments/environment.prod.ts | 10 +++++----- src/environments/environment.test.ts | 10 +++++----- 4 files changed, 16 insertions(+), 19 deletions(-) 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 52549b9..ae055f3 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 @@ -29,9 +29,7 @@

{{ currentLanguageSet?.inventory?.indentRequest }}

- + {{ currentLanguageSet?.inventory?.referenceNo }} @@ -45,9 +43,7 @@

{{ currentLanguageSet?.inventory?.indentRequest }}
- + {{ currentLanguageSet?.inventory?.reason }} @@ -270,9 +266,9 @@

{{ currentLanguageSet?.inventory?.indentRequest }}