From 50eff48bbce09e9262a1573f621dd86032290d0b Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Sun, 21 Jul 2024 08:07:47 +0530 Subject: [PATCH 1/3] Signed-off-by: DamithDeshan --- src/main/java/com/divudi/bean/common/CategoryController.java | 2 +- .../java/com/divudi/bean/common/PackageItemController.java | 4 ++++ .../java/com/divudi/bean/common/PackageItemFeeController.java | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/divudi/bean/common/CategoryController.java b/src/main/java/com/divudi/bean/common/CategoryController.java index 27cb5fb0f1..3591211889 100644 --- a/src/main/java/com/divudi/bean/common/CategoryController.java +++ b/src/main/java/com/divudi/bean/common/CategoryController.java @@ -70,7 +70,7 @@ public class CategoryController implements Serializable { public String navigateToManageFeeListTypes(){ fillFeeItemListTypes(); - return "/admin/pricing/fee_list_types"; + return "/admin/pricing/fee_list_types?faces-redirect=true"; } private void fillFeeItemListTypes(){ diff --git a/src/main/java/com/divudi/bean/common/PackageItemController.java b/src/main/java/com/divudi/bean/common/PackageItemController.java index 39269c6cf6..5d3e7735f0 100644 --- a/src/main/java/com/divudi/bean/common/PackageItemController.java +++ b/src/main/java/com/divudi/bean/common/PackageItemController.java @@ -79,6 +79,10 @@ public List getServiceItems() { return serviceItems; } + + public String navigateToPackageItemList(){ + return "/admin/pricing/package_item?faces-redirect=true"; + } public void updateFee() { if (getCurrentPackege() == null) { diff --git a/src/main/java/com/divudi/bean/common/PackageItemFeeController.java b/src/main/java/com/divudi/bean/common/PackageItemFeeController.java index fa3728f8b9..87652cd567 100644 --- a/src/main/java/com/divudi/bean/common/PackageItemFeeController.java +++ b/src/main/java/com/divudi/bean/common/PackageItemFeeController.java @@ -159,6 +159,10 @@ private void setPakageTotal() { currentPackege.setTotal(total); getPackegeFacade().edit(currentPackege); } + + public String navigateToPackageItemFees(){ + return "/admin/pricing/package_item_prices?faces-redirect=true"; + } public ItemFacade getEjbFacade() { return ejbFacade; From 3bf3a4ea4a6a3515f3772e9273f3f4e64a683412 Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Sun, 21 Jul 2024 08:08:04 +0530 Subject: [PATCH 2/3] Signed-off-by: DamithDeshan --- .../com/divudi/bean/common/PackageNameController.java | 5 +++++ src/main/java/com/divudi/entity/Item.java | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/main/java/com/divudi/bean/common/PackageNameController.java b/src/main/java/com/divudi/bean/common/PackageNameController.java index a3c583f1e7..e84b766905 100644 --- a/src/main/java/com/divudi/bean/common/PackageNameController.java +++ b/src/main/java/com/divudi/bean/common/PackageNameController.java @@ -50,6 +50,10 @@ public List completePack(String query) { } return suggestions; } + + public String navigateToPackageNames(){ + return "/admin/pricing/package_name?faces-redirect=true"; + } /** * @@ -156,6 +160,7 @@ public List getWithoutInativeItems() { private void recreateModel() { itemList = null; items = null; + current = null; } /** diff --git a/src/main/java/com/divudi/entity/Item.java b/src/main/java/com/divudi/entity/Item.java index fd7591bc5e..6f32cccd5c 100644 --- a/src/main/java/com/divudi/entity/Item.java +++ b/src/main/java/com/divudi/entity/Item.java @@ -252,6 +252,9 @@ public class Item implements Serializable, Comparable { @Transient private String transCodeFromName; + + @Lob + private String forGender; @Column(name = "DTYPE", insertable = false, updatable = false) private String clazz; @@ -1394,6 +1397,14 @@ public void setCanRemoveItemfromPackage(boolean canRemoveItemfromPackage) { this.canRemoveItemfromPackage = canRemoveItemfromPackage; } + public String getForGender() { + return forGender; + } + + public void setForGender(String forGender) { + this.forGender = forGender; + } + static class ReportItemComparator implements Comparator { @Override From 2ca86c881722a18779682e482a89d9ccb6de830d Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Sun, 21 Jul 2024 08:08:34 +0530 Subject: [PATCH 3/3] closes#6141 --- src/main/webapp/admin/pricing/index.xhtml | 137 +++++++++--------- .../admin/pricing/package_item_prices.xhtml | 6 +- .../webapp/admin/pricing/package_name.xhtml | 51 +++++-- 3 files changed, 110 insertions(+), 84 deletions(-) diff --git a/src/main/webapp/admin/pricing/index.xhtml b/src/main/webapp/admin/pricing/index.xhtml index 1135f2f972..b54c1af1b9 100644 --- a/src/main/webapp/admin/pricing/index.xhtml +++ b/src/main/webapp/admin/pricing/index.xhtml @@ -20,92 +20,103 @@ ajax="false" value="Item Fees" actionListener="#{viewScopeDataTransferController.makeAdminFeesAsPreviousPage()}" - action="#{itemFeeManager.navigateToItemFees()}"/> - - + + + - + action="#{categoryController.navigateToManageFeeListTypes()}"> + + - - + + + - + action="#{itemFeeManager.navigateToFeeListFees()}"> + - - - - + action="#{itemFeeManager.navigateToItemFeesMultiple()}"> + - - - + + + + - + + + + + + - + + - - - -
- - - - + + + + + + + +
@@ -134,7 +145,7 @@ + action="/admin/pricing/membership/payment_scheme_discount_pharmacy_by_category?faces-redirect=true"/> - - - - diff --git a/src/main/webapp/admin/pricing/package_item_prices.xhtml b/src/main/webapp/admin/pricing/package_item_prices.xhtml index d2c9da3f3e..91cfca7910 100644 --- a/src/main/webapp/admin/pricing/package_item_prices.xhtml +++ b/src/main/webapp/admin/pricing/package_item_prices.xhtml @@ -30,9 +30,9 @@ itemLabel="#{ix.name}" itemValue="#{ix}" size="30"> - - - + + +
diff --git a/src/main/webapp/admin/pricing/package_name.xhtml b/src/main/webapp/admin/pricing/package_name.xhtml index fd5099274e..8c18479dac 100644 --- a/src/main/webapp/admin/pricing/package_name.xhtml +++ b/src/main/webapp/admin/pricing/package_name.xhtml @@ -39,7 +39,7 @@ id="btnDelete" icon="fa fa-trash" onclick="if (!confirm('Are you sure you want to delete this record?')) - return false;" + return false;" action="#{packageNameController.delete()}" value="Delete" update="lstSelect gpDetail msg" process="btnDelete" @@ -49,11 +49,12 @@
-
+
@@ -63,13 +64,13 @@
-
+
- +
- +
-
- - - - +
+ + + + + +
+
+ +
+
+ +
+
+ + + + +
@@ -105,7 +123,8 @@ process="gpDetail btnSave" update="lstSelect selectFocus msg" action="#{packageNameController.saveSelected()}" - class="ui-button-info m-1" + ajax="false" + class="ui-button-info mt-2" >