From 3d89cb68266bd28d91f03061ee57718a21569e6e Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Sat, 17 May 2025 17:13:17 +0530
Subject: [PATCH 1/4] latest commit 17-05-2025

---
 app/Views/stock/incomingSilicaSandDetails.php | 49 ++++++++++---------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/app/Views/stock/incomingSilicaSandDetails.php b/app/Views/stock/incomingSilicaSandDetails.php
index bfa34a36..cabe87fd 100644
--- a/app/Views/stock/incomingSilicaSandDetails.php
+++ b/app/Views/stock/incomingSilicaSandDetails.php
@@ -716,7 +716,7 @@
                                             <div class="modal-footer">
 
                                                 <span style="min-width: 150px; max-width: 150px;">
-                                                    <select class="form-control select2" name="remark" id="remarkInFormId" required>
+                                                    <select class="form-control " name="remark" id="remarkInFormId" required>
                                                         <option value="">Select</option>
                                                         <option value="noRemark">No Remark</option>
                                                         <option value="accepted">Accepted</option>
@@ -1219,6 +1219,7 @@
             $('#dwnldReportCommentsId').text(reportComments);
             $('#dwnldGradeId').text(gradeRange);
             $('#dwnldTimeId').text(reportTime);
+            $('#remarkInFormId').val(remark);
 
 
             if (sandType.trim().toLowerCase() == "silica sand") {
@@ -1945,27 +1946,36 @@
 
 <!-- remark onchange -->
 <script>
-    $('#remarkInFormId').change(function() {
 
-        let remark = $(this).val();
+    $(document).ready(function(){
 
-        $('#dwnldAcceptedId').text("");
-        $('#dwnldAcceptedUnderDeviationId').text("");
-        $('#dwnldRejectedId').text("");
+        $('#remarkInFormId').change(function() {
 
-        if (remark == "accepted") {
-            $('#dwnldAcceptedId').text("Yes");
-        } else if (remark == "conditionallyAccepted") {
-            $('#dwnldAcceptedUnderDeviationId').text("Yes");
-        } else if (remark == "rejected") {
-            $('#dwnldRejectedId').text("Yes");
-        }
+            
 
-        //without saving current change , cannot download the pdf
-        $('#pdfGenerateId').css('display', 'none');
-        $('#reportNotice').text("* Please save the changes to download");
+            let remark = $(this).val();
+
+            $('#dwnldAcceptedId').text("");
+            $('#dwnldAcceptedUnderDeviationId').text("");
+            $('#dwnldRejectedId').text("");
+
+            if (remark == "accepted") {
+                $('#dwnldAcceptedId').text("Yes");
+            } else if (remark == "conditionallyAccepted") {
+                $('#dwnldAcceptedUnderDeviationId').text("Yes");
+            } else if (remark == "rejected") {
+                $('#dwnldRejectedId').text("Yes");
+            }
+
+            //without saving current change , cannot download the pdf
+            $('#pdfGenerateId').css('display', 'none');
+            $('#reportNotice').text("* Please save the changes to download");
+
+        })
 
     })
+
+
 </script>
 
 <!-- onchange of month submit will happen -->
@@ -2036,12 +2046,7 @@
                 dropdownParent: $('#fullscreenDiv')
             });
 
-            // Initialize Select2 when the modal is shown inside full screen
-            $('#downloadLabReportModel,').on('shown.bs.modal', function () {
-                $('.select2').select2({
-                    dropdownParent: $(this) // This ensures Select2 works in the modal
-                });
-            });
+
 
         });
 

From 57110ce4622fea1949491553e24046dd2a7015c8 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Sat, 17 May 2025 17:38:13 +0530
Subject: [PATCH 2/4] latest commit 17-05-2025

---
 app/Views/stock/incomingSilicaSandDetails.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/Views/stock/incomingSilicaSandDetails.php b/app/Views/stock/incomingSilicaSandDetails.php
index cabe87fd..38bc8528 100644
--- a/app/Views/stock/incomingSilicaSandDetails.php
+++ b/app/Views/stock/incomingSilicaSandDetails.php
@@ -1844,6 +1844,11 @@
                     materialReceivedTd.text(formattedMaterialDate);
                 }
 
+                $(this).find('td select.grade-condition').each(function() {
+                    let selectedValue = $(this).val();
+                    $(this).closest('td').text(selectedValue);
+                });
+
                 invoiceTd.css("text-align", "left");
                 materialReceivedTd.css("text-align", "left");
             });

From e0dfc974f9af2bcebcaa7f43380e85b4fe3b9b01 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Sat, 17 May 2025 17:47:14 +0530
Subject: [PATCH 3/4] latest commit 17-05-2025

---
 app/Views/Report_HSNCreditNoteRegister.php | 18 ++++++++++--------
 app/Views/Report_HSNSalesRegister.php      | 22 ++++++++++++----------
 app/Views/Report_HSNSummaryRegister.php    | 20 ++++++++++----------
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/app/Views/Report_HSNCreditNoteRegister.php b/app/Views/Report_HSNCreditNoteRegister.php
index f80678cf..33db91d3 100644
--- a/app/Views/Report_HSNCreditNoteRegister.php
+++ b/app/Views/Report_HSNCreditNoteRegister.php
@@ -154,14 +154,16 @@
 									</thead>
 									<tbody>
 
