Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

10052 collection center book wise detail report bugs #10066

Merged
merged 2 commits into from
Jan 11, 2025
Merged

10052 collection center book wise detail report bugs #10066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27c96b8
changed css file printOnly
IsuruUdaraRanaweera Jan 10, 2025
898ae18
Added a new table to print it without filter boxes
IsuruUdaraRanaweera Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 60 additions & 4 deletions src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
ajax="false"
style="width: 150px"
value="Print">
<p:printer target="tbl"/>
<p:printer target="tblPrint"/>
</p:commandButton>
<p:commandButton
id="btnExcel" class="m-1 ui-button-success"
Expand Down Expand Up @@ -168,11 +168,67 @@
</h:outputText>
<f:facet name="footer">
<h:outputText value="#{reportsController.bundle.grossTotal}">
<f:convertNumber pattern="#,##0.00"/>
</h:outputText>
</f:facet>
<f:convertNumber pattern="#,##0.00"/>
</h:outputText>
</f:facet>
</p:column>
</p:dataTable>

<div class="printingOnly">
<p:dataTable id="tblPrint"
class="w-100 m-2"
value="#{reportsController.bundle.reportTemplateRows}"
var="c"
rowIndexVar="b">
<p:column
headerText="Bill No"
width="5rem"
sortBy="#{c.bill.deptId}" >
<h:outputText value="#{c.bill.deptId}"/>
</p:column>
<p:column
headerText="Book Reference No"
width="5rem"
sortBy="#{c.bill.referenceNumber}" >
<h:outputText value="#{c.bill.referenceNumber}"/>
</p:column>
<p:column
headerText="Patient"
width="5rem"
sortBy="#{c.bill.patient.person.nameWithTitle}" >
<h:outputText value="#{c.bill.patient.person.nameWithTitle}"/>
</p:column>
<p:column
headerText="Creater"
width="5rem"
sortBy="#{c.bill.creater.webUserPerson.name}" >
<h:outputText value="#{c.bill.creater.webUserPerson.name}"/>
</p:column>
<p:column
headerText="Created Date"
width="5rem"
sortBy="#{c.bill.createdAt}" >
<h:outputText value="#{c.bill.createdAt}">
<f:convertDateTime
pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
</h:outputText>
</p:column>
<p:column
headerText="Bill Value"
width="5rem"
style="text-align: right;"
sortBy="#{c.bill.netTotal}" >
<h:outputText value="#{c.bill.netTotal}">
<f:convertNumber pattern="#,##0.00"/>
</h:outputText>
<f:facet name="footer">
<h:outputText value="#{reportsController.bundle.grossTotal}">
<f:convertNumber pattern="#,##0.00"/>
</h:outputText>
</f:facet>
</p:column>
</p:dataTable>
</div>
</p:panel>
</h:form>
</ui:define>
Expand Down
18 changes: 15 additions & 3 deletions src/main/webapp/resources/css/ohmis.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,7 @@ th.align-right-header .ui-column-title {
height: 50px;
width: 100px;
}
.printingOnly{
display: none!important;

}

.button-margin-adjusted {
margin-left: 4px;
Expand Down Expand Up @@ -593,3 +590,18 @@ th.align-right-header .ui-column-title {
width: 100% !important;
}


@media print {
.printingOnly{
display: block !important;

}
}

@media screen {
.printingOnly{
display: none !important;

}
}