Skip to content

Commit

Permalink
Merge pull request #6489 from hmislk/Issue#6141
Browse files Browse the repository at this point in the history 
Issue#6141 Closes #6141
  • Loading branch information
@DeshaniPubudu
DeshaniPubudu authored Jul 21, 2024
2 parents d8dc764 + b8cfa3d commit c4a3d5f
Show file tree
Hide file tree
Showing 8 changed files with 135 additions and 85 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/divudi/bean/common/CategoryController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(){
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/divudi/bean/common/PackageItemController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ public List<Item> getServiceItems() {

return serviceItems;
}

public String navigateToPackageItemList(){
return "/admin/pricing/package_item?faces-redirect=true";
}

public void updateFee() {
if (getCurrentPackege() == null) {
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/divudi/bean/common/PackageItemFeeController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/divudi/bean/common/PackageNameController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ public List<Packege> completePack(String query) {
}
return suggestions;
}

public String navigateToPackageNames(){
return "/admin/pricing/package_name?faces-redirect=true";
}

/**
*
Expand Down Expand Up @@ -156,6 +160,7 @@ public List<Packege> getWithoutInativeItems() {
private void recreateModel() {
itemList = null;
items = null;
current = null;
}

/**
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/com/divudi/entity/Item.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,9 @@ public class Item implements Serializable, Comparable<Item> {

@Transient
private String transCodeFromName;

@Lob
private String forGender;

@Column(name = "DTYPE", insertable = false, updatable = false)
private String clazz;
Expand Down Expand Up @@ -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<ReportItem> {

@Override
Expand Down
137 changes: 72 additions & 65 deletions src/main/webapp/admin/pricing/index.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,92 +20,103 @@
ajax="false"
value="Item Fees"
actionListener="#{viewScopeDataTransferController.makeAdminFeesAsPreviousPage()}"
action="#{itemFeeManager.navigateToItemFees()}"/>

<p:commandButton
action="#{itemFeeManager.navigateToItemFees()}">
</p:commandButton>

<p:commandButton
class="w-100"
ajax="false"
value="Fee List Types"
action="#{categoryController.navigateToManageFeeListTypes()}"/>

action="#{categoryController.navigateToManageFeeListTypes()}">
</p:commandButton>

<p:commandButton
class="w-100"
ajax="false"
value="Collecting Centre Item Fees"
action="#{itemFeeManager.navigateToCollectingCentreItemFees()}"/>

<p:commandButton
action="#{itemFeeManager.navigateToCollectingCentreItemFees()}">
</p:commandButton>

<p:commandButton
class="w-100"
ajax="false"
value="Fee List Item Fees"
action="#{itemFeeManager.navigateToFeeListFees()}"/>

action="#{itemFeeManager.navigateToFeeListFees()}">
</p:commandButton>

<p:commandButton
class="w-100"
ajax="false"
value="Item Fees - Multiple"
action="#{itemFeeManager.navigateToItemFeesMultiple()}"/>

<p:commandButton class="w-100"
ajax="false"
value="Item Vise Fees List"
action="#{itemFeeManager.navigateItemViseFeeList}"/>

<p:commandButton class="w-100"
ajax="false"
value="Item Fees List"
action="#{itemFeeManager.navigateItemFeeList}"/>
action="#{itemFeeManager.navigateToItemFeesMultiple()}">
</p:commandButton>

<p:commandButton class="w-100"
ajax="false"
value="Collecting Centre Item Fees List"
action="#{itemFeeManager.navigateToCollectingCentreItemFeeList}"/>

<p:commandButton class="w-100"
ajax="false"
value="Upload Item Fees"
action="#{itemFeeManager.navigateToUploadItemFees()}"/>
<p:commandButton
class="w-100"
ajax="false"
value="Item Vise Fees List"
action="#{itemFeeManager.navigateItemViseFeeList}">
</p:commandButton>

<p:commandButton
class="w-100"
ajax="false"
value="Item Fees List"
action="#{itemFeeManager.navigateItemFeeList}">
</p:commandButton>

<p:commandButton class="w-100"
ajax="false"
value="Upload Collecting Centre Item Fees"
action="#{itemFeeManager.navigateToUploadItemFees()}"/>
<p:commandButton
class="w-100"
ajax="false"
value="Collecting Centre Item Fees List"
action="#{itemFeeManager.navigateToCollectingCentreItemFeeList}">
</p:commandButton>

<p:commandButton
class="w-100"
ajax="false"
value="Upload Item Fees"
action="#{itemFeeManager.navigateToUploadItemFees()}">
</p:commandButton>

<p:commandButton
class="w-100"
ajax="false"
value="Upload Collecting Centre Item Fees"
action="#{itemFeeManager.navigateToUploadItemFees()}">
</p:commandButton>

<p:commandButton class="w-100"
ajax="false"
value="Correct Item Fees"
action="/dataAdmin/bulk_update_itemsFees"/>
<p:commandButton
class="w-100"
ajax="false"
value="Correct Item Fees"
action="/dataAdmin/bulk_update_itemsFees">
</p:commandButton>
</div>
</p:tab>





<p:tab title="Manage Packages">
<div class="d-grid gap-2">
<p:commandButton class="w-100"
ajax="false" value="Package Names"
action="/admin/pricing/package_name"/>
<p:commandButton class="w-100"
ajax="false" value="Add Item to Package"
action="/admin/pricing/package_item"/>
<p:commandButton class="w-100"
ajax="false" value="Manage Package Prices"
action="/admin/pricing/package_item_prices"/>
<!-- <p:commandButton class="w-100"
ajax="false" value="Medical Package Names"
action="/admin/pricing/opd_medical_package_name"/>
<p:commandButton class="w-100"
ajax="false" value="Add Item to Package"
action="/admin/pricing/opd_medical_package_item"/>
<p:commandButton class="w-100"
ajax="false" value="Manage Package Prices"
action="/admin/pricing/opd_medical_package_item_prices"/>-->
<p:commandButton
class="w-100"
ajax="false"
value="Package Names"
action="#{packageNameController.navigateToPackageNames()}">
</p:commandButton>

<p:commandButton
class="w-100"
ajax="false"
value="Add Item to Package"
action="#{packageItemController.navigateToPackageItemList()}">
</p:commandButton>

<p:commandButton
class="w-100"
ajax="false"
value="Manage Package Prices"
action="#{packageItemFeeController.navigateToPackageItemFees()}">
</p:commandButton>
</div>
</p:tab>

Expand Down Expand Up @@ -134,7 +145,7 @@
<p:commandButton
class="w-100"
ajax="false" value="Pharmacy Discounts"
action="/admin/pricing/membership/payment_scheme_discount_pharmacy_by_category"/>
action="/admin/pricing/membership/payment_scheme_discount_pharmacy_by_category?faces-redirect=true"/>
<p:commandButton
class="w-100"
action="#{navigationController.navigateToPaymentSchemeDiscountPharmacyByCategory()}"
Expand Down Expand Up @@ -203,12 +214,8 @@
<p:commandButton ajax="false" value="Channelling Discounts"
action="#{navigationController.navigateToMembershipSchemeDiscountChannelingByDepartment()}"></p:commandButton>


</div>
</p:tab>



</p:accordionPanel>
</p:panel>

Expand Down
6 changes: 3 additions & 3 deletions src/main/webapp/admin/pricing/package_item_prices.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
itemLabel="#{ix.name}"
itemValue="#{ix}" size="30">
<p:ajax event="itemSelect" process="@this" update="cur gpVeda dtbFee" ></p:ajax>
</p:autoComplete></div>

</p:autoComplete>
</div>

</div>
<div class="mt-2">
<p:selectOneListbox id="cur" value="#{packageItemFeeController.currentIx}" class="w-100">
Expand Down
Loading

0 comments on commit c4a3d5f

Please sign in to comment.