Skip to content

Commit

Permalink
Merge pull request #6851 from hmislk/Issue#6850
Browse files Browse the repository at this point in the history
Issue#6850 Closes #6850
  • Loading branch information
Irani96 authored Aug 21, 2024
2 parents 5179408 + 0d44d6c commit df25769
Show file tree
Hide file tree
Showing 6 changed files with 121 additions and 7 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.divudi</groupId>

<artifactId>horizon</artifactId>
<artifactId>sethmademo</artifactId>
<version>3.0.0</version>
<packaging>war</packaging>
<name>horizon</name>
<name>sethmademo</name>

<properties>
<endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
Expand Down
7 changes: 4 additions & 3 deletions src/main/resources/META-INF/persistence.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<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/ruhunu</jta-data-source>
<jta-data-source>jdbc/arogya</jta-data-source>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="eclipselink.logging.level.sql" value="INFO"/>
Expand All @@ -13,8 +13,9 @@
</properties>
</persistence-unit>
<persistence-unit name="hmisAuditPU" transaction-type="JTA">
<jta-data-source>jdbc/ruhunuaudit</jta-data-source>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<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"/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/glassfish-web.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
<glassfish-web-app error-url="">
<context-root>/horizon</context-root>
<context-root>/sethmareports</context-root>
<class-loader delegate="true"/>
<jsp-config>
<property name="keepgenerated" value="true">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
C:\Users\Work\Desktop\CareCode\src\main\webapp\analytics\staff_credit_bill_list.xhtml
2 changes: 1 addition & 1 deletion src/main/webapp/channel/reports/daily_session_counts.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<p:commandButton
class="ui-button-warning m-2"
icon="fas fa-cogs"
value="Process &amp Fill Bill Sessions"
value="Process &amp; Fill Bill Sessions"
action="#{channelReportTemplateController.processAndfillDailySessionCounts()}" ajax="false" ></p:commandButton>

<p:commandButton
Expand Down
112 changes: 112 additions & 0 deletions src/main/webapp/reportInstitution/report_referral_doctor_details.xhtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
template="/reportInstitution/report_referrals_index.xhtml"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:p="http://primefaces.org/ui"
xmlns:ez="http://xmlns.jcp.org/jsf/composite/ezcomp"
>


<ui:define name="subcontent">
<h:outputStylesheet library="css" name="printing.css"></h:outputStylesheet>
<h:panelGroup rendered="true" >
<h:form>
<p:panel>

<f:facet name="header" >
<h:outputLabel value="Institution Referrals" />
</f:facet>

<h:panelGrid columns="2" class="my-2" >
<h:outputLabel value="From Date"/>
<p:calendar class="w-100 mx-4" inputStyleClass="w-100" id="frmDate" value="#{commonReport.fromDate}" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" >
</p:calendar>

<h:outputLabel value="To Date"/>
<p:calendar class="w-100 mx-4" inputStyleClass="w-100 my-1" id="toDate" value="#{commonReport.toDate}" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" >
</p:calendar>

<h:outputLabel value="Referring Institution"/>
<p:autoComplete class="w-100 mx-4" inputStyleClass="w-100" forceSelection="true"
id="cmdIns"
value="#{billController.referredByInstitution}"
completeMethod="#{institutionController.completeIns}"
var="refi"
itemLabel="#{refi.name}"
itemValue="#{refi}"
>
</p:autoComplete>
</h:panelGrid>
<h:panelGrid columns="6" class="my-2" >
<p:commandButton id="btnRefresh" ajax="false" value="Process"
class="ui-button-warning" icon="fas fa-cogs"
actionListener="#{commonReport.fillInstitutionReferralBills()}" />
<p:defaultCommand target="btnRefresh"/>
<p:commandButton ajax="false" value="Print" class="ui-button-info mx-2" icon="fas fa-print" >
<p:printer target="reportPrint"/>
</p:commandButton>
<p:commandButton ajax="false" value="Excel" class="ui-button-success" icon="fas fa-file-excel" >
<p:dataExporter type="xlsx"
target=""
fileName="Day_END_By_Bill_Type" />
</p:commandButton>
</h:panelGrid>

<p:panel id="reportPrint" styleClass="noBorder summeryBorder">
<p:dataTable id="billed" value="#{commonReport.referralBills}" var="b"
paginator="false"
paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
rowsPerPageTemplate="5,10,15,20" >
<f:facet name="header">
<h:outputLabel value="OPD Bills "/>
</f:facet>

<p:column headerText="Id" >
<f:facet name="header">
<h:outputLabel value="ID" style="float: left"/>
</f:facet>
<h:outputLabel value="#{b.insId}"/>
</p:column>



<p:column headerText="Institurion" >
<f:facet name="header">
<h:outputLabel value="Institution" style="float: left"/>
</f:facet>
<h:outputLabel value="#{b.referredByInstitution.name}"/>
</p:column>

<p:column headerText="Referral ID" >
<f:facet name="header">
<h:outputLabel value="Referral Number" style="float: left"/>
</f:facet>
<h:outputLabel value="#{b.referenceNumber}"/>
</p:column>

<p:column >
<f:facet name="header">
<h:outputLabel value="Billed At" style="float: left"/>
</f:facet>
<h:outputLabel value="#{b.createdAt}"/>
</p:column>

<p:column >
<f:facet name="header">
<h:outputLabel value="Total" style="float: left"/>
</f:facet>
<h:outputLabel value="#{b.total}"/>
</p:column>

</p:dataTable>

</p:panel>
</p:panel>
</h:form>
</h:panelGroup>
</ui:define>

</ui:composition>

0 comments on commit df25769

Please sign in to comment.