-									  <?php if(!empty($hsnCreditNoteRegister)){
-											$totalQuantity = 0;
-											$totalTaxableAmount = 0;
-											$totalCgst = 0;
-											$totalSgst = 0;
-											$totalIgst = 0;
-											$totalNetInvoiceAmount = 0;
-									  ?>  
+											<?php
+													$totalQuantity = 0;
+													$totalTaxableAmount = 0;
+													$totalCgst = 0;
+													$totalSgst = 0;
+													$totalIgst = 0;
+													$totalNetInvoiceAmount = 0;
+											?>
+
+									  <?php if(!empty($hsnCreditNoteRegister)){ ?>  
 
 										<?php foreach($hsnCreditNoteRegister as $index => $hcn) { 
 											
diff --git a/app/Views/Report_HSNSalesRegister.php b/app/Views/Report_HSNSalesRegister.php
index 24a96b53..e81ff012 100644
--- a/app/Views/Report_HSNSalesRegister.php
+++ b/app/Views/Report_HSNSalesRegister.php
@@ -151,16 +151,18 @@
 									</thead>
 									<tbody>
 
-									  <?php if(!empty($hsnSalesRegister)){ 
-										
-											$totalQuantity = 0;
-											$totalTaxableAmount = 0;
-											$totalCgst = 0;
-											$totalSgst = 0;
-											$totalIgst = 0;
-											$totalNetInvoiceAmount = 0;
-										
-									  ?>  
+										<?php
+												$totalQuantity = 0;
+												$totalTaxableAmount = 0;
+												$totalCgst = 0;
+												$totalSgst = 0;
+												$totalIgst = 0;
+												$totalNetInvoiceAmount = 0;
+										?>
+
+									<?php ?>
+
+									  <?php if(!empty($hsnSalesRegister)){  ?>  
 
 										<?php foreach($hsnSalesRegister as $index => $hs) {
 											
diff --git a/app/Views/Report_HSNSummaryRegister.php b/app/Views/Report_HSNSummaryRegister.php
index ddd2d0dc..1981f009 100644
--- a/app/Views/Report_HSNSummaryRegister.php
+++ b/app/Views/Report_HSNSummaryRegister.php
@@ -154,16 +154,16 @@
 									</thead>
 									<tbody>
 
-									  <?php if(!empty($hsnSummaryRegister)){ 
-										
-											$totalQuantity = 0;
-											$totalTaxableAmount = 0;
-											$totalCgst = 0;
-											$totalSgst = 0;
-											$totalIgst = 0;
-											$totalNetInvoiceAmount = 0;
-										
-										?>  
+										<?php
+												$totalQuantity = 0;
+												$totalTaxableAmount = 0;
+												$totalCgst = 0;
+												$totalSgst = 0;
+												$totalIgst = 0;
+												$totalNetInvoiceAmount = 0;
+										?>
+
+									  <?php if(!empty($hsnSummaryRegister)){ ?>  
 
 										<?php foreach($hsnSummaryRegister as $index => $hsm) {
 											

From d8db3186176e463df0ca251f92d40d15c275098f Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Sat, 17 May 2025 18:01:55 +0530
Subject: [PATCH 4/4] latest commit 17-05-2025

---
 app/Views/expense_list.php | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/app/Views/expense_list.php b/app/Views/expense_list.php
index 7b6d1501..bf3fb7ad 100755
--- a/app/Views/expense_list.php
+++ b/app/Views/expense_list.php
@@ -191,7 +191,7 @@
                                                             <?php } ?>
 
                                                         <?php } ?>
-                                                        <button title="Edit" class="edit-button" data-toggle="modal" data-target="#expenseModal" data-id="<?php echo $record['id']; ?>" style="border: none;background-color: white;color: #02a8b5;">
+                                                        <button title="Edit" class="edit-button edit-btn" data-toggle="modal" data-target="#expenseModal" data-id="<?php echo $record['id']; ?>" style="border: none;background-color: white;color: #02a8b5;">
                                                             <i class="fas fa-pencil-alt"></i>
                                                         </button>
                                                     </td>
@@ -645,4 +645,32 @@ dateInput.addEventListener('change', function () {
     });
     });
    
-</script>
\ No newline at end of file
+</script>
+
+<script>
+    $(document).ready(function () {
+        // Ensure DataTable is initialized
+        let table = $('#expense_list_table').DataTable(); 
+
+        console.log("DataTable initialized:", table ? "Yes" : "No");
+
+        // Store page number on edit button click
+        $('#expense_list_table').on('click', '.edit-btn', function () {
+            const pageInfo = table.page.info();
+
+            console.log("Edit clicked, current page info:", pageInfo);
+
+            sessionStorage.setItem("datatablePage", pageInfo.page);
+        });
+
+        // Restore page if saved
+        let startPage = sessionStorage.getItem("datatablePage");
+        if (startPage !== null) {
+            console.log("Restoring to page:", startPage);
+            table.page(parseInt(startPage)).draw('page');
+            sessionStorage.removeItem("datatablePage");
+        } else {
+            console.log("No page info found in sessionStorage.");
+        }
+    });
+</script>