From a6920bf92fbdd0a4f1e6da3c0fb1f47dc601a955 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Sat, 17 May 2025 12:54:50 +0530
Subject: [PATCH] latest commit 17-05-2025

---
 app/Views/POlist.php             | 47 ++++++++++++++++++++++++++------
 app/Views/emppayListing.php      | 32 ++++++++++++++++++++--
 app/Views/porelease_view.php     | 30 +++++++++++++++++++-
 app/Views/report_sales.php       |  2 +-
 app/Views/requisitionlisting.php | 33 ++++++++++++++++++++--
 app/Views/sales_dashboard.php    |  3 +-
 6 files changed, 131 insertions(+), 16 deletions(-)

diff --git a/app/Views/POlist.php b/app/Views/POlist.php
index c6be2a09..849d502f 100755
--- a/app/Views/POlist.php
+++ b/app/Views/POlist.php
@@ -194,7 +194,7 @@
 
                                                         <td>
                                                             
-                                                            <a data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to Edit Purchase Order details" class="auditor-restricted-btn"
+                                                            <a class="edit-btn" data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to Edit Purchase Order details" class="auditor-restricted-btn"
                                                                 href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType. '&CapitalRange=' . $record->CapitalRange; ?>">
                                                                 <i class="fa fa-pencil-alt" data-toggle="tooltip"> </i>
                                                                 &nbsp;&nbsp;&nbsp;
@@ -204,7 +204,7 @@
                                                     <?php
                                                     } else if ($statusCode == PO_AMENDED ) { ?>
                                                         <td>
-                                                            <a data-toggle="tooltip" href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType. '&CapitalRange=' . $record->CapitalRange; ?>">
+                                                            <a class="edit-btn" data-toggle="tooltip" href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType. '&CapitalRange=' . $record->CapitalRange; ?>">
                                                                 <i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to Amendment Purchase Order details"></i>
                                                                 &nbsp;&nbsp;&nbsp;
                                                             </a>    
@@ -214,15 +214,16 @@
 
 
 
-                                                            <a data-toggle="tooltip" href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType
-                                                                                                . '&CapitalRange=' . $record->CapitalRange; ?>"><i class="fa fa-eye" data-toggle="tooltip"
-                                                                    title="<?php echo $record->PONO; ?>  -  Click here to view Purchase Order details"></i>
-                                                                &nbsp;&nbsp;&nbsp;</a> &nbsp;&nbsp;&nbsp;
+                                                            <a class="edit-btn" data-toggle="tooltip" href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType . '&CapitalRange=' . $record->CapitalRange; ?>">
+                                                                    <i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to view Purchase Order details"></i>
+                                                             &nbsp;&nbsp;&nbsp;
+                                                            </a>
+                                                            
+                                                            &nbsp;&nbsp;&nbsp;
 
                                                       
-                                                            <a data-toggle="tooltip" href="<?php echo base_url() . 'purchaseorder/CreatePOPrint?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType; ?>"
-                                                                target="new"><i class="fa fa-print" data-toggle="tooltip" title="<?php echo $record->PONO; ?> 
-                                                                -  Click here to Print the Purchase Order details"></i>
+                                                            <a  data-toggle="tooltip" href="<?php echo base_url() . 'purchaseorder/CreatePOPrint?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType; ?>"  target="new">
+                                                                <i class="fa fa-print" data-toggle="tooltip" title="<?php echo $record->PONO; ?> -  Click here to Print the Purchase Order details"></i>
                                                                 &nbsp;&nbsp;&nbsp;
                                                             </a>
                                                        
@@ -314,3 +315,31 @@
     });
    
 </script>
+
+<script>
+    $(document).ready(function () {
+        // Ensure DataTable is initialized
+        let table = $('#po_list').DataTable(); 
+
+        console.log("DataTable initialized:", table ? "Yes" : "No");
+
+        // Store page number on edit button click
+        $('#po_list').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>
diff --git a/app/Views/emppayListing.php b/app/Views/emppayListing.php
index 954c2331..58f4a2ac 100755
--- a/app/Views/emppayListing.php
+++ b/app/Views/emppayListing.php
@@ -58,7 +58,7 @@
                         <td>
                           <a href="<?php echo base_url() . 'emppaydate/downloadEmpLoanData/' . $record->Pay_Data_ID; ?>"><i class="fas fa-download"></i></a>
                           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                          <a href="<?php echo base_url() . 'emppaydate/editOldemppay/' . $record->Pay_Data_ID; ?>"><i class="fas fa-pencil-alt"></i></a>
+                          <a class="edit-btn" href="<?php echo base_url() . 'emppaydate/editOldemppay/' . $record->Pay_Data_ID; ?>"><i class="fas fa-pencil-alt"></i></a>
                         </td>
                       </tr>
                   <?php  }
@@ -84,4 +84,32 @@
         ]
     });
 });
