From 008745f2e8e31d6842a37d8a0f07d70ce6d1fdd2 Mon Sep 17 00:00:00 2001 From: Isuru Ranaweera Date: Fri, 3 Jan 2025 17:05:53 +0530 Subject: [PATCH 1/4] Signed-off-by: Isuru Ranaweera --- .../collection_centre_book_wise_detail.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml b/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml index 8ea33b22d3..0c8f5559b5 100644 --- a/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml +++ b/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml @@ -137,7 +137,7 @@ pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/> - + From c4fe526a124e4a13f42add9775a74b8838981018 Mon Sep 17 00:00:00 2001 From: Isuru Ranaweera Date: Sun, 5 Jan 2025 23:57:05 +0530 Subject: [PATCH 2/4] Signed-off-by: Isuru Ranaweera --- .../collection_centre_book_wise_detail.xhtml | 227 ++++++++++-------- 1 file changed, 129 insertions(+), 98 deletions(-) diff --git a/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml b/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml index 0c8f5559b5..da5f65d0f5 100644 --- a/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml +++ b/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml @@ -1,54 +1,54 @@ + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - - - - + + + + + - - - - - - - + + + + + + - + - + - - - - - - + + + + + - + - - - - - - + + + + + - #{vt.code} - #{vt.name} - + #{vt.code} + #{vt.name} + - + - - - - - - + + + + + + -
-
- - +
+
+ + - - - - + + - - - + + - - + + +
-
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + From c1a48faa264c3209868c9af4d00dc2a538525101 Mon Sep 17 00:00:00 2001 From: Isuru Ranaweera Date: Mon, 6 Jan 2025 12:27:08 +0530 Subject: [PATCH 3/4] cc book wise bill total and listing data fixed Signed-off-by: Isuru Ranaweera --- .../com/divudi/bean/common/ReportsController.java | 2 +- .../collection_centre_book_wise_detail.xhtml | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java index d04e6fa6ff..a0b0ba6bfa 100644 --- a/src/main/java/com/divudi/bean/common/ReportsController.java +++ b/src/main/java/com/divudi/bean/common/ReportsController.java @@ -2823,7 +2823,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"); diff --git a/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml b/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml index da5f65d0f5..271f8b5168 100644 --- a/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml +++ b/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml @@ -112,13 +112,7 @@ class="w-100 m-2" value="#{reportsController.bundle.reportTemplateRows}" var="c" - paginator="true" - paginatorAlwaysVisible="false" - paginatorPosition="bottom" - rows="10" - rowIndexVar="b" - paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" - rowsPerPageTemplate="5,10,20"> + rowIndexVar="b"> + + + + + From 3efa4fca9d07d2ee2f8807a02ef5dc057b6191a4 Mon Sep 17 00:00:00 2001 From: Isuru Ranaweera Date: Mon, 6 Jan 2025 17:22:36 +0530 Subject: [PATCH 4/4] Signed-off-by: Isuru Ranaweera --- src/main/java/com/divudi/bean/common/ReportsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java index 8b6557b856..4a2d2b3815 100644 --- a/src/main/java/com/divudi/bean/common/ReportsController.java +++ b/src/main/java/com/divudi/bean/common/ReportsController.java @@ -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");