Skip to content

Commit

Permalink
Merge pull request #4619 from hmislk/Issue#4614
Browse files Browse the repository at this point in the history 
Issue#4614
  • Loading branch information
@Senula88
Senula88 authored Apr 17, 2024
2 parents 8039822 + 1fa1da1 commit 8ec1e63
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 21 deletions.
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/persistence.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<persistence-unit name="hmisPU" transaction-type="JTA">
<jta-data-source>jdbc/arogya</jta-data-source>
<jta-data-source>jdbc/arogyaNew</jta-data-source>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<!--<property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>-->
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.0.20240416.2
3.0.0.20240417.1
41 changes: 22 additions & 19 deletions src/main/webapp/pharmacy/pharmacy_return_withouttresing.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,25 +84,28 @@
value="#{pharmacyReturnwithouttresing.stock}"
completeMethod="#{stockController.completeAvailableStocks}"
var="i" itemLabel="#{i.itemBatch.item.name}" itemValue="#{i}" >
<p:column headerText="Item">
<h:outputLabel value="#{i.itemBatch.item.name}" ></h:outputLabel>
<p:column headerText="Item" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<h:outputText value="#{i.itemBatch.item.name}" style="width: 300px!important;">
&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:outputText>
<h:outputLabel value=" (" ></h:outputLabel>
<h:outputText value="#{i.itemBatch.item.code}" style="width: 50px!important;"></h:outputText>
<h:outputLabel value=") - " ></h:outputLabel>
<h:outputText value="#{i.itemBatch.item.vmp.name}" style="width: 150px!important;"></h:outputText>
</p:column>
<p:column headerText="Code">
<h:outputLabel value="#{i.itemBatch.item.code}" ></h:outputLabel>
</p:column>
<p:column headerText="Rate">
<h:outputLabel value="#{i.itemBatch.purcahseRate}" >
<p:column headerText="Rate" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<h:outputLabel value="#{i.itemBatch.retailsaleRate}" >
<f:convertNumber pattern="#,##0.00" ></f:convertNumber>
</h:outputLabel>
</p:column>
<p:column headerText="Stocks">
<p:column 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">
<h:outputLabel value="#{i.itemBatch.dateOfExpire}" >
<f:convertDateTime pattern="#{sessionController.applicationPreference.longDateFormat}" ></f:convertDateTime>
<p:column headerText="Expiry" class="w-100" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<h:outputLabel value="#{i.itemBatch.dateOfExpire}" style="width: 100px!important;" >
<f:convertDateTime pattern="#{sessionController.applicationPreference.shortDateFormat}" ></f:convertDateTime>
</h:outputLabel>
</p:column>
<p:ajax event="focus" process="acStock :#{p:resolveFirstComponentWithId('acDept',view).clientId}" ></p:ajax>
Expand Down Expand Up @@ -347,14 +350,14 @@

ajax="false" action="/pharmacy/pharmacy_return_withouttresing"
actionListener="#{pharmacyReturnwithouttresing.resetAll()}" ></p:commandButton>
<p:spacer width="100"/>
<p:outputLabel value="Paper Type" class="m-2"></p:outputLabel>
<p:selectOneMenu value="#{sessionController.loggedPreference.pharmacyBillPaperType}" class="m-1" id='ph' style="width: 13em;">
<f:selectItem itemLabel="Please Select Paper Type" />
<f:selectItems value="#{enumController.paperTypes}" />
</p:selectOneMenu>
<p:commandButton ajax="false" icon="fa fa-sync-alt" class="ui-button" title="Redraw Bill"></p:commandButton>
<p:spacer width="100"/>
<p:outputLabel value="Paper Type" class="m-2"></p:outputLabel>
<p:selectOneMenu value="#{sessionController.loggedPreference.pharmacyBillPaperType}" class="m-1" id='ph' style="width: 13em;">
<f:selectItem itemLabel="Please Select Paper Type" />
<f:selectItems value="#{enumController.paperTypes}" />
</p:selectOneMenu>
<p:commandButton ajax="false" icon="fa fa-sync-alt" class="ui-button" title="Redraw Bill"></p:commandButton>


</div>
<!-- <div >
Expand Down

0 comments on commit 8ec1e63

Please sign in to comment.