-</script>
\ No newline at end of file
+</script>
+
+<script>
+    $(document).ready(function () {
+        // Ensure DataTable is initialized
+        let table = $('#datatable').DataTable(); 
+
+        console.log("DataTable initialized:", table ? "Yes" : "No");
+
+        // Store page number on edit button click
+        $('#datatable').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>
diff --git a/app/Views/porelease_view.php b/app/Views/porelease_view.php
index 7b5b1f45..a0098000 100755
--- a/app/Views/porelease_view.php
+++ b/app/Views/porelease_view.php
@@ -186,7 +186,7 @@ if (empty($Status)) {
 															
 
 																<select 
-																class="form-control"
+																class="form-control edit-btn"
 																name="selectId" id="selectId" 
 																onchange="showvalue('<?php echo $record->PONO ?>','<?php echo $index; ?>',this.options[this.selectedIndex].value,'<?php echo $record->Remarks ?>');" 
 																style="width: 193px;">
@@ -525,4 +525,32 @@ if (empty($Status)) {
     	});
     });
    
+</script>
+
+<script>
+    $(document).ready(function () {
+        // Ensure DataTable is initialized
+        let table = $('#po_release').DataTable(); 
+
+        console.log("DataTable initialized:", table ? "Yes" : "No");
+
+        // Store page number on edit button click
+        $('#po_release').on('change', '.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>
\ No newline at end of file
diff --git a/app/Views/report_sales.php b/app/Views/report_sales.php
index ba7ea95e..c9a42498 100644
--- a/app/Views/report_sales.php
+++ b/app/Views/report_sales.php
@@ -264,7 +264,7 @@
 		var table = $('#cc').DataTable({
 			dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
 			buttons: [
-				'copy', 'csv' // Export buttons
+				'excel' // Export buttons
 			],
 			pageLength: 10, // Default rows per page
 			lengthMenu: [
diff --git a/app/Views/requisitionlisting.php b/app/Views/requisitionlisting.php
index c2c05114..20b4535e 100755
--- a/app/Views/requisitionlisting.php
+++ b/app/Views/requisitionlisting.php
@@ -173,7 +173,7 @@ if (!empty($Status)) {
 
                                                     <td align="left" style="padding-left: 3%;"><?php echo strtoupper($record->StatusName); ?></td>
 
-                                                    <td> <a data-toggle="tooltip"
+                                                    <td> <a class="edit-btn" data-toggle="tooltip"
                                                             href="<?php echo base_url() . 'EditRequisitionForm?ReqNo=' . $record->ReqNo . '&ReqType=' . $record->ReqType; ?>"><i
                                                                 class="fas fa-pencil-alt" data-toggle="tooltip"
                                                                 title="<?php echo $record->ReqNo; ?>  -  Click here to view Requisition details"></i>&nbsp;&nbsp;&nbsp;</a>
@@ -314,4 +314,33 @@ if (!empty($Status)) {
             }
         });
     });
-</script>
\ No newline at end of file
+</script>
+
+
+<script>
+    $(document).ready(function () {
+        // Ensure DataTable is initialized
+        let table = $('#requisition_listing').DataTable(); 
+
+        console.log("DataTable initialized:", table ? "Yes" : "No");
+
+        // Store page number on edit button click
+        $('#requisition_listing').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>
diff --git a/app/Views/sales_dashboard.php b/app/Views/sales_dashboard.php
index b3754288..baed7a30 100755
--- a/app/Views/sales_dashboard.php
+++ b/app/Views/sales_dashboard.php
@@ -121,8 +121,9 @@
                                     <div>
                                         <a class="btn btn-primary    btn-sm px-2" href="<?php echo base_url(); ?>sales_dashboard?stock=resin">Resin</a> 
                                         <a class="btn btn-secondary  btn-sm px-2" href="<?php echo base_url(); ?>sales_dashboard?stock=bag">Bag</a>
-                                        <a class="btn btn-danger     btn-sm px-2" href="<?php echo base_url(); ?>sales_dashboard?stock=diesel">Diesel</a> 
                                         <a class="btn btn-success    btn-sm px-2" href="<?php echo base_url(); ?>sales_dashboard?stock=gas">Gas</a>
+                                        <a class="btn btn-danger     btn-sm px-2" href="<?php echo base_url(); ?>sales_dashboard?stock=diesel">Diesel</a> 
+
                                     </div>
 
                                     <div>