Merge pull request #5782 from hmislk/Issue#5665

Fixed #5665 Closes #5665

src/main/resources/META-INF/persistence.xml

@@ -1,32 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence version="2.2" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
- <persistence-unit name="hmisPU" transaction-type="JTA">
- <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <jta-data-source>jdbc/arogyaNew</jta-data-source>
- <exclude-unlisted-classes>false</exclude-unlisted-classes>
- <properties>
- <property name="eclipselink.logging.level.sql" value="SEVERE"/>
- <property name="eclipselink.logging.parameters" value="false"/>
- <!-- <property name="eclipselink.logging.level.sql" value="SEVERE"/>
- <property name="eclipselink.logging.parameters" value="true"/>
- <property name="eclipselink.ddl-generation.index-foreign-keys" value="false"/>
- <property name="javax.persistence.schema-generation.database.action" value="create"/>-->
- <property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>
- </properties>
- </persistence-unit>
- <persistence-unit name="hmisAuditPU" transaction-type="JTA">
- <jta-data-source>jdbc/arogyaAudit</jta-data-source>
- <class>com.divudi.entity.AuditEvent</class>
- <exclude-unlisted-classes>true</exclude-unlisted-classes>
- <properties>
- <property name="eclipselink.logging.level.sql" value="SEVERE"/>
- <property name="eclipselink.logging.parameters" value="false"/>
- <!--<property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>-->
- <!-- <property name="eclipselink.ddl-generation" value="create-or-extend-tables"/>
- <property name="eclipselink.logging.level.sql" value="SEVERE"/>
- <property name="eclipselink.logging.parameters" value="true"/>
- <property name="eclipselink.ddl-generation.index-foreign-keys" value="false"/>-->
- </properties>
- </persistence-unit>
+ <persistence-unit name="hmisPU" transaction-type="JTA">
+ <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+ <jta-data-source>jdbc/arogya</jta-data-source>
+ <exclude-unlisted-classes>false</exclude-unlisted-classes>
+ <properties>
+ <property name="eclipselink.logging.level.sql" value="SEVERE"/>
+ <property name="eclipselink.logging.parameters" value="false"/>
+ <property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>
+ </properties>
+ </persistence-unit>
+ <persistence-unit name="hmisAuditPU" transaction-type="JTA">
+ <jta-data-source>jdbc/arogyaAudit</jta-data-source>
+ <class>com.divudi.entity.AuditEvent</class>
+ <exclude-unlisted-classes>true</exclude-unlisted-classes>
+ <properties>
+ <property name="eclipselink.logging.level.sql" value="SEVERE"/>
+ <property name="eclipselink.logging.parameters" value="false"/>
+ <property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>
+ </properties>
+ </persistence-unit>
 </persistence>
 

src/main/webapp/channel/manage_booking.xhtml

@@ -511,9 +511,22 @@
  </h:panelGroup>
  <p:dialog minHeight="100" width="800" header="Confirmation" widgetVar="confirmationDialog" modal="true" resizable="false">
  <p>Are you sure you want to cancel the channel booking?</p>
- <p:inputText class="w-100"
- value="#{channelBillController.comment}"
- placeholder="Please provide a comment for the cancel Channel Booking" />
+ <p:selectOneMenu
+ id="commentsMenuCancel"
+ value="#{channelBillController.comment}"
+ editable="true"
+ filter="true"
+ placeholder="Select or enter a comment"
+ filterMatchMode="contains"
+ style="float: right; width: 100%"
+ class="p-2">
+ <f:selectItem itemLabel="Select or enter a comment" itemValue="" noSelectionOption="true"/>
+ <f:selectItems
+ value="#{configOptionApplicationController.getListOfCustomOptions('Channel Bill Canceling Comments')}"
+ var="option"
+ itemLabel="#{option}"
+ itemValue="#{option}"/>
+ </p:selectOneMenu>
 
  <f:facet name="footer">
  <p:commandButton