Skip to content

Commit

Permalink
Merge branch 'development' of https://github.com/hmislk/hmis.git into…
Browse files Browse the repository at this point in the history
… 9947-api_improvements
  • Loading branch information
ChinthakaPrasad committed Jan 7, 2025
2 parents 7994847 + c2fbc60 commit 6179886
Show file tree
Hide file tree
Showing 6 changed files with 201 additions and 159 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2832,7 +2832,7 @@ public void generateCollectionCenterBookWiseDetailReport() {
opdBts.add(BillTypeAtomic.CC_BILL);
opdBts.add(BillTypeAtomic.CC_BILL_CANCELLATION);
opdBts.add(BillTypeAtomic.CC_BILL_REFUND);
opdBts.add(BillTypeAtomic.CC_PAYMENT_RECEIVED_BILL);
// opdBts.add(BillTypeAtomic.CC_PAYMENT_RECEIVED_BILL);

bundle.setName("Bills");
bundle.setBundleType("billList");
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/com/divudi/entity/pharmacy/Stock.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public class Stock implements Serializable, RetirableEntity {
private Date retiredAt;

private String retireComments;
private String stockLocator;

@ManyToOne
Stock parentStock;
Expand Down Expand Up @@ -220,4 +221,12 @@ public void setRetireComments(String retireComments) {
this.retireComments = retireComments;
}

public String getStockLocator() {
return stockLocator;
}

public void setStockLocator(String stockLocator) {
this.stockLocator = stockLocator;
}

}
26 changes: 13 additions & 13 deletions src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -157,27 +157,27 @@
completeMethod="#{stockController.completeAvailableStocks}"
var="i" itemLabel="#{i.itemBatch.item.name}" itemValue="#{i}"
>
<p:column headerText="Item" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<p:column headerText="Item" style="padding: 6px;" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<h:outputLabel value="#{i.itemBatch.item.name}">
&nbsp;<p:tag rendered="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'true': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'true':'false'}" value="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'Expired ':
commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'Expired Soon':''}"
severity="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'danger': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'warning':''}" />
</h:outputLabel>
</p:column>
<p:column headerText="Code" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<p:column style="padding: 6px;" headerText="Code" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<h:outputLabel value="#{i.itemBatch.item.code}" ></h:outputLabel>
</p:column>
<p:column headerText="Stocks" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<p:column style="padding: 6px;" headerText="Stocks" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<h:outputLabel value="#{i.stock}" >
<f:convertNumber pattern="#,###" ></f:convertNumber>
</h:outputLabel>
</p:column>
<p:column headerText="Expiry" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<p:column style="padding: 6px;" headerText="Expiry" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<h:outputLabel value="#{i.itemBatch.dateOfExpire}">
<f:convertDateTime pattern="#{sessionController.applicationPreference.longDateFormat}" ></f:convertDateTime>
</h:outputLabel>
</p:column>
<p:column headerText="Price" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<p:column style="padding: 6px;" headerText="Price" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<h:outputLabel value="#{i.itemBatch.retailsaleRate}">
</h:outputLabel>
</p:column>
Expand Down Expand Up @@ -224,14 +224,14 @@
<p:ajax event="rowEditCancel" listener="#{pharmacySaleBhtController.onEdit}"/>


<p:column headerText="Item" style="width: 30%">
<p:column headerText="Item" style="width: 48%; padding: 6px;">
<h:outputLabel value="#{bi.pharmaceuticalBillItem.itemBatch.item.name}" >
&nbsp;<p:tag rendered="#{commonController.currentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'true': commonController.dateAfterThreeMonthsCurrentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'true':'false'}" value="#{commonController.currentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'Expired ':
commonController.dateAfterThreeMonthsCurrentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'Expired Soon':''}"
severity="#{commonController.currentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'danger': commonController.dateAfterThreeMonthsCurrentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'warning':''}" />
</h:outputLabel>
</p:column>
<p:column headerText="Quantity">
<p:column style="padding: 6px;width: 10%;" headerText="Quantity">
<p:cellEditor>
<f:facet name="output">
<h:outputText value="#{bi.qty}" >
Expand All @@ -243,20 +243,20 @@
</f:facet>
</p:cellEditor>
</p:column>
<p:column >

