From 4a94cac2149d56b6e70f96a4337ffabaaa366824 Mon Sep 17 00:00:00 2001
From: Usama Khan <usama.jameel@utopia.pk>
Date: Thu, 24 Apr 2025 10:21:16 -0700
Subject: [PATCH] fix table searching issues

---
 .../service/ReportingService.java             |  4 +-
 .../reporting/accounts-transaction-table.html | 64 +++++++++++++------
 .../templates/reporting/stitching-report.html | 14 ++--
 3 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/utopiaindustries/service/ReportingService.java b/src/main/java/com/utopiaindustries/service/ReportingService.java
index 4177800..e09a9ea 100644
--- a/src/main/java/com/utopiaindustries/service/ReportingService.java
+++ b/src/main/java/com/utopiaindustries/service/ReportingService.java
@@ -768,6 +768,7 @@ public class ReportingService {
             List<CuttingJobCardItemWrapper> wrappers = jobCardItems.stream().map(item -> {
                 CuttingJobCardItemWrapper wrapper = new CuttingJobCardItemWrapper();
                 wrapper.setArticleName(jobCard.getArticleName());
+                wrapper.setJobCardId(jobCard.getId());
                 wrapper.setJobCardCode(jobCard.getCode());
                 wrapper.setSku(item.getSku());
                 wrapper.setPoName(jobCard.getPurchaseOrderId());
@@ -781,9 +782,6 @@ public class ReportingService {
             jobCardItemsStitchingDetailsMap.computeIfAbsent(accountId, k -> new ArrayList<>()).addAll(wrappers);
         }
 
-        System.out.println(jobCardItemsStitchingDetailsMap);
-        System.out.println(totalStitchingBasedOnAccountID);
-
         stitchingDetails.put("totalStitchingBasedOnAccountID", totalStitchingBasedOnAccountID);
         stitchingDetails.put("jobCardItemsStitchingDetailsMap", jobCardItemsStitchingDetailsMap);
         stitchingDetails.put("Date Wise Stitching", dateWiseProduction);
diff --git a/src/main/resources/templates/reporting/accounts-transaction-table.html b/src/main/resources/templates/reporting/accounts-transaction-table.html
index b77f667..7f4eba4 100644
--- a/src/main/resources/templates/reporting/accounts-transaction-table.html
+++ b/src/main/resources/templates/reporting/accounts-transaction-table.html
@@ -23,7 +23,7 @@
 <div class="container">
     <div class="row">
         <div class="col-sm-12">
-            <table th:if="${#lists.size(transactions) !=  0 && #lists != null }" class="table table-bordered font-sm">
+            <table th:if="${#lists.size(transactions) !=  0 && #lists != null }" class="table table-bordered font-sm mb-4" data-account-tables>
                 <thead>
                 <tr>
                     <th>ID</th>
@@ -62,25 +62,51 @@
 </div>
 <div th:replace="_fragments :: page-footer-scripts"></div>
 <script th:inline="javascript">
-    (async function () {
-        const $selectAllCheckBox = $('[data-checkbox-all]');
 
-        $selectAllCheckBox.change(function () {
-            if ($selectAllCheckBox.prop('checked')) {
-                // When parent checkbox is checked, check all child checkboxes
-                $('[name="parent-doc-type-ids"]').each(function () {
-                    let $this = $(this);
-                    $this.prop('checked', true);
-                });
-            } else {
-                // When parent checkbox is unchecked, uncheck all child checkboxes
-                $('[name="parent-doc-type-ids"]').each(function () {
-                    let $this = $(this);
-                    $this.prop('checked', false);
-                });
-            }
-        });
-    })(jQuery)
+    // Initialize DataTables for each individual table
+  $('table[data-account-tables]').each(function () {
+      const $table = $(this);
+
+      // Prevent reinitializing if already done
+      if (!$.fn.DataTable.isDataTable($table)) {
+          $table.DataTable({
+              pageLength: 5,
+              searching: true,
+              lengthChange: false,
+              processing: false,
+              dom: `
+                 <'row'<'col-sm-5'B><'col-sm-7'f>>
+                 <'row'<'col-sm-12't>>
+                 <'row'<'col-sm-5'i><'col-sm-7'p>>`,
+              buttons: [{
+                  extend: 'excel',
+                  text: '',
+                  className: 'bi bi-file-earmark-spreadsheet btn-sm d-none' // Keep it hidden
+              }]
+          });
+      }
+  });
+
+
+     (async function () {
+         const $selectAllCheckBox = $('[data-checkbox-all]');
+
+         $selectAllCheckBox.change(function () {
+             if ($selectAllCheckBox.prop('checked')) {
+                 // When parent checkbox is checked, check all child checkboxes
+                 $('[name="parent-doc-type-ids"]').each(function () {
+                     let $this = $(this);
+                     $this.prop('checked', true);
+                 });
+             } else {
+                 // When parent checkbox is unchecked, uncheck all child checkboxes
+                 $('[name="parent-doc-type-ids"]').each(function () {
+                     let $this = $(this);
+                     $this.prop('checked', false);
+                 });
+             }
+         });
+     })(jQuery)
 </script>
 
 </body>
diff --git a/src/main/resources/templates/reporting/stitching-report.html b/src/main/resources/templates/reporting/stitching-report.html
index ee5d0f1..6eb434a 100644
--- a/src/main/resources/templates/reporting/stitching-report.html
+++ b/src/main/resources/templates/reporting/stitching-report.html
@@ -2,7 +2,7 @@
 <html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml"
       xmlns:ctp="http://www.w3.org/1999/xhtml">
 
-<head th:replace="_fragments :: head('Cutting Report')"></head>
+<head th:replace="_fragments :: head('Stitching Report')"></head>
 
 <body>
 <div class="container-fluid">
@@ -28,7 +28,7 @@
                 </div>
             </div>
 
-            <div class="mt-3" th:if="${stitching.get('stitchingAccount') != null}"
+            <div class="mt-3" th:if="${stitching.get('stitchingAccount') != null && stitching.get('jobCardItemsStitchingDetailsMap').get(stitchingAccount.id) != null}"
                  th:each="stitchingAccount, index : ${stitching.get('stitchingAccount')}">
                 <div class="bg-dark text-white py-2 px-3 fs-5 fw-bold text-center mb-2"
                      th:text="${stitchingAccount.title}"></div>
@@ -56,7 +56,7 @@
                             title="Transactions">
                             <span data-dropdown-icon-transactions class="bi bi-caret-right-fill"></span>
                         </td>
-                        <td th:text="${wrap.jobCardId}"></td>
+                        <td th:text="${wrap.jobCardCode}"></td>
                         <td th:text="${wrap.poName}"></td>
                         <td th:text="${wrap.sku}"></td>
                         <td th:text="${wrap.articleName}"></td>
@@ -69,17 +69,15 @@
         </div>
     </main>
 </div>
-
-<div th:replace="_fragments :: page-footer-scripts"></div>
-
 <script>
     const $body = $('body');
 
     // Initialize DataTables for each individual table
     $('table[data-account-table]').each(function () {
         $(this).DataTable({
+            paging: false,
             pageLength: 100,
-            searching: true,
+            searching: false,
             lengthChange: false,
             processing: false,
             dom: `
@@ -89,7 +87,7 @@
             buttons: [{
                 extend: 'excel',
                 text: '',
-                className: 'bi bi-file-earmark-spreadsheet btn-sm'
+                className: 'bi bi-file-earmark-spreadsheet btn-sm d-none'
             }]
         });
     });