<p:column style="padding: 6px;width: 15%;" >
<p:rowEditor />
</p:column>



<p:column headerText="Expiry">
<p:column style="padding: 6px; width: 17%;" headerText="Expiry">
<h:outputLabel value="#{bi.pharmaceuticalBillItem.itemBatch.dateOfExpire}" >
<f:convertDateTime timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.shortDateFormat}" ></f:convertDateTime>
</h:outputLabel>

</p:column>
<p:column headerText="Remove">
<p:commandButton class="ui-button-danger" icon="fas fa-trash" value="Remove" action="#{pharmacySaleBhtController.removeBillItem(bi)}" ajax="false" >
<p:column style="padding: 6px;width: 10%;" headerText="Remove">

<p:commandButton class="ui-button-danger" icon="fas fa-trash" title="Remove" action="#{pharmacySaleBhtController.removeBillItem(bi)}" ajax="false" >

</p:commandButton>
</p:column>
Expand Down
53 changes: 23 additions & 30 deletions src/main/webapp/pharmacy/pharmacy_purhcase_order_approving.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,18 @@
<f:facet name="header">
<p:outputLabel value="Purchase order Request Order"/>
<div style="float:right;" >
<p:commandButton
ajax="false"
value="Approve"
class="ui-button-success mx-2"
icon="fas fa-check"
disabled="#{!webUserController.hasPrivilege('PurchaseOrdersApprovel')}"
action="#{purchaseOrderController.approve}">
<p:commandButton ajax="false"
value="Approve"
class="ui-button-success mx-2"
icon="fas fa-check"
disabled="#{!webUserController.hasPrivilege('PurchaseOrdersApprovel')}"
action="#{purchaseOrderController.approve}">
</p:commandButton>
<p:commandButton
ajax="false"
value="Back To Po List"
class="ui-button-warning"
icon="fas fa-arrow-left"
action="pharmacy_purhcase_order_list_to_approve">
<p:commandButton ajax="false"
value="Back To Po List"
class="ui-button-warning"
icon="fas fa-arrow-left"
action="pharmacy_purhcase_order_list_to_approve">
</p:commandButton>
</div>
</f:facet>
Expand Down Expand Up @@ -86,23 +84,18 @@
<p:commandButton process="itemList @this" update=":#{p:resolveFirstComponentWithId('itemList',view).clientId} :#{p:resolveFirstComponentWithId('po',view).clientId}" value="Remove All" class="ui-button-Danger" style="float: right" action="#{purchaseOrderController.removeSelected()}"/>
</div>
</f:facet>
<p:dataTable
scrollable="true"
styleClass="noBorder"
scrollHeight="250"
var="bi"
value="#{purchaseOrderController.billItems}"
id="itemList"
sortBy="#{bi.searialNo}"
rowKey="#{bi.searialNo}"
paginator="true"
rows="10"
paginatorPosition="bottom"
paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
rowsPerPageTemplate="5,10,15"
selection="#{purchaseOrderController.selectedItems}">

<p:column selectionMode="multiple" style="width: 30px;"></p:column>
<p:dataTable scrollable="true" styleClass="noBorder" scrollHeight="250"
var="bi" value="#{purchaseOrderController.billItems}"
id="itemList" sortBy="#{bi.searialNo}" rowKey="#{bi.searialNo}"
paginator="true"
rows="10"
selectionMode="multiple"
paginatorPosition="bottom"
paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
rowsPerPageTemplate="5,10,15"
selection="#{purchaseOrderController.selectedItems}">

<p:column selectionBox="true" style="width: 30px;"></p:column>

<p:column headerText="No" style="width: 50px;" >
<p:outputLabel value="#{bi.searialNo + 1}" ></p:outputLabel>
Expand Down
Loading

0 comments on commit 6179886

Please sign in to comment.